Merge branch 'dev'

Author: colorful3

README.md

@@ -37,7 +37,7 @@
 
 ### 线上 demo
 
-[http://face.cms.7yue.pro/](http://face.cms.7yue.pro/)
+[http://face.cms.talelin.com/](http://face.cms.talelin.com/)
 
 ### 文档地址
 

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.3.RELEASE</version>
+        <version>2.4.3</version>
         <relativePath/>
     </parent>
 
@@ -22,8 +22,7 @@
         <java.version>1.8</java.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <mybatis-plus.version>3.4.0</mybatis-plus.version>
-        <hutool.version>5.4.2</hutool.version>
+        <mybatis-plus.version>3.4.1</mybatis-plus.version>
         <freemarker.version>2.3.30</freemarker.version>
     </properties>
 
@@ -74,16 +73,10 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-core</artifactId>
-            <version>${hutool.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.qiniu</groupId>
             <artifactId>qiniu-java-sdk</artifactId>
-            <version>7.3.0</version>
+            <version>7.4.0</version>
         </dependency>
 
         <dependency>

src/main/java/io/github/talelin/latticy/bo/GroupPermissionBO.java

@@ -1,17 +1,18 @@
 package io.github.talelin.latticy.bo;
 
-import cn.hutool.core.bean.BeanUtil;
 import io.github.talelin.latticy.model.GroupDO;
 import io.github.talelin.latticy.model.PermissionDO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.beans.BeanUtils;
 
 import java.util.List;
 
 /**
  * @author pedro@TaleLin
  * @author Juzi@TaleLin
+ * @author colorful@TaleLin
  */
 @Data
 @NoArgsConstructor
@@ -26,7 +27,7 @@ public class GroupPermissionBO {
     private List<PermissionDO> permissions;
 
     public GroupPermissionBO(GroupDO group, List<PermissionDO> permissions) {
-        BeanUtil.copyProperties(group, this);
+        BeanUtils.copyProperties(group, this);
         this.permissions = permissions;
     }
 }

src/main/java/io/github/talelin/latticy/common/aop/ResultAspect.java

@@ -1,11 +1,11 @@
 package io.github.talelin.latticy.common.aop;
 
-import cn.hutool.core.util.StrUtil;
 import io.github.talelin.latticy.common.configuration.CodeMessageConfiguration;
 import io.github.talelin.latticy.vo.UnifyResponseVO;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
 import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
 
 /**
  * 处理返回结果为 UnifyResponseVO 的 Controller
@@ -21,14 +21,14 @@ public class ResultAspect {
     @AfterReturning(returning = "result", pointcut = "execution(public * io.github.talelin.latticy.controller..*.*(..))")
     public void doAfterReturning(UnifyResponseVO<String> result) {
         int code = result.getCode();
-        String oldMessage = result.getMessage();
+        String messageOfVO = result.getMessage();
         // code-message.properties 中配置的 message
-        String newMessage = CodeMessageConfiguration.getMessage(code);
+        String messageOfConfiguration = CodeMessageConfiguration.getMessage(code);
 
         // 如果 code-message.properties 中指定了相应的 message 并且 UnifyResponseVO 的 message 为null
-        // 则使用 newMessage 替换 oldMessage
-        if (StrUtil.isNotBlank(newMessage) && StrUtil.isBlank(oldMessage)) {
-            result.setMessage(newMessage);
+        // 则使用 messageOfConfiguration 替换 messageOfVO
+        if (StringUtils.hasText(messageOfConfiguration) && !StringUtils.hasText(messageOfVO)) {
+            result.setMessage(messageOfConfiguration);
         }
     }
 }

src/main/java/io/github/talelin/latticy/common/configuration/CommonConfiguration.java

@@ -1,34 +1,50 @@
 package io.github.talelin.latticy.common.configuration;
 
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
 import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
 import com.baomidou.mybatisplus.core.injector.ISqlInjector;
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import io.github.talelin.autoconfigure.bean.PermissionMetaCollector;
 import io.github.talelin.latticy.common.interceptor.RequestLogInterceptor;
-import io.github.talelin.latticy.module.file.FileProperties;
 import io.github.talelin.latticy.module.log.MDCAccessServletFilter;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
  * @author pedro@TaleLin
+ * @author colorful@TaleLin
  */
 @Configuration(proxyBeanMethods = false)
-@EnableConfigurationProperties(FileProperties.class)
 public class CommonConfiguration {
 
     @Bean
     public RequestLogInterceptor requestLogInterceptor() {
         return new RequestLogInterceptor();
     }
 
+    /**
+     * 新的分页插件,一缓和二缓遵循mybatis的规则
+     * 需要设置 MybatisConfiguration#useDeprecatedExecutor = false 避免缓存出现问题(该属性会在旧插件移除后一同移除)
+     * 参考链接：https://mp.baomidou.com/guide/interceptor.htm
+     */
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
+    }
+
+    /**
+     * 参考链接：https://mp.baomidou.com/guide/interceptor.htm
+     */
     @Bean
-    public PaginationInterceptor paginationInterceptor() {
-        return new PaginationInterceptor();
+    public ConfigurationCustomizer configurationCustomizer() {
+        return configuration -> configuration.setUseDeprecatedExecutor(false);
     }
 
     @Bean

src/main/java/io/github/talelin/latticy/common/configuration/WebConfiguration.java

@@ -3,8 +3,8 @@
 import io.github.talelin.latticy.common.interceptor.RequestLogInterceptor;
 import io.github.talelin.autoconfigure.interceptor.AuthorizeInterceptor;
 import io.github.talelin.autoconfigure.interceptor.LogInterceptor;
+import io.github.talelin.latticy.module.file.FileUtil;
 import lombok.extern.slf4j.Slf4j;
-import cn.hutool.core.io.FileUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
@@ -20,6 +20,7 @@
  * Spring MVC 配置
  *
  * @author pedro@TaleLin
+ * @author colorful@TaleLin
  */
 @Configuration(proxyBeanMethods = false)
 @Slf4j
@@ -55,7 +56,7 @@ public class WebConfiguration implements WebMvcConfigurer {
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
-                .allowedOrigins("*")
+                .allowedOriginPatterns("*")
                 .allowedMethods("GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS")
                 .allowCredentials(true)
                 .maxAge(3600)
@@ -94,7 +95,7 @@ private String getDirServePath() {
      * 获得文件夹的绝对路径
      */
     private String getAbsDir() {
-        if (FileUtil.isAbsolutePath(dir)) {
+        if (FileUtil.isAbsolute(dir)) {
             return dir;
         }
         String cmd = System.getProperty("user.dir");

src/main/java/io/github/talelin/latticy/common/enumeration/GroupLevelEnum.java

@@ -1,6 +1,7 @@
 package io.github.talelin.latticy.common.enumeration;
 
-import com.baomidou.mybatisplus.core.enums.IEnum;
+
+import com.baomidou.mybatisplus.annotation.IEnum;
 
 /**
  * @author colorful@TaleLin
@@ -30,7 +31,7 @@ public enum GroupLevelEnum implements IEnum<Integer> {
      * MybatisEnumTypeHandler 转换时调用此方法
      *
      * @return 枚举对应的 code 值
-     * @see com.baomidou.mybatisplus.extension.handlers.MybatisEnumTypeHandler
+     * @see com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler
      */
     @Override
     public Integer getValue() {

src/main/java/io/github/talelin/latticy/common/exception/RestExceptionHandler.java

@@ -1,6 +1,5 @@
 package io.github.talelin.latticy.common.exception;
 
-import cn.hutool.core.util.StrUtil;
 import io.github.talelin.autoconfigure.bean.Code;
 import io.github.talelin.autoconfigure.exception.HttpException;
 import io.github.talelin.latticy.common.configuration.CodeMessageConfiguration;
@@ -11,6 +10,7 @@
 import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.util.StringUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.FieldError;
 import org.springframework.validation.ObjectError;
@@ -60,7 +60,7 @@ public UnifyResponseVO processException(HttpException exception, HttpServletRequ
         unifyResponse.setCode(code);
         response.setStatus(exception.getHttpCode());
         String errorMessage = CodeMessageConfiguration.getMessage(code);
-        if (StrUtil.isBlank(errorMessage) || !defaultMessage) {
+        if (!StringUtils.hasText(errorMessage) || !defaultMessage) {
             unifyResponse.setMessage(exception.getMessage());
             log.error("", exception);
         } else {
@@ -80,7 +80,7 @@ public UnifyResponseVO processException(ConstraintViolationException exception,
         exception.getConstraintViolations().forEach(constraintViolation -> {
             String template = constraintViolation.getMessage();
             String path = constraintViolation.getPropertyPath().toString();
-            msg.put(StrUtil.toUnderlineCase(path), template);
+            msg.put(com.baomidou.mybatisplus.core.toolkit.StringUtils.camelToUnderline(path), template);
         });
         UnifyResponseVO unifyResponse = new UnifyResponseVO();
         unifyResponse.setRequest(getSimpleRequest(request));
@@ -99,7 +99,7 @@ public UnifyResponseVO processException(NoHandlerFoundException exception, HttpS
         UnifyResponseVO unifyResponse = new UnifyResponseVO();
         unifyResponse.setRequest(getSimpleRequest(request));
         String message = CodeMessageConfiguration.getMessage(10025);
-        if (StrUtil.isBlank(message)) {
+        if (!StringUtils.hasText(message)) {
             unifyResponse.setMessage(exception.getMessage());
         } else {
             unifyResponse.setMessage(message);
@@ -119,7 +119,7 @@ public UnifyResponseVO processException(MissingServletRequestParameterException
         result.setRequest(getSimpleRequest(request));
 
         String errorMessage = CodeMessageConfiguration.getMessage(10150);
-        if (StrUtil.isBlank(errorMessage)) {
+        if (!StringUtils.hasText(errorMessage)) {
             result.setMessage(exception.getMessage());
         } else {
             result.setMessage(errorMessage + exception.getParameterName());
@@ -138,7 +138,7 @@ public UnifyResponseVO processException(MethodArgumentTypeMismatchException exce
         UnifyResponseVO result = new UnifyResponseVO();
         result.setRequest(getSimpleRequest(request));
         String errorMessage = CodeMessageConfiguration.getMessage(10160);
-        if (StrUtil.isBlank(errorMessage)) {
+        if (!StringUtils.hasText(errorMessage)) {
             result.setMessage(exception.getMessage());
         } else {
             result.setMessage(exception.getValue() + errorMessage);
@@ -166,17 +166,19 @@ public UnifyResponseVO processException(ServletException exception, HttpServletR
      * MethodArgumentNotValidException
      */
     @ExceptionHandler({MethodArgumentNotValidException.class})
-    public UnifyResponseVO processException(MethodArgumentNotValidException exception, HttpServletRequest request, HttpServletResponse response) {
+    public UnifyResponseVO processException(
+            MethodArgumentNotValidException exception, HttpServletRequest request, HttpServletResponse response) {
         log.error("", exception);
         BindingResult bindingResult = exception.getBindingResult();
         List<ObjectError> errors = bindingResult.getAllErrors();
         Map<String, Object> msg = new HashMap<>();
         errors.forEach(error -> {
             if (error instanceof FieldError) {
                 FieldError fieldError = (FieldError) error;
-                msg.put(StrUtil.toUnderlineCase(fieldError.getField()), fieldError.getDefaultMessage());
+                msg.put(com.baomidou.mybatisplus.core.toolkit.StringUtils.camelToUnderline(fieldError.getField()),
+                        fieldError.getDefaultMessage());
             } else {
-                msg.put(StrUtil.toUnderlineCase(error.getObjectName()), error.getDefaultMessage());
+                msg.put(com.baomidou.mybatisplus.core.toolkit.StringUtils.camelToUnderline(error.getObjectName()), error.getDefaultMessage());
             }
         });
         UnifyResponseVO result = new UnifyResponseVO();
@@ -201,7 +203,7 @@ public UnifyResponseVO processException(HttpMessageNotReadableException exceptio
             String msg = this.convertMessage(cause);
             result.setMessage(msg);
         } else {
-            if (StrUtil.isBlank(errorMessage)) {
+            if (!StringUtils.hasText(errorMessage)) {
                 result.setMessage(exception.getMessage());
             } else {
                 result.setMessage(errorMessage);
@@ -235,7 +237,7 @@ public UnifyResponseVO processException(MaxUploadSizeExceededException exception
         UnifyResponseVO result = new UnifyResponseVO();
         result.setRequest(getSimpleRequest(request));
         String errorMessage = CodeMessageConfiguration.getMessage(10180);
-        if (StrUtil.isBlank(errorMessage)) {
+        if (!StringUtils.hasText(errorMessage)) {
             result.setMessage(exception.getMessage());
         } else {
             result.setMessage(errorMessage + maxFileSize);

src/main/java/io/github/talelin/latticy/common/interceptor/LoggerImpl.java

@@ -20,6 +20,7 @@
 /**
  * @author pedro@TaleLin
  * @author Juzi@TaleLin
+ * @author colorful@TaleLin
  */
 @Slf4j
 @Component
@@ -40,7 +41,7 @@ public void handle(PermissionMeta meta, Logger logger, HttpServletRequest reques
         template = this.parseTemplate(template, user, request, response);
         String permission = "";
         if (meta != null) {
-            permission = StringUtils.isEmpty(meta.value()) ? meta.value() : meta.value();
+            permission = !StringUtils.hasLength(meta.value()) ? meta.value() : meta.value();
         }
         Integer userId = user.getId();
         String username = user.getUsername();

src/main/java/io/github/talelin/latticy/common/interceptor/RequestLogInterceptor.java

@@ -1,29 +1,29 @@
 package io.github.talelin.latticy.common.interceptor;
 
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+import org.springframework.web.servlet.AsyncHandlerInterceptor;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
  * @author pedro@TaleLin
+ * @author colorful@TaleLin
  */
 @Slf4j
-public class RequestLogInterceptor extends HandlerInterceptorAdapter {
+public class RequestLogInterceptor implements AsyncHandlerInterceptor {
 
 
     private ThreadLocal<Long> startTime = new ThreadLocal<>();
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         startTime.set(System.currentTimeMillis());
-        return super.preHandle(request, response, handler);
+        return true;
     }
 
     @Override
     public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
-        super.afterCompletion(request, response, handler, ex);
         log.info("[{}] -> [{}] from: {} costs: {}ms",
                 request.getMethod(),
                 request.getServletPath(),