:tada: 升级mybatis-plus至3.1.1并填上升级带来的坑

pom.xml

@@ -20,12 +20,12 @@
         <swagger.version>2.9.2</swagger.version>
         <swagger.models.version>1.5.21</swagger.models.version>
         <swagger.bootstrapui.version>1.9.4</swagger.bootstrapui.version>
-        <mybatis.plus.version>3.1.0</mybatis.plus.version>
+        <mybatis.plus.version>3.1.1</mybatis.plus.version>
         <protostuff.version>1.6.0</protostuff.version>
         <flowable.version>6.4.1</flowable.version>
 
         <spring.boot.version>2.1.5.RELEASE</spring.boot.version>
-        <spring.platform.version>Cairo-SR7</spring.platform.version>
+        <spring.platform.version>Cairo-SR8</spring.platform.version>
 
         <!-- 推荐使用Harbor -->
         <docker.registry.url>10.211.55.5</docker.registry.url>
@@ -126,23 +126,12 @@
             <version>1.7</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis-spring</artifactId>
-            <version>2.0.0</version>
-        </dependency>
         <!-- lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <scope>provided</scope>
         </dependency>
-        <!-- devtools -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
 
     <build>

src/main/java/org/springblade/core/log/event/ApiLogListener.java

@@ -24,6 +24,7 @@ import org.springblade.core.launch.server.ServerInfo;
 import org.springblade.core.log.constant.EventConstant;
 import org.springblade.core.log.model.LogApi;
 import org.springblade.core.secure.utils.SecureUtil;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.UrlUtil;
 import org.springblade.core.tool.utils.WebUtil;
 import org.springblade.modules.system.service.ILogService;
@@ -32,7 +33,6 @@ import org.springframework.core.annotation.Order;
 import org.springframework.scheduling.annotation.Async;
 
 import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDateTime;
 import java.util.Map;
 
 
@@ -67,7 +67,7 @@ public class ApiLogListener {
 		logApi.setMethod(request.getMethod());
 		logApi.setParams(WebUtil.getRequestParamString(request));
 		logApi.setCreateBy(SecureUtil.getUserAccount(request));
-		logApi.setCreateTime(LocalDateTime.now());
+		logApi.setCreateTime(DateUtil.now());
 		logService.saveApiLog(logApi);
 	}
 

src/main/java/org/springblade/core/log/event/ErrorLogListener.java

@@ -24,6 +24,7 @@ import org.springblade.core.launch.server.ServerInfo;
 import org.springblade.core.log.constant.EventConstant;
 import org.springblade.core.log.model.LogError;
 import org.springblade.core.secure.utils.SecureUtil;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.WebUtil;
 import org.springblade.modules.system.service.ILogService;
 import org.springframework.context.event.EventListener;
@@ -31,7 +32,6 @@ import org.springframework.core.annotation.Order;
 import org.springframework.scheduling.annotation.Async;
 
 import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDateTime;
 import java.util.Map;
 
 /**
@@ -62,7 +62,7 @@ public class ErrorLogListener {
 		logError.setServerIp(serverInfo.getIpWithPort());
 		logError.setEnv(bladeProperties.getEnv());
 		logError.setCreateBy(SecureUtil.getUserAccount(request));
-		logError.setCreateTime(LocalDateTime.now());
+		logError.setCreateTime(DateUtil.now());
 		logService.saveErrorLog(logError);
 	}
 

src/main/java/org/springblade/core/log/event/UsualLogListener.java

@@ -24,6 +24,7 @@ import org.springblade.core.launch.server.ServerInfo;
 import org.springblade.core.log.constant.EventConstant;
 import org.springblade.core.log.model.LogUsual;
 import org.springblade.core.secure.utils.SecureUtil;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.UrlUtil;
 import org.springblade.core.tool.utils.WebUtil;
 import org.springblade.modules.system.service.ILogService;
@@ -32,7 +33,7 @@ import org.springframework.core.annotation.Order;
 import org.springframework.scheduling.annotation.Async;
 
 import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -64,7 +65,7 @@ public class UsualLogListener {
 		logUsual.setEnv(bladeProperties.getEnv());
 		logUsual.setServerIp(serverInfo.getIpWithPort());
 		logUsual.setCreateBy(SecureUtil.getUserAccount(request));
-		logUsual.setCreateTime(LocalDateTime.now());
+		logUsual.setCreateTime(DateUtil.now());
 		logService.saveUsualLog(logUsual);
 	}
 

src/main/java/org/springblade/flow/demo/leave/entity/ProcessLeave.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.flow.core.entity.FlowEntity;
 
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 请假流程实体类
@@ -46,11 +46,11 @@ public class ProcessLeave extends FlowEntity {
 	/**
 	 * 请假开始时间
 	 */
