升级糊涂包版本

pom.xml

@@ -125,7 +125,7 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>4.1.21</version>
+            <version>5.7.15</version>
         </dependency>
 
         <!--Poi Excel -->

signin/src/main/java/com/ccsens/signin/api/UserController.java

@@ -1,6 +1,7 @@
 package com.ccsens.signin.api;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.servlet.ServletUtil;
@@ -96,7 +97,7 @@ public class UserController {
 
         //3.生成token(access_token,refresh_token)
         if (ObjectUtil.isNotNull(userSignVo)) {
-            Map<String, Object> theMap = CollectionUtil.newHashMap();
+            Map<String, Object> theMap = MapUtil.newHashMap();
             theMap.put("authId", String.valueOf(userSignVo.getAuthId()));
             UserVo.TokenBean tokenBean = userService.getUserInfoAndToken(clientType, identify_type,userSignVo, theMap);
 
@@ -136,7 +137,7 @@ public class UserController {
             WebConstant.CLIENT_TYPE clientType = WebConstant.CLIENT_TYPE.valueOf(1);
             WebConstant.IDENTIFY_TYPE identifyType = WebConstant.IDENTIFY_TYPE.valueOf(3);
 
-            Map<String, Object> theMap = CollectionUtil.newHashMap();
+            Map<String, Object> theMap = MapUtil.newHashMap();
             theMap.put("authId", String.valueOf(userSignVo.getAuthId()));
             UserVo.TokenBean tokenBean = userService.getUserInfoAndToken(clientType, identifyType,userSignVo, theMap);
 
@@ -192,7 +193,7 @@ public class UserController {
         if (ObjectUtil.isNotNull(userSignVo)) {
             WebConstant.CLIENT_TYPE clientType = WebConstant.CLIENT_TYPE.valueOf(1);
             WebConstant.IDENTIFY_TYPE identifyType = WebConstant.IDENTIFY_TYPE.valueOf(3);
-            Map<String, Object> theMap = CollectionUtil.newHashMap();
+            Map<String, Object> theMap = MapUtil.newHashMap();
             theMap.put("authId", String.valueOf(userSignVo.getAuthId()));
             tokenBean = userService.getUserInfoAndToken(clientType, identifyType,userSignVo, theMap);
         }
@@ -212,7 +213,7 @@ public class UserController {
         if (ObjectUtil.isNotNull(userSignVo)) {
             WebConstant.CLIENT_TYPE clientType = WebConstant.CLIENT_TYPE.valueOf(1);
             WebConstant.IDENTIFY_TYPE identifyType = WebConstant.IDENTIFY_TYPE.valueOf(3);
-            Map<String, Object> theMap = CollectionUtil.newHashMap();
+            Map<String, Object> theMap = MapUtil.newHashMap();
             theMap.put("authId", String.valueOf(userSignVo.getAuthId()));
             tokenBean = userService.getUserInfoAndToken(clientType,identifyType, userSignVo, theMap);
         }
@@ -251,7 +252,7 @@ public class UserController {
             }
             WebConstant.CLIENT_TYPE clientType = WebConstant.CLIENT_TYPE.valueOf(1);
             WebConstant.IDENTIFY_TYPE identifyType = WebConstant.IDENTIFY_TYPE.valueOf(3);
-            Map<String, Object> theMap = CollectionUtil.newHashMap();
+            Map<String, Object> theMap = MapUtil.newHashMap();
             theMap.put("authId", String.valueOf(userSignVo.getAuthId()));
             UserVo.TokenBean tokenBean = userService.getUserInfoAndToken(clientType,identifyType, userSignVo, theMap);
             return JsonResponse.newInstance().ok(tokenBean);
@@ -343,7 +344,7 @@ public class UserController {
         if (ObjectUtil.isNotNull(userSignVo)) {
             WebConstant.CLIENT_TYPE clientType = WebConstant.CLIENT_TYPE.valueOf(1);
             WebConstant.IDENTIFY_TYPE identifyType = WebConstant.IDENTIFY_TYPE.valueOf(3);
-            Map<String, Object> theMap = CollectionUtil.newHashMap();
+            Map<String, Object> theMap = MapUtil.newHashMap();
             theMap.put("authId", String.valueOf(userSignVo.getAuthId()));
             tokenBean = userService.getUserInfoAndToken(clientType, identifyType,userSignVo, theMap);
         }

signin/src/main/java/com/ccsens/signin/service/UserInfoService.java

@@ -2,10 +2,10 @@ package com.ccsens.signin.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.img.ImgUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.ImageUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.ccsens.signin.bean.dto.UserDto;
@@ -161,7 +161,7 @@ public class UserInfoService implements IUserInfoService{
         File compressFile = new File(WebConstant.UPLOAD_AVATAR_URL+ extraPath + compressFilePath);
         //文件大于80k则进行压缩，否则不压缩
         if(a < 1) {
-            ImageUtil.scale(temporaryFile, compressFile, a);
+            ImgUtil.scale(temporaryFile, compressFile, a);
         }
         //获取文件的压缩前的文件名
         String fullPath = WebConstant.UPLOAD_PATH_AVATAR_URL + File.separator + extraPath + temporaryFilePath;

signin/src/main/java/com/ccsens/signin/service/UserService.java

@@ -3,6 +3,7 @@ package com.ccsens.signin.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
@@ -1371,7 +1372,7 @@ public class UserService implements IUserService {
         if (ObjectUtil.isNull(tokenRe)) {
             //3.生成token(access_token,refresh_token)
             if (ObjectUtil.isNotNull(userSignVo)) {
-                Map<String, Object> theMap = CollectionUtil.newHashMap();
+                Map<String, Object> theMap = MapUtil.newHashMap();
                 theMap.put("authId", String.valueOf(userSignVo.getAuthId()));
                 long tokenExpired = 3600 * 1000L * 24 * 100;
 

tall/src/main/java/com/ccsens/tall/service/ExportWbsService.java

@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ZipUtil;
@@ -807,7 +808,7 @@ public class ExportWbsService implements IExportWbsService{
         return path;
     }
     private String getZip(List<WbsVo.DeliverWithExcel> deliverWithExcelList)throws Exception {
-        String uuid = SecureUtil.simpleUUID();
+        String uuid = IdUtil.simpleUUID();
         if(CollectionUtil.isNotEmpty(deliverWithExcelList)){
             for(WbsVo.DeliverWithExcel deliverWithExcel : deliverWithExcelList) {
                 if (ObjectUtil.isNotNull(deliverWithExcel.getDeliverId())) {

tall/src/main/java/com/ccsens/tall/service/UserInfoService.java

@@ -2,10 +2,10 @@ package com.ccsens.tall.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.img.ImgUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.ImageUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.ccsens.tall.bean.dto.UserDto;
@@ -164,7 +164,7 @@ public class UserInfoService implements IUserInfoService{
         File compressFile = new File(WebConstant.UPLOAD_AVATAR_URL+ extraPath + compressFilePath);
         //文件大于80k则进行压缩，否则不压缩
         if(a < 1) {
-            ImageUtil.scale(temporaryFile, compressFile, a);
+            ImgUtil.scale(temporaryFile, compressFile, a);
         }
         //获取文件的压缩前的文件名
         String fullPath = WebConstant.UPLOAD_PATH_AVATAR_URL + File.separator + extraPath + temporaryFilePath;

tall/src/main/java/com/ccsens/tall/service/UserService.java

@@ -1,8 +1,10 @@
 package com.ccsens.tall.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
@@ -1523,7 +1525,7 @@ public class UserService implements IUserService {
         if (ObjectUtil.isNull(tokenRe)) {
             //3.生成token(access_token,refresh_token)
             if (ObjectUtil.isNotNull(userSignVo)) {
-                Map<String, Object> theMap = CollectionUtil.newHashMap();
+                Map<String, Object> theMap = MapUtil.newHashMap();
                 theMap.put("authId", String.valueOf(userSignVo.getAuthId()));
                 long tokenExpired = 3600 * 1000L * 24 * 100;
 

tall/src/main/java/com/ccsens/tall/web/UserController.java

@@ -1,6 +1,6 @@
 package com.ccsens.tall.web;
 
-import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.servlet.ServletUtil;
@@ -99,7 +99,7 @@ public class UserController {
 
         //3.生成token(access_token,refresh_token)
         if (ObjectUtil.isNotNull(userSignVo)) {
-            Map<String, Object> theMap = CollectionUtil.newHashMap();
+            Map<String, Object> theMap = MapUtil.newHashMap();
             theMap.put("authId", String.valueOf(userSignVo.getAuthId()));
             UserVo.TokenBean tokenBean = userService.getUserInfoAndToken(clientType, identify_type,userSignVo, theMap);
 
@@ -139,7 +139,7 @@ public class UserController {
             WebConstant.CLIENT_TYPE clientType = WebConstant.CLIENT_TYPE.valueOf(1);
             WebConstant.IDENTIFY_TYPE identifyType = WebConstant.IDENTIFY_TYPE.valueOf(3);
 
-            Map<String, Object> theMap = CollectionUtil.newHashMap();
+            Map<String, Object> theMap = MapUtil.newHashMap();
             theMap.put("authId", String.valueOf(userSignVo.getAuthId()));
             UserVo.TokenBean tokenBean = userService.getUserInfoAndToken(clientType, identifyType,userSignVo, theMap);
 
@@ -204,7 +204,7 @@ public class UserController {
         if (ObjectUtil.isNotNull(userSignVo)) {
             WebConstant.CLIENT_TYPE clientType = WebConstant.CLIENT_TYPE.valueOf(1);
             WebConstant.IDENTIFY_TYPE identifyType = WebConstant.IDENTIFY_TYPE.valueOf(3);
-            Map<String, Object> theMap = CollectionUtil.newHashMap();
+            Map<String, Object> theMap = MapUtil.newHashMap();
             theMap.put("authId", String.valueOf(userSignVo.getAuthId()));
             tokenBean = userService.getUserInfoAndToken(clientType, identifyType,userSignVo, theMap);
         }
@@ -224,7 +224,7 @@ public class UserController {
         if (ObjectUtil.isNotNull(userSignVo)) {
             WebConstant.CLIENT_TYPE clientType = WebConstant.CLIENT_TYPE.valueOf(1);
             WebConstant.IDENTIFY_TYPE identifyType = WebConstant.IDENTIFY_TYPE.valueOf(3);
-            Map<String, Object> theMap = CollectionUtil.newHashMap();
+            Map<String, Object> theMap = MapUtil.newHashMap();
             theMap.put("authId", String.valueOf(userSignVo.getAuthId()));
             tokenBean = userService.getUserInfoAndToken(clientType,identifyType, userSignVo, theMap);
         }
@@ -297,7 +297,7 @@ public class UserController {
         if (ObjectUtil.isNotNull(userSignVo)) {
             WebConstant.CLIENT_TYPE clientType = WebConstant.CLIENT_TYPE.valueOf(1);
             WebConstant.IDENTIFY_TYPE identifyType = WebConstant.IDENTIFY_TYPE.valueOf(3);
-            Map<String, Object> theMap = CollectionUtil.newHashMap();
+            Map<String, Object> theMap = MapUtil.newHashMap();
             theMap.put("authId", String.valueOf(userSignVo.getAuthId()));
             tokenBean = userService.getUserInfoAndToken(clientType, identifyType,userSignVo, theMap);
         }

tall/src/main/java/com/ccsens/tall/web/UserInfoController.java

@@ -1,7 +1,6 @@
 package com.ccsens.tall.web;
 
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.ImageUtil;
 import cn.hutool.http.HttpResponse;
 import com.ccsens.tall.bean.dto.UserDto;
 import com.ccsens.tall.bean.vo.UserVo;

util/src/test/java/com/ccsens/util/OtherTest.java

@@ -3,11 +3,11 @@ package com.ccsens.util;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.img.Img;
+import cn.hutool.core.img.ImgUtil;
 import cn.hutool.core.lang.Filter;
-import cn.hutool.core.util.ImageUtil;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.junit.Test;
 
 import javax.annotation.Resource;
@@ -79,9 +79,9 @@ public class OtherTest {
         File file1 = new File("C:\\Users\\逗\\Desktop\\1.jpg");
         File file2 = new File("C:\\Users\\逗\\Desktop\\2.jpg");
         System.out.println(file.length());
-        ImageUtil.scale(file, file1, 0.5f);
+        ImgUtil.scale(file, file1, 0.5f);
         System.out.println(file1);
-        ImageUtil.scale(file1, file2, 2);
+        ImgUtil.scale(file1, file2, 2);
     }
 
     @Test