升级通用Mapper为3.1.0-SNAPSHOT

abel533 · abel533 · commit 13d305ac5c91 · 2015-06-10T09:11:34.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <targetProject>${basedir}/src/main/java</targetProject>
         <!--  依赖版本  -->
-        <mapper.version>3.0.0</mapper.version>
+        <mapper.version>3.1.0-SNAPSHOT</mapper.version>
         <pagehelper.version>3.7.4</pagehelper.version>
     </properties>
 
@@ -183,21 +183,10 @@
         </dependency>
         <!--通用Mapper-->
         <dependency>
-            <groupId>com.github.abel533</groupId>
+            <groupId>tk.mybatis</groupId>
             <artifactId>mapper</artifactId>
             <version>${mapper.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.github.abel533</groupId>
-            <artifactId>entitymapper</artifactId>
-            <version>1.0.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.github.abel533</groupId>
-                    <artifactId>mapper</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
     </dependencies>
     <dependencyManagement>
         <dependencies>
diff --git a/src/main/java/com/isea533/mybatis/mapper/Country2Mapper.java b/src/main/java/com/isea533/mybatis/mapper/Country2Mapper.java
@@ -1,11 +1,7 @@
 package com.isea533.mybatis.mapper;
 
-import com.github.abel533.mapper.Mapper;
 import com.isea533.mybatis.model.Country2;
-import com.isea533.mybatis.model.Country2Example;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
+import tk.mybatis.mapper.common.Mapper;
 
 public interface Country2Mapper extends Mapper<Country2> {
 
diff --git a/src/main/java/com/isea533/mybatis/mapper/CountryMapper.java b/src/main/java/com/isea533/mybatis/mapper/CountryMapper.java
@@ -1,6 +1,6 @@
 package com.isea533.mybatis.mapper;
 
-import com.github.abel533.mapper.Mapper;
+import tk.mybatis.mapper.common.Mapper;
 import com.isea533.mybatis.model.Country;
 
 public interface CountryMapper extends Mapper<Country> {
diff --git a/src/main/java/com/isea533/mybatis/mapper/UserInfoMapper.java b/src/main/java/com/isea533/mybatis/mapper/UserInfoMapper.java
@@ -1,6 +1,6 @@
 package com.isea533.mybatis.mapper;
 
-import com.github.abel533.mapper.Mapper;
+import tk.mybatis.mapper.common.Mapper;
 import com.isea533.mybatis.model.UserInfo;
 
 public interface UserInfoMapper extends Mapper<UserInfo> {
diff --git a/src/main/java/com/isea533/mybatis/mapper/UserLoginMapper.java b/src/main/java/com/isea533/mybatis/mapper/UserLoginMapper.java
@@ -1,6 +1,6 @@
 package com.isea533.mybatis.mapper;
 
-import com.github.abel533.mapper.Mapper;
+import tk.mybatis.mapper.common.Mapper;
 import com.isea533.mybatis.model.UserLogin;
 
 public interface UserLoginMapper extends Mapper<UserLogin> {
diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml
@@ -42,12 +42,12 @@
             </value>
           </property>
         </bean>
-        <bean class="com.github.abel533.mapperhelper.MapperInterceptor">
+        <bean class="tk.mybatis.mapper.mapperhelper.MapperInterceptor">
           <property name="properties">
             <value>
-              mappers=com.github.abel533.mapper.Mapper
-              IDENTITY=MYSQL
-              notEmpty=true
+                mappers=tk.mybatis.mapper.common.Mapper
+                IDENTITY=MYSQL
+                notEmpty=true
             </value>
           </property>
         </bean>
@@ -56,11 +56,7 @@
   </bean>
 
   <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-    <property name="basePackage" value="com.isea533.mybatis.mapper,com.github.abel533.entity.mapper"/>
-  </bean>
-
-  <bean id="entityMapper" class="com.github.abel533.entity.EntityMapper" scope="prototype">
-    <constructor-arg ref="commonMapper"/>
+    <property name="basePackage" value="com.isea533.mybatis.mapper"/>
   </bean>
 
   <bean id="sqlSession" class="org.mybatis.spring.SqlSessionTemplate" scope="prototype">
diff --git a/src/test/java/com/isea533/mybatis/test/PageEntityMapperTest.java b/src/test/java/com/isea533/mybatis/test/PageEntityMapperTest.java