-	private LocalDateTime startTime;
+	private Date startTime;
 	/**
 	 * 请假结束时间
 	 */
-	private LocalDateTime endTime;
+	private Date endTime;
 	/**
 	 * 请假理由
 	 */
@@ -62,6 +62,6 @@ public class ProcessLeave extends FlowEntity {
 	/**
 	 * 流程申请时间
 	 */
-	private LocalDateTime applyTime;
+	private Date applyTime;
 
 }

src/main/java/org/springblade/flow/demo/leave/service/impl/LeaveServiceImpl.java

@@ -22,21 +22,19 @@ import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.support.Kv;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.flow.demo.leave.entity.ProcessLeave;
-import org.springblade.flow.demo.leave.mapper.LeaveMapper;
-import org.springblade.flow.demo.leave.service.ILeaveService;
 import org.springblade.flow.business.service.IFlowService;
 import org.springblade.flow.core.constant.ProcessConstant;
 import org.springblade.flow.core.entity.BladeFlow;
 import org.springblade.flow.core.utils.FlowUtil;
 import org.springblade.flow.core.utils.TaskUtil;
+import org.springblade.flow.demo.leave.entity.ProcessLeave;
+import org.springblade.flow.demo.leave.mapper.LeaveMapper;
+import org.springblade.flow.demo.leave.service.ILeaveService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.Duration;
-import java.time.LocalDateTime;
-
 /**
  * 服务实现类
  *
@@ -55,13 +53,13 @@ public class LeaveServiceImpl extends BaseServiceImpl<LeaveMapper, ProcessLeave>
 		String businessTable = FlowUtil.getBusinessTable(ProcessConstant.LEAVE_KEY);
 		if (Func.isEmpty(leave.getId())) {
 			// 保存leave
-			leave.setApplyTime(LocalDateTime.now());
+			leave.setApplyTime(DateUtil.now());
 			save(leave);
 			// 启动流程
 			Kv variables = Kv.create()
 				.set(ProcessConstant.TASK_VARIABLE_CREATE_USER, SecureUtil.getUserName())
 				.set("taskUser", TaskUtil.getTaskUser(leave.getTaskUser()))
-				.set("days", Duration.between(leave.getStartTime(), leave.getEndTime()).toDays());
+				.set("days", DateUtil.between(leave.getStartTime(), leave.getEndTime()).toDays());
 			BladeFlow flow = flowService.startProcessInstanceById(leave.getProcessDefinitionId(), FlowUtil.getBusinessKey(businessTable, String.valueOf(leave.getId())), variables);
 			if (Func.isNotEmpty(flow)) {
 				log.debug("流程已启动,流程ID:" + flow.getProcessInstanceId());

src/main/java/org/springblade/modules/system/entity/User.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 实体类
@@ -62,7 +62,7 @@ public class User extends TenantEntity {
 	/**
 	 * 生日
 	 */
-	private LocalDateTime birthday;
+	private Date birthday;
 	/**
 	 * 性别
 	 */

src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -25,6 +25,7 @@ import org.springblade.common.constant.CommonConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.constant.BladeConstant;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.DigestUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.system.entity.User;
@@ -33,7 +34,7 @@ import org.springblade.modules.system.mapper.UserMapper;
 import org.springblade.modules.system.service.IUserService;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -96,7 +97,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 	public boolean resetPassword(String userIds) {
 		User user = new User();
 		user.setPassword(DigestUtil.encrypt(CommonConstant.DEFAULT_PASSWORD));
-		user.setUpdateTime(LocalDateTime.now());
+		user.setUpdateTime(DateUtil.now());
 		return this.update(user, Wrappers.<User>update().lambda().in(User::getId, Func.toLongList(userIds)));
 	}