|
@@ -10,16 +10,13 @@
|
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="d55c211f-cca4-4230-b149-ae8c1dab3c43" name="Changes" comment="0118 springmvc示例">
|
|
|
+ <list default="true" id="d55c211f-cca4-4230-b149-ae8c1dab3c43" name="Changes" comment="0119 ssm全注解版">
|
|
|
<change afterPath="$PROJECT_DIR$/../.idea/VIPJAVA.iml" afterDir="false" />
|
|
|
<change afterPath="$PROJECT_DIR$/../gn_oa_vip27/.idea/google-java-format.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/WebInitConfig.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/anno/DruidConfig.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/anno/MybatisConfig.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/anno/SpringConfig.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/resources/log4j.properties" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/templates/hello.html" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/templates/test.html" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/sql/org_fiction.sql" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/controller/ScopeController.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/templates/testlist.html" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/templates/testscope.html" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/../02_JavaWeb/day06_mybatis/src/main/java/com/lc/mapper/UserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../02_JavaWeb/day06_mybatis/src/main/java/com/lc/mapper/UserMapper.java" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/../02_JavaWeb/day06_mybatis/src/main/resources/com/lc/mapper/UserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../02_JavaWeb/day06_mybatis/src/main/resources/com/lc/mapper/UserMapper.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/../02_JavaWeb/day07_mybatis/src/main/resources/com/lc/mapper/UserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../02_JavaWeb/day07_mybatis/src/main/resources/com/lc/mapper/UserMapper.xml" afterDir="false" />
|
|
@@ -28,17 +25,7 @@
|
|
|
<change beforePath="$PROJECT_DIR$/../gn_oa_vip27/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../gn_oa_vip27/.idea/workspace.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/../gn_oa_vip27/src/main/java/com/sf/utils/JdbcUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../gn_oa_vip27/src/main/java/com/sf/utils/JdbcUtil.java" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/sf/anno/MyServletContainerInitializer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sf/anno/init/MyServletContainerInitializer.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/sf/anno/MyWebAppInitializer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sf/anno/init/MyWebAppInitializer.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/sf/anno/SpringMvcConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sf/anno/SpringMvcConfig.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/sf/controller/AuthorController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sf/controller/AuthorController.java" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/sf/controller/HelloController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sf/controller/HelloController.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/sf/controller/HttpController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sf/controller/HttpController.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/resources/spring-mvc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring-mvc.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/webapp/hello.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/jsp/hello.jsp" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/webapp/index.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/jsp/index.jsp" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -58,9 +45,9 @@
|
|
|
<option value="Interface" />
|
|
|
<option value="Mybatis Mapper Xml File" />
|
|
|
<option value="Properties File" />
|
|
|
- <option value="Thymeleaf HTML File" />
|
|
|
- <option value="HTML File" />
|
|
|
<option value="Class" />
|
|
|
+ <option value="HTML File" />
|
|
|
+ <option value="Thymeleaf HTML File" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
@@ -99,7 +86,7 @@
|
|
|
"Tomcat Server.Tomcat 8.5.93.executor": "Run",
|
|
|
"git-widget-placeholder": "master",
|
|
|
"kotlin-language-version-configured": "true",
|
|
|
- "last_opened_file_path": "/Users/Qing/IdeaProjects/SiFu/VIPJAVA/springmvc-demo",
|
|
|
+ "last_opened_file_path": "/Users/Qing/IdeaProjects/SiFu/VIPJAVA/springmvc-demo/sql",
|
|
|
"node.js.detected.package.eslint": "true",
|
|
|
"node.js.detected.package.tslint": "true",
|
|
|
"node.js.selected.package.eslint": "(autodetect)",
|
|
@@ -114,6 +101,8 @@
|
|
|
}]]></component>
|
|
|
<component name="RecentsManager">
|
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
|
+ <recent name="$PROJECT_DIR$/sql" />
|
|
|
+ <recent name="$PROJECT_DIR$" />
|
|
|
<recent name="$PROJECT_DIR$/src/main/java/com/sf" />
|
|
|
<recent name="$PROJECT_DIR$/src/main/resources" />
|
|
|
<recent name="$PROJECT_DIR$/src/main/webapp/WEB-INF" />
|
|
@@ -259,7 +248,7 @@
|
|
|
<workItem from="1705471908780" duration="12452000" />
|
|
|
<workItem from="1705492873471" duration="19225000" />
|
|
|
<workItem from="1705593304178" duration="747000" />
|
|
|
- <workItem from="1705625830502" duration="9118000" />
|
|
|
+ <workItem from="1705625830502" duration="15568000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="0117 springmvc">
|
|
|
<option name="closed" value="true" />
|
|
@@ -285,7 +274,15 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1705569024785</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="4" />
|
|
|
+ <task id="LOCAL-00004" summary="0119 ssm全注解版">
|
|
|
+ <option name="closed" value="true" />
|
|
|
+ <created>1705638546742</created>
|
|
|
+ <option name="number" value="00004" />
|
|
|
+ <option name="presentableId" value="LOCAL-00004" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1705638546742</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="5" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -331,7 +328,8 @@
|
|
|
<MESSAGE value="0117 springmvc" />
|
|
|
<MESSAGE value="0118 ssm整合" />
|
|
|
<MESSAGE value="0118 springmvc示例" />
|
|
|
- <option name="LAST_COMMIT_MESSAGE" value="0118 springmvc示例" />
|
|
|
+ <MESSAGE value="0119 ssm全注解版" />
|
|
|
+ <option name="LAST_COMMIT_MESSAGE" value="0119 ssm全注解版" />
|
|
|
</component>
|
|
|
<component name="XSLT-Support.FileAssociations.UIState">
|
|
|
<expand />
|