|
@@ -10,11 +10,16 @@
|
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="d55c211f-cca4-4230-b149-ae8c1dab3c43" name="Changes" comment="0118 ssm整合">
|
|
|
+ <list default="true" id="d55c211f-cca4-4230-b149-ae8c1dab3c43" name="Changes" comment="0118 springmvc示例">
|
|
|
<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/controller/HttpController.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/test/java/com/sf/TestSpringMvc.java" 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 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" />
|
|
@@ -24,7 +29,16 @@
|
|
|
<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/entity/Author.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sf/entity/Author.java" 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" />
|
|
@@ -43,6 +57,9 @@
|
|
|
<option value="Spring Xml File" />
|
|
|
<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" />
|
|
|
</list>
|
|
|
</option>
|
|
@@ -72,6 +89,7 @@
|
|
|
</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",
|
|
@@ -81,13 +99,13 @@
|
|
|
"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/java/com/sf",
|
|
|
+ "last_opened_file_path": "/Users/Qing/IdeaProjects/SiFu/VIPJAVA/springmvc-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": "Modules",
|
|
|
+ "project.structure.last.edited": "Artifacts",
|
|
|
"project.structure.proportion": "0.17833698",
|
|
|
"project.structure.side.proportion": "0.2150838",
|
|
|
"settings.editor.selected.configurable": "preferences.pluginManager",
|
|
@@ -101,8 +119,13 @@
|
|
|
<recent name="$PROJECT_DIR$/src/main/webapp/WEB-INF" />
|
|
|
</key>
|
|
|
<key name="MoveFile.RECENT_KEYS">
|
|
|
+ <recent name="$PROJECT_DIR$/src/main/java/com/sf/anno/init" />
|
|
|
+ <recent name="$PROJECT_DIR$/src/main/webapp/WEB-INF/jsp" />
|
|
|
<recent name="$PROJECT_DIR$/src/main/java/com/sf/anno" />
|
|
|
</key>
|
|
|
+ <key name="CopyClassDialog.RECENTS_KEY">
|
|
|
+ <recent name="com.sf.anno" />
|
|
|
+ </key>
|
|
|
</component>
|
|
|
<component name="RunManager" selected="Tomcat Server.Tomcat 10.0.21">
|
|
|
<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">
|
|
@@ -234,7 +257,9 @@
|
|
|
<option name="presentableId" value="Default" />
|
|
|
<updated>1705471907664</updated>
|
|
|
<workItem from="1705471908780" duration="12452000" />
|
|
|
- <workItem from="1705492873471" duration="16210000" />
|
|
|
+ <workItem from="1705492873471" duration="19225000" />
|
|
|
+ <workItem from="1705593304178" duration="747000" />
|
|
|
+ <workItem from="1705625830502" duration="9118000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="0117 springmvc">
|
|
|
<option name="closed" value="true" />
|
|
@@ -252,7 +277,15 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1705551875551</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="3" />
|
|
|
+ <task id="LOCAL-00003" summary="0118 springmvc示例">
|
|
|
+ <option name="closed" value="true" />
|
|
|
+ <created>1705569024785</created>
|
|
|
+ <option name="number" value="00003" />
|
|
|
+ <option name="presentableId" value="LOCAL-00003" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1705569024785</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="4" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -297,7 +330,8 @@
|
|
|
<component name="VcsManagerConfiguration">
|
|
|
<MESSAGE value="0117 springmvc" />
|
|
|
<MESSAGE value="0118 ssm整合" />
|
|
|
- <option name="LAST_COMMIT_MESSAGE" value="0118 ssm整合" />
|
|
|
+ <MESSAGE value="0118 springmvc示例" />
|
|
|
+ <option name="LAST_COMMIT_MESSAGE" value="0118 springmvc示例" />
|
|
|
</component>
|
|
|
<component name="XSLT-Support.FileAssociations.UIState">
|
|
|
<expand />
|