|
@@ -10,13 +10,15 @@
|
|
<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="0119 ssm全注解版">
|
|
|
|
|
|
+ <list default="true" id="d55c211f-cca4-4230-b149-ae8c1dab3c43" name="Changes" comment="0122 thymeleaf demo">
|
|
<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$/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 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" />
|
|
@@ -25,7 +27,10 @@
|
|
<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/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/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" />
|
|
@@ -44,10 +49,10 @@
|
|
<option value="Spring Xml File" />
|
|
<option value="Spring Xml File" />
|
|
<option value="Interface" />
|
|
<option value="Interface" />
|
|
<option value="Mybatis Mapper Xml File" />
|
|
<option value="Mybatis Mapper Xml File" />
|
|
- <option value="Properties File" />
|
|
|
|
- <option value="Class" />
|
|
|
|
- <option value="HTML File" />
|
|
|
|
<option value="Thymeleaf HTML File" />
|
|
<option value="Thymeleaf HTML File" />
|
|
|
|
+ <option value="HTML File" />
|
|
|
|
+ <option value="Class" />
|
|
|
|
+ <option value="Properties File" />
|
|
</list>
|
|
</list>
|
|
</option>
|
|
</option>
|
|
</component>
|
|
</component>
|
|
@@ -64,6 +69,9 @@
|
|
<option name="FILTER_DEBUG" value="true" />
|
|
<option name="FILTER_DEBUG" value="true" />
|
|
<option name="CUSTOM_FILTER" />
|
|
<option name="CUSTOM_FILTER" />
|
|
</component>
|
|
</component>
|
|
|
|
+ <component name="MarkdownSettingsMigration">
|
|
|
|
+ <option name="stateVersion" value="1" />
|
|
|
|
+ </component>
|
|
<component name="ProjectColorInfo">{
|
|
<component name="ProjectColorInfo">{
|
|
"associatedIndex": 4
|
|
"associatedIndex": 4
|
|
}</component>
|
|
}</component>
|
|
@@ -86,7 +94,7 @@
|
|
"Tomcat Server.Tomcat 8.5.93.executor": "Run",
|
|
"Tomcat Server.Tomcat 8.5.93.executor": "Run",
|
|
"git-widget-placeholder": "master",
|
|
"git-widget-placeholder": "master",
|
|
"kotlin-language-version-configured": "true",
|
|
"kotlin-language-version-configured": "true",
|
|
- "last_opened_file_path": "/Users/Qing/IdeaProjects/SiFu/VIPJAVA/springmvc-demo/sql",
|
|
|
|
|
|
+ "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.eslint": "true",
|
|
"node.js.detected.package.tslint": "true",
|
|
"node.js.detected.package.tslint": "true",
|
|
"node.js.selected.package.eslint": "(autodetect)",
|
|
"node.js.selected.package.eslint": "(autodetect)",
|
|
@@ -95,17 +103,17 @@
|
|
"project.structure.last.edited": "Artifacts",
|
|
"project.structure.last.edited": "Artifacts",
|
|
"project.structure.proportion": "0.17833698",
|
|
"project.structure.proportion": "0.17833698",
|
|
"project.structure.side.proportion": "0.2150838",
|
|
"project.structure.side.proportion": "0.2150838",
|
|
- "settings.editor.selected.configurable": "preferences.pluginManager",
|
|
|
|
|
|
+ "settings.editor.selected.configurable": "File.Encoding",
|
|
"vue.rearranger.settings.migration": "true"
|
|
"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$/sql" />
|
|
<recent name="$PROJECT_DIR$/sql" />
|
|
<recent name="$PROJECT_DIR$" />
|
|
<recent name="$PROJECT_DIR$" />
|
|
<recent name="$PROJECT_DIR$/src/main/java/com/sf" />
|
|
<recent name="$PROJECT_DIR$/src/main/java/com/sf" />
|
|
<recent name="$PROJECT_DIR$/src/main/resources" />
|
|
<recent name="$PROJECT_DIR$/src/main/resources" />
|
|
- <recent name="$PROJECT_DIR$/src/main/webapp/WEB-INF" />
|
|
|
|
</key>
|
|
</key>
|
|
<key name="MoveFile.RECENT_KEYS">
|
|
<key name="MoveFile.RECENT_KEYS">
|
|
<recent name="$PROJECT_DIR$/src/main/java/com/sf/anno/init" />
|
|
<recent name="$PROJECT_DIR$/src/main/java/com/sf/anno/init" />
|
|
@@ -248,7 +256,14 @@
|
|
<workItem from="1705471908780" duration="12452000" />
|
|
<workItem from="1705471908780" duration="12452000" />
|
|
<workItem from="1705492873471" duration="19225000" />
|
|
<workItem from="1705492873471" duration="19225000" />
|
|
<workItem from="1705593304178" duration="747000" />
|
|
<workItem from="1705593304178" duration="747000" />
|
|
- <workItem from="1705625830502" duration="15568000" />
|
|
|
|
|
|
+ <workItem from="1705625830502" duration="19845000" />
|
|
|
|
+ <workItem from="1705682750234" duration="2481000" />
|
|
|
|
+ <workItem from="1705748230368" duration="24000" />
|
|
|
|
+ <workItem from="1705845379372" duration="1255000" />
|
|
|
|
+ <workItem from="1705850774957" duration="649000" />
|
|
|
|
+ <workItem from="1705852976185" duration="1600000" />
|
|
|
|
+ <workItem from="1705897573911" duration="12996000" />
|
|
|
|
+ <workItem from="1705972424180" duration="5488000" />
|
|
</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" />
|
|
@@ -282,7 +297,23 @@
|
|
<option name="project" value="LOCAL" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1705638546742</updated>
|
|
<updated>1705638546742</updated>
|
|
</task>
|
|
</task>
|
|
- <option name="localTasksCounter" value="5" />
|
|
|
|
|
|
+ <task id="LOCAL-00005" summary="0119 sql">
|
|
|
|
+ <option name="closed" value="true" />
|
|
|
|
+ <created>1705646050971</created>
|
|
|
|
+ <option name="number" value="00005" />
|
|
|
|
+ <option name="presentableId" value="LOCAL-00005" />
|
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
|
+ <updated>1705646050971</updated>
|
|
|
|
+ </task>
|
|
|
|
+ <task id="LOCAL-00006" summary="0122 thymeleaf demo">
|
|
|
|
+ <option name="closed" value="true" />
|
|
|
|
+ <created>1705916126882</created>
|
|
|
|
+ <option name="number" value="00006" />
|
|
|
|
+ <option name="presentableId" value="LOCAL-00006" />
|
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
|
+ <updated>1705916126882</updated>
|
|
|
|
+ </task>
|
|
|
|
+ <option name="localTasksCounter" value="7" />
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -291,11 +322,63 @@
|
|
<component name="Vcs.Log.Tabs.Properties">
|
|
<component name="Vcs.Log.Tabs.Properties">
|
|
<option name="OPEN_GENERIC_TABS">
|
|
<option name="OPEN_GENERIC_TABS">
|
|
<map>
|
|
<map>
|
|
|
|
+ <entry key="2796529a-5c91-4ade-865d-9ec14a0a9732" value="TOOL_WINDOW" />
|
|
|
|
+ <entry key="8b8e1bf6-a623-40d3-b7bc-4bc664637900" value="TOOL_WINDOW" />
|
|
<entry key="a504f1b5-4d9a-4e77-842b-fa8776f962fa" value="TOOL_WINDOW" />
|
|
<entry key="a504f1b5-4d9a-4e77-842b-fa8776f962fa" value="TOOL_WINDOW" />
|
|
</map>
|
|
</map>
|
|
</option>
|
|
</option>
|
|
<option name="TAB_STATES">
|
|
<option name="TAB_STATES">
|
|
<map>
|
|
<map>
|
|
|
|
+ <entry key="2796529a-5c91-4ade-865d-9ec14a0a9732">
|
|
|
|
+ <value>
|
|
|
|
+ <State>
|
|
|
|
+ <option name="FILTERS">
|
|
|
|
+ <map>
|
|
|
|
+ <entry key="branch">
|
|
|
|
+ <value>
|
|
|
|
+ <list>
|
|
|
|
+ <option value="HEAD" />
|
|
|
|
+ </list>
|
|
|
|
+ </value>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry key="structure">
|
|
|
|
+ <value>
|
|
|
|
+ <list>
|
|
|
|
+ <option value="dir:/Users/Qing/IdeaProjects/SiFu/VIPJAVA/springmvc-demo" />
|
|
|
|
+ </list>
|
|
|
|
+ </value>
|
|
|
|
+ </entry>
|
|
|
|
+ </map>
|
|
|
|
+ </option>
|
|
|
|
+ <option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
|
|
|
|
+ </State>
|
|
|
|
+ </value>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry key="8b8e1bf6-a623-40d3-b7bc-4bc664637900">
|
|
|
|
+ <value>
|
|
|
|
+ <State>
|
|
|
|
+ <option name="FILTERS">
|
|
|
|
+ <map>
|
|
|
|
+ <entry key="branch">
|
|
|
|
+ <value>
|
|
|
|
+ <list>
|
|
|
|
+ <option value="HEAD" />
|
|
|
|
+ </list>
|
|
|
|
+ </value>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry key="structure">
|
|
|
|
+ <value>
|
|
|
|
+ <list>
|
|
|
|
+ <option value="dir:/Users/Qing/IdeaProjects/SiFu/VIPJAVA/springmvc-demo" />
|
|
|
|
+ </list>
|
|
|
|
+ </value>
|
|
|
|
+ </entry>
|
|
|
|
+ </map>
|
|
|
|
+ </option>
|
|
|
|
+ <option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
|
|
|
|
+ </State>
|
|
|
|
+ </value>
|
|
|
|
+ </entry>
|
|
<entry key="a504f1b5-4d9a-4e77-842b-fa8776f962fa">
|
|
<entry key="a504f1b5-4d9a-4e77-842b-fa8776f962fa">
|
|
<value>
|
|
<value>
|
|
<State>
|
|
<State>
|
|
@@ -329,7 +412,9 @@
|
|
<MESSAGE value="0118 ssm整合" />
|
|
<MESSAGE value="0118 ssm整合" />
|
|
<MESSAGE value="0118 springmvc示例" />
|
|
<MESSAGE value="0118 springmvc示例" />
|
|
<MESSAGE value="0119 ssm全注解版" />
|
|
<MESSAGE value="0119 ssm全注解版" />
|
|
- <option name="LAST_COMMIT_MESSAGE" value="0119 ssm全注解版" />
|
|
|
|
|
|
+ <MESSAGE value="0119 sql" />
|
|
|
|
+ <MESSAGE value="0122 thymeleaf demo" />
|
|
|
|
+ <option name="LAST_COMMIT_MESSAGE" value="0122 thymeleaf demo" />
|
|
</component>
|
|
</component>
|
|
<component name="XSLT-Support.FileAssociations.UIState">
|
|
<component name="XSLT-Support.FileAssociations.UIState">
|
|
<expand />
|
|
<expand />
|