|
@@ -5,26 +5,28 @@
|
|
</component>
|
|
</component>
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="8c3e0ed0-6141-4ee9-a284-3fa2d43ee5eb" name="Changes" comment="">
|
|
<list default="true" id="8c3e0ed0-6141-4ee9-a284-3fa2d43ee5eb" name="Changes" comment="">
|
|
- <change afterPath="$PROJECT_DIR$/.idea/.gitignore" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/controller/UserController.java" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/dao/UserDao.java" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/entity/Order.java" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/entity/User.java" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/service/UserService.java" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/resources/bean.xml" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/resources/bean2.xml" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/resources/bean3.xml" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/resources/bean4.xml" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/src/test/java/com/sf/AppTest.java" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/../mybatis/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../mybatis/.idea/workspace.xml" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/../mybatis/src/main/java/com/sf/dto/JsonArrayTypeHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/../mybatis/src/main/java/com/sf/dto/JsonArrayTypeHandler.java" afterDir="false" />
|
|
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/entity/Student.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/entity/User2.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/factory/FactoryUser.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/factory/InstanceFactory.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/factory/StaticFactory.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/processor/ABeanPostProcessor.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/resources/bean5.xml" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/resources/bean6.xml" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/resources/bean7.xml" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/resources/db.properties" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/test/java/com/sf/AppTest2.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/test/java/com/sf/AppTest3.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/test/java/com/sf/AppTest4.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/Order.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sf/entity/Order.java" afterDir="false" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/sf/entity/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sf/entity/User.java" afterDir="false" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/resources/bean.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bean.xml" afterDir="false" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/target/classes/bean.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/bean.xml" afterDir="false" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/target/classes/com/sf/entity/Order.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/sf/entity/Order.class" afterDir="false" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/target/classes/com/sf/entity/User.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/sf/entity/User.class" afterDir="false" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/target/test-classes/com/sf/AppTest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/com/sf/AppTest.class" 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" />
|
|
@@ -34,8 +36,8 @@
|
|
<component name="FileTemplateManagerImpl">
|
|
<component name="FileTemplateManagerImpl">
|
|
<option name="RECENT_TEMPLATES">
|
|
<option name="RECENT_TEMPLATES">
|
|
<list>
|
|
<list>
|
|
- <option value="Class" />
|
|
|
|
<option value="spring-beans.schema" />
|
|
<option value="spring-beans.schema" />
|
|
|
|
+ <option value="Class" />
|
|
</list>
|
|
</list>
|
|
</option>
|
|
</option>
|
|
</component>
|
|
</component>
|
|
@@ -65,11 +67,12 @@
|
|
"project.structure.last.edited": "Modules",
|
|
"project.structure.last.edited": "Modules",
|
|
"project.structure.proportion": "0.15",
|
|
"project.structure.proportion": "0.15",
|
|
"project.structure.side.proportion": "0.13333334",
|
|
"project.structure.side.proportion": "0.13333334",
|
|
|
|
+ "settings.editor.selected.configurable": "preferences.fileTypes",
|
|
"vue.rearranger.settings.migration": "true"
|
|
"vue.rearranger.settings.migration": "true"
|
|
}
|
|
}
|
|
}]]></component>
|
|
}]]></component>
|
|
- <component name="RunManager" selected="JUnit.AppTest.t6">
|
|
|
|
- <configuration name="AppTest.t2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
|
|
|
|
+ <component name="RunManager" selected="JUnit.AppTest4.t1">
|
|
|
|
+ <configuration name="AppTest3.t1" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
<module name="spring" />
|
|
<module name="spring" />
|
|
<extension name="coverage">
|
|
<extension name="coverage">
|
|
<pattern>
|
|
<pattern>
|
|
@@ -78,14 +81,14 @@
|
|
</pattern>
|
|
</pattern>
|
|
</extension>
|
|
</extension>
|
|
<option name="PACKAGE_NAME" value="com.sf" />
|
|
<option name="PACKAGE_NAME" value="com.sf" />
|
|
- <option name="MAIN_CLASS_NAME" value="com.sf.AppTest" />
|
|
|
|
- <option name="METHOD_NAME" value="t2" />
|
|
|
|
|
|
+ <option name="MAIN_CLASS_NAME" value="com.sf.AppTest3" />
|
|
|
|
+ <option name="METHOD_NAME" value="t1" />
|
|
<option name="TEST_OBJECT" value="method" />
|
|
<option name="TEST_OBJECT" value="method" />
|
|
<method v="2">
|
|
<method v="2">
|
|
<option name="Make" enabled="true" />
|
|
<option name="Make" enabled="true" />
|
|
</method>
|
|
</method>
|
|
</configuration>
|
|
</configuration>
|
|
- <configuration name="AppTest.t4" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
|
|
|
|
+ <configuration name="AppTest3.t2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
<module name="spring" />
|
|
<module name="spring" />
|
|
<extension name="coverage">
|
|
<extension name="coverage">
|
|
<pattern>
|
|
<pattern>
|
|
@@ -94,14 +97,14 @@
|
|
</pattern>
|
|
</pattern>
|
|
</extension>
|
|
</extension>
|
|
<option name="PACKAGE_NAME" value="com.sf" />
|
|
<option name="PACKAGE_NAME" value="com.sf" />
|
|
- <option name="MAIN_CLASS_NAME" value="com.sf.AppTest" />
|
|
|
|
- <option name="METHOD_NAME" value="t4" />
|
|
|
|
|
|
+ <option name="MAIN_CLASS_NAME" value="com.sf.AppTest3" />
|
|
|
|
+ <option name="METHOD_NAME" value="t2" />
|
|
<option name="TEST_OBJECT" value="method" />
|
|
<option name="TEST_OBJECT" value="method" />
|
|
<method v="2">
|
|
<method v="2">
|
|
<option name="Make" enabled="true" />
|
|
<option name="Make" enabled="true" />
|
|
</method>
|
|
</method>
|
|
</configuration>
|
|
</configuration>
|
|
- <configuration name="AppTest.t5" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
|
|
|
|
+ <configuration name="AppTest3.t3" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
<module name="spring" />
|
|
<module name="spring" />
|
|
<extension name="coverage">
|
|
<extension name="coverage">
|
|
<pattern>
|
|
<pattern>
|
|
@@ -110,14 +113,14 @@
|
|
</pattern>
|
|
</pattern>
|
|
</extension>
|
|
</extension>
|
|
<option name="PACKAGE_NAME" value="com.sf" />
|
|
<option name="PACKAGE_NAME" value="com.sf" />
|
|
- <option name="MAIN_CLASS_NAME" value="com.sf.AppTest" />
|
|
|
|
- <option name="METHOD_NAME" value="t5" />
|
|
|
|
|
|
+ <option name="MAIN_CLASS_NAME" value="com.sf.AppTest3" />
|
|
|
|
+ <option name="METHOD_NAME" value="t3" />
|
|
<option name="TEST_OBJECT" value="method" />
|
|
<option name="TEST_OBJECT" value="method" />
|
|
<method v="2">
|
|
<method v="2">
|
|
<option name="Make" enabled="true" />
|
|
<option name="Make" enabled="true" />
|
|
</method>
|
|
</method>
|
|
</configuration>
|
|
</configuration>
|
|
- <configuration name="AppTest.t6" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
|
|
|
|
+ <configuration name="AppTest3.t4" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
<module name="spring" />
|
|
<module name="spring" />
|
|
<extension name="coverage">
|
|
<extension name="coverage">
|
|
<pattern>
|
|
<pattern>
|
|
@@ -126,14 +129,14 @@
|
|
</pattern>
|
|
</pattern>
|
|
</extension>
|
|
</extension>
|
|
<option name="PACKAGE_NAME" value="com.sf" />
|
|
<option name="PACKAGE_NAME" value="com.sf" />
|
|
- <option name="MAIN_CLASS_NAME" value="com.sf.AppTest" />
|
|
|
|
- <option name="METHOD_NAME" value="t6" />
|
|
|
|
|
|
+ <option name="MAIN_CLASS_NAME" value="com.sf.AppTest3" />
|
|
|
|
+ <option name="METHOD_NAME" value="t4" />
|
|
<option name="TEST_OBJECT" value="method" />
|
|
<option name="TEST_OBJECT" value="method" />
|
|
<method v="2">
|
|
<method v="2">
|
|
<option name="Make" enabled="true" />
|
|
<option name="Make" enabled="true" />
|
|
</method>
|
|
</method>
|
|
</configuration>
|
|
</configuration>
|
|
- <configuration name="AppTest.tp" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
|
|
|
|
+ <configuration name="AppTest4.t1" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
<module name="spring" />
|
|
<module name="spring" />
|
|
<extension name="coverage">
|
|
<extension name="coverage">
|
|
<pattern>
|
|
<pattern>
|
|
@@ -142,8 +145,8 @@
|
|
</pattern>
|
|
</pattern>
|
|
</extension>
|
|
</extension>
|
|
<option name="PACKAGE_NAME" value="com.sf" />
|
|
<option name="PACKAGE_NAME" value="com.sf" />
|
|
- <option name="MAIN_CLASS_NAME" value="com.sf.AppTest" />
|
|
|
|
- <option name="METHOD_NAME" value="tp" />
|
|
|
|
|
|
+ <option name="MAIN_CLASS_NAME" value="com.sf.AppTest4" />
|
|
|
|
+ <option name="METHOD_NAME" value="t1" />
|
|
<option name="TEST_OBJECT" value="method" />
|
|
<option name="TEST_OBJECT" value="method" />
|
|
<method v="2">
|
|
<method v="2">
|
|
<option name="Make" enabled="true" />
|
|
<option name="Make" enabled="true" />
|
|
@@ -151,11 +154,11 @@
|
|
</configuration>
|
|
</configuration>
|
|
<recent_temporary>
|
|
<recent_temporary>
|
|
<list>
|
|
<list>
|
|
- <item itemvalue="JUnit.AppTest.t6" />
|
|
|
|
- <item itemvalue="JUnit.AppTest.t5" />
|
|
|
|
- <item itemvalue="JUnit.AppTest.t4" />
|
|
|
|
- <item itemvalue="JUnit.AppTest.t2" />
|
|
|
|
- <item itemvalue="JUnit.AppTest.tp" />
|
|
|
|
|
|
+ <item itemvalue="JUnit.AppTest4.t1" />
|
|
|
|
+ <item itemvalue="JUnit.AppTest3.t4" />
|
|
|
|
+ <item itemvalue="JUnit.AppTest3.t3" />
|
|
|
|
+ <item itemvalue="JUnit.AppTest3.t2" />
|
|
|
|
+ <item itemvalue="JUnit.AppTest3.t1" />
|
|
</list>
|
|
</list>
|
|
</recent_temporary>
|
|
</recent_temporary>
|
|
</component>
|
|
</component>
|
|
@@ -167,7 +170,7 @@
|
|
<option name="number" value="Default" />
|
|
<option name="number" value="Default" />
|
|
<option name="presentableId" value="Default" />
|
|
<option name="presentableId" value="Default" />
|
|
<updated>1689993904831</updated>
|
|
<updated>1689993904831</updated>
|
|
- <workItem from="1689993906819" duration="13124000" />
|
|
|
|
|
|
+ <workItem from="1689993906819" duration="38359000" />
|
|
</task>
|
|
</task>
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|