|
@@ -5,23 +5,30 @@
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="ce9a7213-3ec1-4f41-8ade-c4d87d022933" name="Changes" comment="">
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/entity/Book.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/mapper/BookMapper.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/mapper/UserMapper2.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/resources/BookMapper.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/resources/db.properties" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/resources/log4j.properties" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/test/java/com/sf/mapper/BookMapperTest.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/test/java/com/sf/mapper/UserMapper2Test.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/../maven-jetty-web/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../maven-jetty-web/.idea/workspace.xml" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/entity/Department.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/entity/Employee.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/entity/TbKey.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/entity/TbLock.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/mapper/DepartmentMapper.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/mapper/EmployeeMapper.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/sf/mapper/TbKeyMapper.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/resources/DepartmentMapper.xml" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/resources/EmployeeMapper.xml" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/resources/TbKeyMapper.xml" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/test/java/com/sf/mapper/DepartmentMapperTest.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/test/java/com/sf/mapper/EmployeeMapperTest.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/test/java/com/sf/mapper/TbKeyMapperTest.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/mapper/UserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sf/mapper/UserMapper.java" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/resources/UserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/UserMapper.xml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/resources/db.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/db.properties" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/resources/mybatis-config.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis-config.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/test/java/com/sf/AppTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/sf/AppTest.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/test/java/com/sf/mapper/UserMapper2Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/sf/mapper/UserMapper2Test.java" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/target/classes/UserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/UserMapper.xml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/target/classes/com/sf/mapper/UserMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/sf/mapper/UserMapper.class" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/target/classes/db.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/db.properties" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/target/classes/mybatis-config.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mybatis-config.xml" 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" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/target/test-classes/com/sf/mapper/UserMapper2Test.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/com/sf/mapper/UserMapper2Test.class" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -77,8 +84,8 @@
|
|
|
<recent name="com.sf.mapper" />
|
|
|
</key>
|
|
|
</component>
|
|
|
- <component name="RunManager" selected="JUnit.BookMapperTest.getBookListWithIdorNameOrPrice3">
|
|
|
- <configuration name="BookMapperTest.getBookInfo" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
|
+ <component name="RunManager" selected="JUnit.DepartmentMapperTest.getDepartmentInfoWithEmployee2">
|
|
|
+ <configuration name="DepartmentMapperTest.getDepartmentInfoWithEmployee" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
|
<module name="mybatis" />
|
|
|
<extension name="coverage">
|
|
|
<pattern>
|
|
@@ -87,14 +94,14 @@
|
|
|
</pattern>
|
|
|
</extension>
|
|
|
<option name="PACKAGE_NAME" value="com.sf.mapper" />
|
|
|
- <option name="MAIN_CLASS_NAME" value="com.sf.mapper.BookMapperTest" />
|
|
|
- <option name="METHOD_NAME" value="getBookInfo" />
|
|
|
+ <option name="MAIN_CLASS_NAME" value="com.sf.mapper.DepartmentMapperTest" />
|
|
|
+ <option name="METHOD_NAME" value="getDepartmentInfoWithEmployee" />
|
|
|
<option name="TEST_OBJECT" value="method" />
|
|
|
<method v="2">
|
|
|
<option name="Make" enabled="true" />
|
|
|
</method>
|
|
|
</configuration>
|
|
|
- <configuration name="BookMapperTest.getBookListWithIdorNameOrPrice" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
|
+ <configuration name="DepartmentMapperTest.getDepartmentInfoWithEmployee2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
|
<module name="mybatis" />
|
|
|
<extension name="coverage">
|
|
|
<pattern>
|
|
@@ -103,14 +110,14 @@
|
|
|
</pattern>
|
|
|
</extension>
|
|
|
<option name="PACKAGE_NAME" value="com.sf.mapper" />
|
|
|
- <option name="MAIN_CLASS_NAME" value="com.sf.mapper.BookMapperTest" />
|
|
|
- <option name="METHOD_NAME" value="getBookListWithIdorNameOrPrice" />
|
|
|
+ <option name="MAIN_CLASS_NAME" value="com.sf.mapper.DepartmentMapperTest" />
|
|
|
+ <option name="METHOD_NAME" value="getDepartmentInfoWithEmployee2" />
|
|
|
<option name="TEST_OBJECT" value="method" />
|
|
|
<method v="2">
|
|
|
<option name="Make" enabled="true" />
|
|
|
</method>
|
|
|
</configuration>
|
|
|
- <configuration name="BookMapperTest.getBookListWithIdorNameOrPrice2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
|
+ <configuration name="EmployeeMapperTest.getEmployeeinfo" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
|
<module name="mybatis" />
|
|
|
<extension name="coverage">
|
|
|
<pattern>
|
|
@@ -119,14 +126,14 @@
|
|
|
</pattern>
|
|
|
</extension>
|
|
|
<option name="PACKAGE_NAME" value="com.sf.mapper" />
|
|
|
- <option name="MAIN_CLASS_NAME" value="com.sf.mapper.BookMapperTest" />
|
|
|
- <option name="METHOD_NAME" value="getBookListWithIdorNameOrPrice2" />
|
|
|
+ <option name="MAIN_CLASS_NAME" value="com.sf.mapper.EmployeeMapperTest" />
|
|
|
+ <option name="METHOD_NAME" value="getEmployeeinfo" />
|
|
|
<option name="TEST_OBJECT" value="method" />
|
|
|
<method v="2">
|
|
|
<option name="Make" enabled="true" />
|
|
|
</method>
|
|
|
</configuration>
|
|
|
- <configuration name="BookMapperTest.getBookListWithIdorNameOrPrice3" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
|
+ <configuration name="EmployeeMapperTest.getEmployeeinfoWithDepartment" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
|
<module name="mybatis" />
|
|
|
<extension name="coverage">
|
|
|
<pattern>
|
|
@@ -135,14 +142,14 @@
|
|
|
</pattern>
|
|
|
</extension>
|
|
|
<option name="PACKAGE_NAME" value="com.sf.mapper" />
|
|
|
- <option name="MAIN_CLASS_NAME" value="com.sf.mapper.BookMapperTest" />
|
|
|
- <option name="METHOD_NAME" value="getBookListWithIdorNameOrPrice3" />
|
|
|
+ <option name="MAIN_CLASS_NAME" value="com.sf.mapper.EmployeeMapperTest" />
|
|
|
+ <option name="METHOD_NAME" value="getEmployeeinfoWithDepartment" />
|
|
|
<option name="TEST_OBJECT" value="method" />
|
|
|
<method v="2">
|
|
|
<option name="Make" enabled="true" />
|
|
|
</method>
|
|
|
</configuration>
|
|
|
- <configuration name="BookMapperTest.updateBook" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
|
+ <configuration name="TbKeyMapperTest.getKeyWithLock" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
|
<module name="mybatis" />
|
|
|
<extension name="coverage">
|
|
|
<pattern>
|
|
@@ -151,8 +158,8 @@
|
|
|
</pattern>
|
|
|
</extension>
|
|
|
<option name="PACKAGE_NAME" value="com.sf.mapper" />
|
|
|
- <option name="MAIN_CLASS_NAME" value="com.sf.mapper.BookMapperTest" />
|
|
|
- <option name="METHOD_NAME" value="updateBook" />
|
|
|
+ <option name="MAIN_CLASS_NAME" value="com.sf.mapper.TbKeyMapperTest" />
|
|
|
+ <option name="METHOD_NAME" value="getKeyWithLock" />
|
|
|
<option name="TEST_OBJECT" value="method" />
|
|
|
<method v="2">
|
|
|
<option name="Make" enabled="true" />
|
|
@@ -160,11 +167,11 @@
|
|
|
</configuration>
|
|
|
<recent_temporary>
|
|
|
<list>
|
|
|
- <item itemvalue="JUnit.BookMapperTest.getBookListWithIdorNameOrPrice3" />
|
|
|
- <item itemvalue="JUnit.BookMapperTest.updateBook" />
|
|
|
- <item itemvalue="JUnit.BookMapperTest.getBookListWithIdorNameOrPrice2" />
|
|
|
- <item itemvalue="JUnit.BookMapperTest.getBookListWithIdorNameOrPrice" />
|
|
|
- <item itemvalue="JUnit.BookMapperTest.getBookInfo" />
|
|
|
+ <item itemvalue="JUnit.DepartmentMapperTest.getDepartmentInfoWithEmployee2" />
|
|
|
+ <item itemvalue="JUnit.TbKeyMapperTest.getKeyWithLock" />
|
|
|
+ <item itemvalue="JUnit.EmployeeMapperTest.getEmployeeinfoWithDepartment" />
|
|
|
+ <item itemvalue="JUnit.EmployeeMapperTest.getEmployeeinfo" />
|
|
|
+ <item itemvalue="JUnit.DepartmentMapperTest.getDepartmentInfoWithEmployee" />
|
|
|
</list>
|
|
|
</recent_temporary>
|
|
|
</component>
|
|
@@ -177,7 +184,7 @@
|
|
|
<option name="presentableId" value="Default" />
|
|
|
<updated>1689489421847</updated>
|
|
|
<workItem from="1689489423797" duration="8067000" />
|
|
|
- <workItem from="1689584772400" duration="20918000" />
|
|
|
+ <workItem from="1689584772400" duration="38786000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|