调整测试用例

src/test/java/com/baomidou/mybatisplus/test/mysql/MyMetaObjectHandler.java

@@ -15,8 +15,6 @@
  */
 package com.baomidou.mybatisplus.test.mysql;
 
-import java.sql.Timestamp;
-
 import org.apache.ibatis.reflection.MetaObject;
 
 import com.baomidou.mybatisplus.mapper.MetaObjectHandler;
@@ -35,28 +33,27 @@ public class MyMetaObjectHandler extends MetaObjectHandler {
      * 测试 user 表 name 字段为空自动填充
      */
     public void insertFill(MetaObject metaObject) {
-//		Object name = metaObject.getValue("name");
-//		if (null == name) {
-//			metaObject.setValue("name", "instert-fill");
-//		}
-
-        System.out.println("*************************");
-        System.out.println("insert fill");
-        System.out.println("*************************");
-
         // 测试下划线
         Object testType = getFieldValByName("testType", metaObject);
         System.out.println("testType=" + testType);
-        if (testType == null) {
+        if (testType == null) {// 如果不会设置这里不需要判断, 直接 set
+            System.out.println("*************************");
+            System.out.println("insert fill");
+            System.out.println("*************************");
             setFieldValByName("testType", 3, metaObject);
         }
     }
 
     @Override
-    public void updateFill(MetaObject metaObject) {
+    public boolean openUpdateFill() {
         System.out.println("*************************");
-        System.out.println("update fill");
+        System.out.println(" 关闭更新填充 ");
         System.out.println("*************************");
-        setFieldValByName("lastUpdatedDt", new Timestamp(System.currentTimeMillis()), metaObject);
+        return false;
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        // 这里不会执行
     }
 }

src/test/java/com/baomidou/mybatisplus/test/mysql/UserMapperTest.java

@@ -15,17 +15,14 @@
  */
 package com.baomidou.mybatisplus.test.mysql;
 
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.session.SqlSession;
-import org.apache.ibatis.session.SqlSessionFactory;
 import org.junit.Test;
 
-import com.baomidou.mybatisplus.MybatisSessionFactoryBuilder;
 import com.baomidou.mybatisplus.entity.GlobalConfiguration;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
@@ -57,7 +54,7 @@ public class UserMapperTest extends CrudTest {
         /**
          * 设置，自定义 元对象填充器，实现公共字段自动写入
          */
-        //gc.setMetaObjectHandler(new MyMetaObjectHandler());
+        gc.setMetaObjectHandler(new MyMetaObjectHandler());
         // gc.setCapitalMode(true);
         gc.setDbColumnUnderline(true);
         return gc;
@@ -156,6 +153,7 @@ public class UserMapperTest extends CrudTest {
             rlt = userMapper.insert(u);
         }
         System.err.println("\n--------------insertBatch----------------" + rlt + "\n\n");
+        System.err.println("\n 自定义填充 testType=3 填充成功！" + userMapper.selectById(18L).toString());
 
         /**
          * 提交，往下操作在一个事物中！！！

src/test/java/com/baomidou/mybatisplus/test/mysql/entity/User.java

@@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableLogic;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.annotations.Version;
+import com.baomidou.mybatisplus.enums.FieldIgnore;
 import com.baomidou.mybatisplus.enums.FieldStrategy;
 
 /**
@@ -55,7 +56,7 @@ public class User implements Serializable {
     private BigDecimal price;
 
     /* 测试下划线字段命名类型, 字段填充 */
-    @TableField(value = "test_type", strategy = FieldStrategy.IGNORED)
+    @TableField(value = "test_type", ignore = FieldIgnore.INSERT)
     @TableLogic(value = "-2") // 该注解为了测试逻辑删除、这里设置 -2 为删除值
     private Integer testType;
 

src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/OptimisticLockerInterceptorTest.java

@@ -53,7 +53,7 @@ public class OptimisticLockerInterceptorTest {
     public void setUp() throws Exception {
         SqlSession session = sqlSessionTemplate.getSqlSessionFactory().openSession();
         Connection conn = session.getConnection();
-        Reader reader = Resources.getResourceAsReader("h2/optlock/CreateDB.sql");
+        Reader reader = Resources.getResourceAsReader("plugins/optimisticLocker.sql");
         ScriptRunner runner = new ScriptRunner(conn);
         runner.setLogWriter(null);
         runner.runScript(reader);
@@ -194,4 +194,5 @@ public class OptimisticLockerInterceptorTest {
     public void runWithDeleteLogicTest() {
         logicVersionUserMapper.deleteById(1L);
     }
+
 }

src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/mybatis-config.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration
-    PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
-    "http://mybatis.org/dtd/mybatis-3-config.dtd">
-
-<configuration>
-	<plugins>
-		<plugin interceptor="com.baomidou.mybatisplus.plugins.PerformanceInterceptor"></plugin>
-		<plugin interceptor="com.baomidou.mybatisplus.plugins.OptimisticLockerInterceptor"></plugin>
-	</plugins>
-
-	<environments default="development">
-		<environment id="development">
-			<transactionManager type="JDBC">
-				<property name="" value="" />
-			</transactionManager>
-			<dataSource type="UNPOOLED">
-				<property name="driver" value="com.mysql.jdbc.Driver" />
-				<property name="url" value="jdbc:mysql://localhost:3306/mybatis-plus" />
-				<property name="username" value="root" />
-				<property name="password" value="!Ty5546380" />
-			</dataSource>
-
-		</environment>
-
-	</environments>
-
-	<mappers>
-		<mapper class="com.baomidou.mybatisplus.test.plugin.OptimisticLocker.mapper.IntVersionUserMapper" />
-		<mapper class="com.baomidou.mybatisplus.test.plugin.OptimisticLocker.mapper.LongVersionUserMapper" />
-		<mapper class="com.baomidou.mybatisplus.test.plugin.OptimisticLocker.mapper.DateVersionUserMapper" />
-		<mapper class="com.baomidou.mybatisplus.test.plugin.OptimisticLocker.mapper.TimestampVersionUserMapper" />
-	</mappers>
-
-</configuration>

src/test/java/com/baomidou/mybatisplus/test/plugins/paginationInterceptor/PaginationInterceptorTest.java

@@ -41,7 +41,7 @@ public class PaginationInterceptorTest {
     public void setUp() throws Exception {
         SqlSession session = sqlSessionTemplate.getSqlSessionFactory().openSession();
         Connection conn = session.getConnection();
-        Reader reader = Resources.getResourceAsReader("plugins/paginationInterceptor/CreateDB.sql");
+        Reader reader = Resources.getResourceAsReader("plugins/pagination.sql");
         ScriptRunner runner = new ScriptRunner(conn);
         runner.setLogWriter(null);
         runner.runScript(reader);

src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/CreateDB.sql → src/test/resources/plugins/optimisticLocker.sql

@@ -3,7 +3,7 @@ IF EXISTS version_user;
 
 CREATE TABLE version_user (
 	id bigint (11) NOT NULL ,
-	NAME VARCHAR (20),
+	name VARCHAR (20),
 	age INT (11),
 	version INT (11),
 	isDelete INT (11) DEFAULT 0,
@@ -19,7 +19,7 @@ IF EXISTS time_version_user;
 
 CREATE TABLE time_version_user (
 	id bigint (11) NOT NULL ,
-	NAME VARCHAR (20),
+	name VARCHAR (20),
 	version datetime,
 	PRIMARY KEY (`id`)
 ) ENGINE = INNODB AUTO_INCREMENT = 1 DEFAULT CHARSET = utf8;

src/test/resources/plugins/optimisticLockerInterceptor.xml

@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd   
-           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd  
-           http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
-	<context:component-scan
-		base-package="com.baomidou.mybatisplus.test.plugins.optimisticLocker" />
+	<context:component-scan base-package="com.baomidou.mybatisplus.test.plugins.optimisticLocker" />
 
 	<import resource="classpath:h2/spring-jdbc.xml" />
 
@@ -16,14 +13,14 @@
 	<bean id="sqlSessionFactory"
 		class="com.baomidou.mybatisplus.spring.MybatisSqlSessionFactoryBean">
 		<property name="dataSource" ref="dataSource" />
-		<property name="typeAliasesPackage"
-			value="com.baomidou.mybatisplus.test.plugins.optimisticLocker.entity" />
+		<property name="typeAliasesPackage" value="com.baomidou.mybatisplus.test.plugins.optimisticLocker.entity" />
 		<property name="plugins">
 			<array>
 				<bean class="com.baomidou.mybatisplus.plugins.OptimisticLockerInterceptor"/>
 				<bean class="com.baomidou.mybatisplus.plugins.PerformanceInterceptor" />
 			</array>
 		</property>
+		<property name="globalConfig" ref="globalConfig" />
 	</bean>
 
 	<bean id="sqlSessionTemplate" class="org.mybatis.spring.SqlSessionTemplate">
@@ -31,13 +28,12 @@
 	</bean>
 
 	<bean id="mapperScannerConfigurer" class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-		<property name="basePackage"
-			value="com.baomidou.mybatisplus.test.plugins.optimisticLocker.mapper" />
+		<property name="basePackage" value="com.baomidou.mybatisplus.test.plugins.optimisticLocker.mapper" />
 	</bean>
 
 	<bean id="globalConfig" class="com.baomidou.mybatisplus.entity.GlobalConfiguration">
-		<property name="sqlInjector" ref="mySqlInjector" />
+		<property name="sqlInjector">
+			<bean class="com.baomidou.mybatisplus.mapper.LogicSqlInjector" />
+		</property>
 	</bean>
-
-	<bean id="mySqlInjector" class="com.baomidou.mybatisplus.mapper.LogicSqlInjector" />
 </beans>

src/test/resources/plugins/paginationInterceptor.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd   
-           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd  
-           http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
 	<context:component-scan base-package="com.baomidou.mybatisplus.test.plugins" />
 
@@ -15,8 +13,7 @@
 	<bean id="sqlSessionFactory"
 		class="com.baomidou.mybatisplus.spring.MybatisSqlSessionFactoryBean">
 		<property name="dataSource" ref="dataSource" />
-		<property name="typeAliasesPackage"
-			value="com.baomidou.mybatisplus.test.plugins.paginationInterceptor.entity" />
+		<property name="typeAliasesPackage" value="com.baomidou.mybatisplus.test.plugins.paginationInterceptor.entity" />
 		<property name="plugins">
 			<array>
 				<bean class="com.baomidou.mybatisplus.plugins.PerformanceInterceptor" />
@@ -32,7 +29,6 @@
 	</bean>
 
 	<bean id="mapperScannerConfigurer" class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-		<property name="basePackage"
-			value="com.baomidou.mybatisplus.test.plugins.paginationInterceptor.mapper" />
+		<property name="basePackage" value="com.baomidou.mybatisplus.test.plugins.paginationInterceptor.mapper" />
 	</bean>
 </beans>