升级 3.0-RC3

CHANGELOG.md

@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## [v3.0-RC3] 2018.08.19 代号：超级棒棒糖 🍭 RC3
+- 支持 TableField select 属性 false 排除默认注入大字段查询
+- 解决 page 反序列化 pages 属性报错
+- 合并2.x dataSource被代理处理
+- 去除DbConfig.columnUnderline属性
+- 过滤掉selectObjs查询结果集为空的情况
+- baseMapper 的 insert 和 update 返回值不再使用包装类
+- fixed Gitee issues/IM3NW
+- 优化代码完善注释等
+
+
 ## [v3.0-RC2] 2018.08.10 代号：超级棒棒糖 🍭 RC2
 - 生成器加回 MODULE_NAME 开放配置 config
 - 修复setting - defaultEnumTypeHandler属性配置无效

build.gradle

@@ -58,7 +58,7 @@ ext {
 
 allprojects {
     group = 'com.baomidou'
-    version = '3.0-RC3.1-SNAPSHOT'
+    version = '3.0-RC3'
 }
 
 description = "Mybatis 增强工具包 - 只做增强不做改变，简化CRUD操作"

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/MybatisConfiguration.java

@@ -58,7 +58,7 @@ public class MybatisConfiguration extends Configuration {
         System.out.println("| |  | || |_| || |_/ /| (_| || |_ | |\\__ \\  | |    | || |_| |\\__ \\");
         System.out.println("\\_|  |_/ \\__, |\\____/  \\__,_| \\__||_||___/  \\_|    |_| \\__,_||___/");
         System.out.println("          __/ |                                                   ");
-        System.out.println("         |___/                                              3.0-RC2");
+        System.out.println("         |___/                                              3.0-RC3");
         System.out.println();
     }
 

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2UserMapperTest.java

@@ -1,5 +1,22 @@
 package com.baomidou.mybatisplus.test.h2;
 
+import static java.util.stream.Collectors.toList;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -7,23 +24,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.test.h2.config.H2Db;
+import com.baomidou.mybatisplus.test.h2.entity.enums.AgeEnum;
 import com.baomidou.mybatisplus.test.h2.entity.mapper.H2UserMapper;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static java.util.stream.Collectors.toList;
 
 /**
  * <p>
@@ -49,7 +52,7 @@ public class H2UserMapperTest extends BaseTest {
     public void crudTest() {
         H2User h2User = new H2User();
         h2User.setName(NQQ);
-        h2User.setAge(1);
+        h2User.setAge(AgeEnum.ONE);
         h2User.setDeleted(0);
         h2User.setDesc("这是一个不错的小伙子");
         Assert.assertTrue(1 == userMapper.insert(h2User));
@@ -61,17 +64,17 @@ public class H2UserMapperTest extends BaseTest {
         h2User.setName("测试");
         userMapper.insert(h2User);
         for (int i = 0; i < 10; i++) {
-            userMapper.insert(new H2User("mp" + i, i));
+            userMapper.insert(new H2User("mp" + i, AgeEnum.ONE));
         }
         Assert.assertTrue(1 == userMapper.deleteById(1L));
 
         Map<String, Object> map = new HashMap<>();
         map.put("name", "mp0");
-        map.put("age", 0);
+        map.put("age", AgeEnum.ONE);
 
         // 根据 map 查询
         h2User = userMapper.selectByMap(map).get(0);
-        Assert.assertTrue(0 == h2User.getAge());
+        Assert.assertTrue(AgeEnum.ONE == h2User.getAge());
 
         // 根据 map 删除
         Assert.assertTrue(1 == userMapper.deleteByMap(map));
@@ -93,24 +96,24 @@ public class H2UserMapperTest extends BaseTest {
 
         // 更新
         h2User = new H2User();
-        h2User.setAge(2);
+        h2User.setAge(AgeEnum.TWO);
         h2User.setDesc("测试置空");
         Assert.assertTrue(1 == userMapper.update(h2User,
             new QueryWrapper<H2User>().eq("name", NQQ)));
 
-        log(userMapper.selectOne(new QueryWrapper<>(new H2User().setName(NQQ).setAge(2))));
+        log(userMapper.selectOne(new QueryWrapper<>(new H2User().setName(NQQ).setAge(AgeEnum.TWO))));
 
-        h2User.setAge(3);
+        h2User.setAge(AgeEnum.THREE);
         h2User.setDesc(null);
         Assert.assertTrue(userMapper.update(h2User,
             new UpdateWrapper<H2User>().lambda()
                 .set(H2User::getDesc, "")
                 .eq(H2User::getName, "Jerry")) > 0);
 
-        log(userMapper.selectOne(new QueryWrapper<>(new H2User().setName(NQQ).setAge(3))));
+        log(userMapper.selectOne(new QueryWrapper<>(new H2User().setName(NQQ).setAge(AgeEnum.THREE))));
 
         // 根据主键更新 age = 18
-        h2User.setAge(18);
+        h2User.setAge(AgeEnum.TWO);
         Assert.assertNotNull(1 == userMapper.updateById(h2User));
 
         // 查询一条记录
@@ -136,12 +139,12 @@ public class H2UserMapperTest extends BaseTest {
                 System.out.println(m);
             }
         }
-        Assert.assertTrue(CollectionUtils.isNotEmpty(userMapper.selectMaps(new QueryWrapper<>(new H2User().setAge(18)))));
+        Assert.assertTrue(CollectionUtils.isNotEmpty(userMapper.selectMaps(new QueryWrapper<>(new H2User().setAge(AgeEnum.TWO)))));
     }
 
     @Test
     public void delete() {
-        userMapper.delete(new QueryWrapper<>(new H2User().setAge(2))
+        userMapper.delete(new QueryWrapper<>(new H2User().setAge(AgeEnum.TWO))
             .eq("name", "Tony"));
     }
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2UserTest.java

@@ -18,6 +18,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.test.h2.config.H2Db;
+import com.baomidou.mybatisplus.test.h2.entity.enums.AgeEnum;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
 import com.baomidou.mybatisplus.test.h2.service.IH2UserService;
 
@@ -125,7 +126,7 @@ public class H2UserTest extends BaseTest {
         H2User user = new H2User();
         user.setTestId(id);
         user.setName("991");
-        user.setAge(91);
+        user.setAge(AgeEnum.ONE);
         user.setPrice(BigDecimal.TEN);
         user.setDesc("asdf");
         user.setTestType(1);

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/config/MybatisPlusConfig.java

@@ -56,6 +56,7 @@ public class MybatisPlusConfig {
         });
         globalConfiguration.setMetaObjectHandler(new H2MetaObjectHandler());
         sqlSessionFactory.setGlobalConfig(globalConfiguration);
+        sqlSessionFactory.setTypeEnumsPackage("com.baomidou.mybatisplus.test.h2.entity.enums");
         return sqlSessionFactory.getObject();
     }
 

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/enums/AgeEnum.java

@@ -0,0 +1,30 @@
+package com.baomidou.mybatisplus.test.h2.entity.enums;
+
+import com.baomidou.mybatisplus.core.enums.IEnum;
+
+/**
+ * <p>
+ * 通用枚举注入演示，注意需要实现 IEnums 也需要扫描枚举包
+ * </p>
+ *
+ * @author hubin
+ * @since 2018-08-15
+ */
+public enum AgeEnum implements IEnum<Integer> {
+    ONE(1, "一岁"),
+    TWO(2, "二岁"),
+    THREE(3, "三岁");
+
+    private int value;
+    private String desc;
+
+    AgeEnum(final int value, final String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    @Override
+    public Integer getValue() {
+        return value;
+    }
+}

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/persistent/H2User.java

@@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.test.h2.entity.SuperEntity;
+import com.baomidou.mybatisplus.test.h2.entity.enums.AgeEnum;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -44,7 +45,7 @@ public class H2User extends SuperEntity {
     /* 测试忽略验证 */
     private String name;
 
-    private Integer age;
+    private AgeEnum age;
 
     /*BigDecimal 测试*/
     private BigDecimal price;
@@ -80,7 +81,7 @@ public class H2User extends SuperEntity {
         this.testType = testType;
     }
 
-    public H2User(String name, Integer age) {
+    public H2User(String name, AgeEnum age) {
         this.name = name;
         this.age = age;
     }
@@ -90,19 +91,19 @@ public class H2User extends SuperEntity {
         this.name = name;
     }
 
-    public H2User(Long id, Integer age) {
+    public H2User(Long id, AgeEnum age) {
         this.setTestId(id);
         this.age = age;
     }
 
-    public H2User(Long id, String name, Integer age, Integer testType) {
+    public H2User(Long id, String name, AgeEnum age, Integer testType) {
         this.setTestId(id);
         this.name = name;
         this.age = age;
         this.testType = testType;
     }
 
-    public H2User(String name, Integer age, Integer testType) {
+    public H2User(String name, AgeEnum age, Integer testType) {
         this.name = name;
         this.age = age;
         this.testType = testType;

mybatis-plus/src/test/resources/h2/user.insert.sql

@@ -1,5 +1,5 @@
 insert into h2user (test_id, name, test_date, age, price, test_type, version, deleted)values (101, 'Tomcat', '2017-1-1 1:1:1', 3, 9.99, 1, 1, 0);
 insert into h2user (test_id, name, test_date, age, price, test_type, version, deleted)values (102, 'Jerry', '2017-3-1 1:1:1', 2, 19.99, 2, 2, 0);
-insert into h2user (test_id, name, test_date, age, price, test_type, version, deleted)values (103, 'Bob', '2017-4-1 1:1:1', 13, 99.99, 3, 3, 0);
-insert into h2user (test_id, name, test_date, age, price, test_type, version, deleted)values (104, 'Joe', '2017-2-1 1:1:1', 18, 1.99, 1, 4, 0);
-insert into h2user (test_id, name, test_date, age, price, test_type, version, deleted)values (105, 'Tony', '2017-2-1 1:1:1', 18, 1.99, 1, 5, 0);
+insert into h2user (test_id, name, test_date, age, price, test_type, version, deleted)values (103, 'Bob', '2017-4-1 1:1:1', 1, 99.99, 3, 3, 0);
+insert into h2user (test_id, name, test_date, age, price, test_type, version, deleted)values (104, 'Joe', '2017-2-1 1:1:1', 1, 1.99, 1, 4, 0);
+insert into h2user (test_id, name, test_date, age, price, test_type, version, deleted)values (105, 'Tony', '2017-2-1 1:1:1', 3, 1.99, 1, 5, 0);