|
@@ -10,15 +10,9 @@
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
</component>
|
|
</component>
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
- <list default="true" id="d55c211f-cca4-4230-b149-ae8c1dab3c43" name="Changes" comment="0122 thymeleaf demo">
|
|
|
|
|
|
+ <list default="true" id="d55c211f-cca4-4230-b149-ae8c1dab3c43" name="Changes" comment="0123 mybatis注解开发">
|
|
<change afterPath="$PROJECT_DIR$/../.idea/VIPJAVA.iml" afterDir="false" />
|
|
<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$/../gn_oa_vip27/.idea/google-java-format.xml" afterDir="false" />
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/controller/LoginController.java" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/resources/i18n/message.properties" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/resources/i18n/message_en_US.properties" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/resources/i18n/message_ko_KR.properties" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/resources/i18n/message_zh_CN.properties" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/templates/i18n/login.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/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/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" />
|
|
<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" />
|
|
@@ -27,10 +21,6 @@
|
|
<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/.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$/../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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/dao/RoleDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sf/dao/RoleDao.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/templates/hello.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/templates/hello.html" afterDir="false" />
|
|
|
|
</list>
|
|
</list>
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -50,9 +40,9 @@
|
|
<option value="Interface" />
|
|
<option value="Interface" />
|
|
<option value="Mybatis Mapper Xml File" />
|
|
<option value="Mybatis Mapper Xml File" />
|
|
<option value="Thymeleaf HTML File" />
|
|
<option value="Thymeleaf HTML File" />
|
|
- <option value="HTML File" />
|
|
|
|
- <option value="Class" />
|
|
|
|
<option value="Properties File" />
|
|
<option value="Properties File" />
|
|
|
|
+ <option value="Class" />
|
|
|
|
+ <option value="HTML File" />
|
|
</list>
|
|
</list>
|
|
</option>
|
|
</option>
|
|
</component>
|
|
</component>
|
|
@@ -82,31 +72,32 @@
|
|
<component name="ProjectViewState">
|
|
<component name="ProjectViewState">
|
|
<option name="showLibraryContents" value="true" />
|
|
<option name="showLibraryContents" value="true" />
|
|
</component>
|
|
</component>
|
|
- <component name="PropertiesComponent"><![CDATA[{
|
|
|
|
- "keyToString": {
|
|
|
|
- "DefaultHtmlFileTemplate": "HTML File",
|
|
|
|
- "HTTP Request.rest-api_1 | #1.executor": "Run",
|
|
|
|
- "JUnit.TestSpringMvc.test.executor": "Run",
|
|
|
|
- "Maven. [org.apache.maven.plugins:maven-archetype-plugin:RELEASE:generate].executor": "Run",
|
|
|
|
- "RunOnceActivity.OpenProjectViewOnStart": "true",
|
|
|
|
- "RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
|
- "Tomcat Server.Tomcat 10.0.21.executor": "Run",
|
|
|
|
- "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/src/main/webapp/WEB-INF/templates/demo",
|
|
|
|
- "node.js.detected.package.eslint": "true",
|
|
|
|
- "node.js.detected.package.tslint": "true",
|
|
|
|
- "node.js.selected.package.eslint": "(autodetect)",
|
|
|
|
- "node.js.selected.package.tslint": "(autodetect)",
|
|
|
|
- "nodejs_package_manager_path": "npm",
|
|
|
|
- "project.structure.last.edited": "Artifacts",
|
|
|
|
- "project.structure.proportion": "0.17833698",
|
|
|
|
- "project.structure.side.proportion": "0.2150838",
|
|
|
|
- "settings.editor.selected.configurable": "File.Encoding",
|
|
|
|
- "vue.rearranger.settings.migration": "true"
|
|
|
|
|
|
+ <component name="PropertiesComponent">{
|
|
|
|
+ "keyToString": {
|
|
|
|
+ "DefaultHtmlFileTemplate": "HTML File",
|
|
|
|
+ "HTTP Request.rest-api_1 | #1.executor": "Run",
|
|
|
|
+ "HTTP Request.rest-api_2 | #1.executor": "Run",
|
|
|
|
+ "JUnit.TestSpringMvc.test.executor": "Run",
|
|
|
|
+ "Maven. [org.apache.maven.plugins:maven-archetype-plugin:RELEASE:generate].executor": "Run",
|
|
|
|
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
|
|
|
|
+ "RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
|
+ "Tomcat Server.Tomcat 10.0.21.executor": "Run",
|
|
|
|
+ "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/src/main/webapp/WEB-INF/templates/demo",
|
|
|
|
+ "node.js.detected.package.eslint": "true",
|
|
|
|
+ "node.js.detected.package.tslint": "true",
|
|
|
|
+ "node.js.selected.package.eslint": "(autodetect)",
|
|
|
|
+ "node.js.selected.package.tslint": "(autodetect)",
|
|
|
|
+ "nodejs_package_manager_path": "npm",
|
|
|
|
+ "project.structure.last.edited": "Artifacts",
|
|
|
|
+ "project.structure.proportion": "0.17833698",
|
|
|
|
+ "project.structure.side.proportion": "0.2150838",
|
|
|
|
+ "settings.editor.selected.configurable": "preferences.pluginManager",
|
|
|
|
+ "vue.rearranger.settings.migration": "true"
|
|
}
|
|
}
|
|
-}]]></component>
|
|
|
|
|
|
+}</component>
|
|
<component name="RecentsManager">
|
|
<component name="RecentsManager">
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
<recent name="$PROJECT_DIR$/src/main/webapp/WEB-INF/templates/demo" />
|
|
<recent name="$PROJECT_DIR$/src/main/webapp/WEB-INF/templates/demo" />
|
|
@@ -128,6 +119,9 @@
|
|
<configuration name="rest-api_1 | #1" type="HttpClient.HttpRequestRunConfigurationType" factoryName="HTTP Request" temporary="true" nameIsGenerated="true" path="$APPLICATION_CONFIG_DIR$/scratches/rest-api_1.http" requestIdentifier="#1" runType="Run single request">
|
|
<configuration name="rest-api_1 | #1" type="HttpClient.HttpRequestRunConfigurationType" factoryName="HTTP Request" temporary="true" nameIsGenerated="true" path="$APPLICATION_CONFIG_DIR$/scratches/rest-api_1.http" requestIdentifier="#1" runType="Run single request">
|
|
<method v="2" />
|
|
<method v="2" />
|
|
</configuration>
|
|
</configuration>
|
|
|
|
+ <configuration name="rest-api_2 | #1" type="HttpClient.HttpRequestRunConfigurationType" factoryName="HTTP Request" temporary="true" nameIsGenerated="true" path="$APPLICATION_CONFIG_DIR$/scratches/rest-api_2.http" requestIdentifier="#1" runType="Run single request">
|
|
|
|
+ <method v="2" />
|
|
|
|
+ </configuration>
|
|
<configuration name="TestSpringMvc.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
<configuration name="TestSpringMvc.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
<module name="springmvc-demo" />
|
|
<module name="springmvc-demo" />
|
|
<extension name="coverage">
|
|
<extension name="coverage">
|
|
@@ -240,6 +234,7 @@
|
|
</configuration>
|
|
</configuration>
|
|
<recent_temporary>
|
|
<recent_temporary>
|
|
<list>
|
|
<list>
|
|
|
|
+ <item itemvalue="HTTP Request.rest-api_2 | #1" />
|
|
<item itemvalue="HTTP Request.rest-api_1 | #1" />
|
|
<item itemvalue="HTTP Request.rest-api_1 | #1" />
|
|
<item itemvalue="JUnit.TestSpringMvc.test" />
|
|
<item itemvalue="JUnit.TestSpringMvc.test" />
|
|
</list>
|
|
</list>
|
|
@@ -263,7 +258,7 @@
|
|
<workItem from="1705850774957" duration="649000" />
|
|
<workItem from="1705850774957" duration="649000" />
|
|
<workItem from="1705852976185" duration="1600000" />
|
|
<workItem from="1705852976185" duration="1600000" />
|
|
<workItem from="1705897573911" duration="12996000" />
|
|
<workItem from="1705897573911" duration="12996000" />
|
|
- <workItem from="1705972424180" duration="5488000" />
|
|
|
|
|
|
+ <workItem from="1705972424180" duration="12204000" />
|
|
</task>
|
|
</task>
|
|
<task id="LOCAL-00001" summary="0117 springmvc">
|
|
<task id="LOCAL-00001" summary="0117 springmvc">
|
|
<option name="closed" value="true" />
|
|
<option name="closed" value="true" />
|
|
@@ -313,7 +308,23 @@
|
|
<option name="project" value="LOCAL" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1705916126882</updated>
|
|
<updated>1705916126882</updated>
|
|
</task>
|
|
</task>
|
|
- <option name="localTasksCounter" value="7" />
|
|
|
|
|
|
+ <task id="LOCAL-00007" summary="0123 i18n">
|
|
|
|
+ <option name="closed" value="true" />
|
|
|
|
+ <created>1705983348692</created>
|
|
|
|
+ <option name="number" value="00007" />
|
|
|
|
+ <option name="presentableId" value="LOCAL-00007" />
|
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
|
+ <updated>1705983348692</updated>
|
|
|
|
+ </task>
|
|
|
|
+ <task id="LOCAL-00008" summary="0123 mybatis注解开发">
|
|
|
|
+ <option name="closed" value="true" />
|
|
|
|
+ <created>1705995283450</created>
|
|
|
|
+ <option name="number" value="00008" />
|
|
|
|
+ <option name="presentableId" value="LOCAL-00008" />
|
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
|
+ <updated>1705995283450</updated>
|
|
|
|
+ </task>
|
|
|
|
+ <option name="localTasksCounter" value="9" />
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -414,7 +425,9 @@
|
|
<MESSAGE value="0119 ssm全注解版" />
|
|
<MESSAGE value="0119 ssm全注解版" />
|
|
<MESSAGE value="0119 sql" />
|
|
<MESSAGE value="0119 sql" />
|
|
<MESSAGE value="0122 thymeleaf demo" />
|
|
<MESSAGE value="0122 thymeleaf demo" />
|
|
- <option name="LAST_COMMIT_MESSAGE" value="0122 thymeleaf demo" />
|
|
|
|
|
|
+ <MESSAGE value="0123 i18n" />
|
|
|
|
+ <MESSAGE value="0123 mybatis注解开发" />
|
|
|
|
+ <option name="LAST_COMMIT_MESSAGE" value="0123 mybatis注解开发" />
|
|
</component>
|
|
</component>
|
|
<component name="XSLT-Support.FileAssociations.UIState">
|
|
<component name="XSLT-Support.FileAssociations.UIState">
|
|
<expand />
|
|
<expand />
|