refactor: 移除对 hutool 的依赖

colorful3 · juzi214032 · commit 359200c760af · 2021-02-05T16:20:14.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,6 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <mybatis-plus.version>3.4.1</mybatis-plus.version>
-        <hutool.version>5.5.1</hutool.version>
         <freemarker.version>2.3.30</freemarker.version>
     </properties>
 
@@ -74,12 +73,6 @@
             <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>
diff --git a/src/main/java/io/github/talelin/latticy/bo/GroupPermissionBO.java b/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;
     }
 }
diff --git a/src/main/java/io/github/talelin/latticy/common/aop/ResultAspect.java b/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);
         }
     }
 }
diff --git a/src/main/java/io/github/talelin/latticy/common/configuration/WebConfiguration.java b/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
@@ -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");
diff --git a/src/main/java/io/github/talelin/latticy/common/exception/RestExceptionHandler.java b/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;
@@ -58,7 +58,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 {
@@ -78,7 +78,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));
@@ -97,7 +97,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);
@@ -117,7 +117,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());
@@ -136,7 +136,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);
@@ -164,17 +164,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();
@@ -194,7 +196,7 @@ public UnifyResponseVO processException(HttpMessageNotReadableException exceptio
         UnifyResponseVO result = new UnifyResponseVO();
         result.setRequest(getSimpleRequest(request));
         String errorMessage = CodeMessageConfiguration.getMessage(10170);
-        if (StrUtil.isBlank(errorMessage)) {
+        if (!StringUtils.hasText(errorMessage)) {
             result.setMessage(exception.getMessage());
         } else {
             result.setMessage(errorMessage);
@@ -227,7 +229,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);
diff --git a/src/main/java/io/github/talelin/latticy/module/file/FileUtil.java b/src/main/java/io/github/talelin/latticy/module/file/FileUtil.java
@@ -10,6 +10,7 @@
 
 /**
  * @author pedro@TaleLin
+ * @author colorful@TaleLin
  */
 public class FileUtil {
 
diff --git a/src/main/java/io/github/talelin/latticy/service/impl/FileServiceImpl.java b/src/main/java/io/github/talelin/latticy/service/impl/FileServiceImpl.java
@@ -1,16 +1,15 @@
 package io.github.talelin.latticy.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.github.talelin.latticy.bo.FileBO;
+import io.github.talelin.latticy.mapper.FileMapper;
+import io.github.talelin.latticy.model.FileDO;
 import io.github.talelin.latticy.module.file.FileConstant;
 import io.github.talelin.latticy.module.file.FileProperties;
 import io.github.talelin.latticy.module.file.Uploader;
-import io.github.talelin.latticy.mapper.FileMapper;
-import io.github.talelin.latticy.model.FileDO;
 import io.github.talelin.latticy.service.FileService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.multipart.MultipartFile;
@@ -21,6 +20,7 @@
 /**
  * @author pedro@TaleLin
  * @author Juzi@TaleLin
+ * @author colorful@TaleLin
  */
 @Service
 public class FileServiceImpl extends ServiceImpl<FileMapper, FileDO> implements FileService {
@@ -48,7 +48,7 @@ public List<FileBO> upload(MultiValueMap<String, MultipartFile> fileMap) {
             // 数据库中不存在
             if (found == null) {
                 FileDO fileDO = new FileDO();
-                BeanUtil.copyProperties(file, fileDO);
+                BeanUtils.copyProperties(file, fileDO);
                 this.getBaseMapper().insert(fileDO);
                 res.add(transformDoToBo(fileDO, file.getKey()));
                 return true;
@@ -67,7 +67,7 @@ public boolean checkFileExistByMd5(String md5) {
 
     private FileBO transformDoToBo(FileDO file, String key) {
         FileBO bo = new FileBO();
-        BeanUtil.copyProperties(file, bo);
+        BeanUtils.copyProperties(file, bo);
         if (file.getType().equals(FileConstant.LOCAL)) {
             String s = fileProperties.getServePath().split("/")[0];
 
diff --git a/src/main/java/io/github/talelin/latticy/service/impl/UserServiceImpl.java b/src/main/java/io/github/talelin/latticy/service/impl/UserServiceImpl.java
@@ -1,7 +1,5 @@
 package io.github.talelin.latticy.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -25,9 +23,11 @@
 import io.github.talelin.latticy.service.PermissionService;
 import io.github.talelin.latticy.service.UserIdentityService;
 import io.github.talelin.latticy.service.UserService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -61,7 +61,7 @@ public UserDO createUser(RegisterDTO dto) {
         if (exist) {
             throw new ForbiddenException(10071);
         }
-        if (StrUtil.isNotBlank(dto.getEmail())) {
+        if (StringUtils.hasText(dto.getEmail())) {
             exist = this.checkUserExistByEmail(dto.getEmail());
             if (exist) {
                 throw new ForbiddenException(10076);
@@ -72,7 +72,7 @@ public UserDO createUser(RegisterDTO dto) {
             dto.setEmail(null);
         }
         UserDO user = new UserDO();
-        BeanUtil.copyProperties(dto, user);
+        BeanUtils.copyProperties(dto, user);
         this.baseMapper.insert(user);
         if (dto.getGroupIds() != null && !dto.getGroupIds().isEmpty()) {
             checkGroupsValid(dto.getGroupIds());
@@ -96,15 +96,15 @@ public UserDO createUser(RegisterDTO dto) {
     @Override
     public UserDO updateUserInfo(UpdateInfoDTO dto) {
         UserDO user = LocalUser.getLocalUser();
-        if (StrUtil.isNotBlank(dto.getUsername())) {
+        if (StringUtils.hasText(dto.getUsername())) {
             boolean exist = this.checkUserExistByUsername(dto.getUsername());
             if (exist) {
                 throw new ForbiddenException(10071);
             }
             user.setUsername(dto.getUsername());
             userIdentityService.changeUsername(user.getId(), dto.getUsername());
         }
-        BeanUtil.copyProperties(dto, user);
+        BeanUtils.copyProperties(dto, user);
         this.baseMapper.updateById(user);
         return user;
     }
diff --git a/src/main/java/io/github/talelin/latticy/vo/UserInfoVO.java b/src/main/java/io/github/talelin/latticy/vo/UserInfoVO.java
@@ -1,19 +1,20 @@
 package io.github.talelin.latticy.vo;
 
-import cn.hutool.core.bean.BeanUtil;
 import io.github.talelin.latticy.model.GroupDO;
 import io.github.talelin.latticy.model.UserDO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.beans.BeanUtils;
 
 import java.util.List;
 
 /**
  * 用户信息 view object
  *
  * @author pedro@TaleLin
+ * @author colorful@TaleLin
  */
 @Data
 @Builder
@@ -49,7 +50,7 @@ public class UserInfoVO {
     private List<GroupDO> groups;
 
     public UserInfoVO(UserDO user, List<GroupDO> groups) {
-        BeanUtil.copyProperties(user, this);
+        BeanUtils.copyProperties(user, this);
         this.groups = groups;
     }
 }
diff --git a/src/test/java/Jackson2Test.java b/src/test/java/Jackson2Test.java
@@ -1,4 +1,4 @@
-import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -27,7 +27,7 @@ public void testMap() throws JsonProcessingException {
     @Test
     public void testCamel() throws JsonProcessingException {
         String str = "userAge";
-        String s = StrUtil.toUnderlineCase(str);
+        String s = StringUtils.camelToUnderline(str);
         log.info(s);
     }
 }
diff --git a/src/test/java/io/github/talelin/latticy/controller/cms/LogControllerTest.java b/src/test/java/io/github/talelin/latticy/controller/cms/LogControllerTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import cn.hutool.core.util.StrUtil;`
	`1`	`+import com.baomidou.mybatisplus.core.toolkit.StringUtils;`
`2`	`2`	`import com.fasterxml.jackson.annotation.JsonFormat;`
`3`	`3`	`import com.fasterxml.jackson.core.JsonProcessingException;`
`4`	`4`	`import com.fasterxml.jackson.databind.ObjectMapper;`
`@@ -27,7 +27,7 @@ public void testMap() throws JsonProcessingException {`
`27`	`27`	`@Test`
`28`	`28`	`public void testCamel() throws JsonProcessingException {`
`29`	`29`	`String str = "userAge";`
`30`		`- String s = StrUtil.toUnderlineCase(str);`
	`30`	`+ String s = StringUtils.camelToUnderline(str);`
`31`	`31`	`log.info(s);`
`32`	`32`	`}`
`33`	`33`	`}`