升级通用Mapper为3.1.0-SNAPSHOT

abel533 · abel533 · commit d912781fb108 · 2015-06-10T09:27:03.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
         <!--  编译jdk版本  -->
         <jdk.version>1.6</jdk.version>
         <!--  依赖版本  -->
-        <mapper.version>3.0.0</mapper.version>
+        <mapper.version>3.1.0-SNAPSHOT</mapper.version>
         <pagehelper.version>3.7.4</pagehelper.version>
         <mysql.version>5.1.29</mysql.version>
         <spring.version>4.1.2.RELEASE</spring.version>
@@ -189,21 +189,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>
@@ -287,7 +276,7 @@
                         <version>${mysql.version}</version>
                     </dependency>
                     <dependency>
-                        <groupId>com.github.abel533</groupId>
+                        <groupId>tk.mybatis</groupId>
                         <artifactId>mapper</artifactId>
                         <version>${mapper.version}</version>
                     </dependency>
diff --git a/src/main/java/com/isea533/mybatis/controller/demo/DemoController.java b/src/main/java/com/isea533/mybatis/controller/demo/DemoController.java
@@ -55,7 +55,6 @@ public List<Country> requestTest7(
             @RequestParam(value = "pageSize", required = false, defaultValue = "10") int pageSize
     ) {
         demoService.test();
-        demoService.testEntityMapper();
         return demoService.selectPage(pageNum, pageSize);
     }
 }
diff --git a/src/main/java/com/isea533/mybatis/mapper/CountryMapper.java b/src/main/java/com/isea533/mybatis/mapper/CountryMapper.java
@@ -24,7 +24,7 @@
 
 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
@@ -24,7 +24,7 @@
 
 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/UserLoginInfoMapper.java b/src/main/java/com/isea533/mybatis/mapper/UserLoginInfoMapper.java
@@ -24,7 +24,7 @@
 
 package com.isea533.mybatis.mapper;
 
-import com.github.abel533.mapper.Mapper;
+import tk.mybatis.mapper.common.Mapper;
 import com.isea533.mybatis.model.UserLoginInfo;
 
 public interface UserLoginInfoMapper extends Mapper<UserLoginInfo> {
diff --git a/src/main/java/com/isea533/mybatis/service/BaseService.java b/src/main/java/com/isea533/mybatis/service/BaseService.java
@@ -24,7 +24,7 @@
 
 package com.isea533.mybatis.service;
 
-import com.github.abel533.mapper.Mapper;
+import tk.mybatis.mapper.common.Mapper;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/isea533/mybatis/service/DemoService.java b/src/main/java/com/isea533/mybatis/service/DemoService.java
@@ -24,12 +24,10 @@
 
 package com.isea533.mybatis.service;
 
-import com.github.abel533.entity.EntityMapper;
-import com.github.abel533.mapper.Mapper;
 import com.isea533.mybatis.model.Country;
-import com.isea533.mybatis.model.UserInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.common.Mapper;
 
 /**
  * @author liuzh
@@ -40,9 +38,6 @@ public class DemoService extends BaseService<Country> {
     @Autowired
     private Mapper<Country> countryMapper;
 
-    @Autowired
-    private EntityMapper entityMapper;
-
     public int save(Country country) {
         if (country == null) {
             throw new NullPointerException("保存的对象不能为空!");
@@ -61,11 +56,4 @@ public void test() {
         System.out.println(result);
     }
 
-    public void testEntityMapper(){
-        Country country = entityMapper.selectByPrimaryKey(Country.class, 100);
-        int count = entityMapper.count(new Country());
-        System.out.println(country.toString());
-        System.out.println(count);
-    }
-
 }
diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml
@@ -76,12 +76,12 @@
         <bean class="com.github.pagehelper.PageHelper">
           <property name="properties">
             <value>
-              dialect=hsqldb
+              dialect=mysql
               reasonable=true
             </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
@@ -98,14 +98,6 @@
     <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"/>
-  </bean>
-
-  <bean id="sqlMapper" class="com.github.abel533.sql.SqlMapper" scope="prototype">
-    <constructor-arg ref="sqlSession"/>
-  </bean>
-
   <bean id="sqlSession" class="org.mybatis.spring.SqlSessionTemplate" scope="prototype">
     <constructor-arg index="0" ref="sqlSessionFactory"/>
   </bean>
diff --git a/src/test/java/com/isea533/mybatis/test/PageEntityMapperTest.java b/src/test/java/com/isea533/mybatis/test/PageEntityMapperTest.java
diff --git a/src/test/java/com/isea533/mybatis/test/PageMapperTest.java b/src/test/java/com/isea533/mybatis/test/PageMapperTest.java
@@ -24,8 +24,7 @@
 
 package com.isea533.mybatis.test;
 
-import com.github.abel533.entity.EntityMapper;
-import com.github.abel533.entity.Example;
+import tk.mybatis.mapper.entity.Example;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.isea533.mybatis.mapper.CountryMapper;
diff --git a/src/test/java/com/isea533/mybatis/test/PageSqlMapperTest.java b/src/test/java/com/isea533/mybatis/test/PageSqlMapperTest.java

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ public List<Country> requestTest7(`
`55`	`55`	`@RequestParam(value = "pageSize", required = false, defaultValue = "10") int pageSize`
`56`	`56`	`) {`
`57`	`57`	`demoService.test();`
`58`		`- demoService.testEntityMapper();`
`59`	`58`	`return demoService.selectPage(pageNum, pageSize);`
`60`	`59`	`}`
`61`	`60`	`}`