升级hutool版本

pom.xml

@@ -6,13 +6,13 @@
 
     <packaging>pom</packaging>
     <modules>
-        <module>cloudutil</module>
         <module>util</module>
-        <module>wechatutil</module>
+        <module>util_cloud</module>
+        <module>util_wechat</module>
         <module>ptos_tall</module>
         <module>ptos_diplomatist</module>
         <module>ptos_open</module>
-        <module>tall_sdk</module>
+        <module>ptos_sdk</module>
 <!--        <module>ptoszero</module>-->
 
     </modules>
@@ -112,7 +112,7 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>4.1.21</version>
+            <version>5.8.0.M4</version>
         </dependency>
 
         <!--Poi Excel -->

ptos_diplomatist/pom.xml

@@ -22,7 +22,7 @@
     <dependencies>
         <!--cloud 工具类-->
         <dependency>
-            <artifactId>cloudutil</artifactId>
+            <artifactId>util_cloud</artifactId>
             <groupId>com.ccsensptos</groupId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
@@ -41,7 +41,7 @@
         </dependency>
         <!--微信工具包-->
         <dependency>
-            <artifactId>wechatutil</artifactId>
+            <artifactId>util_wechat</artifactId>
             <groupId>com.ccsensptos</groupId>
             <version>1.0-SNAPSHOT</version>
         </dependency>

ptos_open/pom.xml

@@ -22,13 +22,13 @@
     <dependencies>
         <!--TALL_SDK-->
         <dependency>
-            <artifactId>tallsdk</artifactId>
+            <artifactId>ptos_sdk</artifactId>
             <groupId>com.ccsensptos</groupId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <!--cloud 工具类-->
         <dependency>
-            <artifactId>cloudutil</artifactId>
+            <artifactId>util_cloud</artifactId>
             <groupId>com.ccsensptos</groupId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
@@ -41,7 +41,7 @@
         </dependency>
         <!--微信工具包-->
         <dependency>
-            <artifactId>wechatutil</artifactId>
+            <artifactId>util_wechat</artifactId>
             <groupId>com.ccsensptos</groupId>
             <version>1.0-SNAPSHOT</version>
         </dependency>

tall_sdk/pom.xml → ptos_sdk/pom.xml

@@ -8,11 +8,11 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>tallsdk</artifactId>
+    <artifactId>ptos_sdk</artifactId>
 
     <version>0.0.1-SNAPSHOT</version>
 
-    <name>tallsdk</name>
+    <name>ptos_sdk</name>
 
     <description>Demo project for Spring Boot</description>
     <properties>

ptos_tall/pom.xml

@@ -22,7 +22,7 @@
     <dependencies>
         <!--cloud 工具类-->
         <dependency>
-            <artifactId>cloudutil</artifactId>
+            <artifactId>util_cloud</artifactId>
             <groupId>com.ccsensptos</groupId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
@@ -34,7 +34,7 @@
         </dependency>
         <!--微信工具包-->
         <dependency>
-            <artifactId>wechatutil</artifactId>
+            <artifactId>util_wechat</artifactId>
             <groupId>com.ccsensptos</groupId>
             <version>1.0-SNAPSHOT</version>
         </dependency>

ptos_tall/src/main/java/com/ccsens/ptos_tall/service/BusinessService.java

@@ -1,6 +1,7 @@
 package com.ccsens.ptos_tall.service;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -36,7 +37,7 @@ public class BusinessService implements IBusinessService {
         //TODO 是否是正确的域（pt使用零号的appId也可以成功）
 
         //生成accessToken
-        Map<String, Object> payLoads = CollectionUtil.newHashMap();
+        Map<String, Object> payLoads = MapUtil.newHashMap();
         payLoads.put("secret", params.getSecret());
         //生成过期时间
         long tokenExpired = 3600 * 1000L * 2;

ptos_tall/src/main/java/com/ccsens/ptos_tall/service/ProjectService.java

@@ -3,6 +3,7 @@ package com.ccsens.ptos_tall.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
@@ -147,7 +148,7 @@ public class ProjectService implements IProjectService {
         //根据手机号查询用户信息
         SysAuth sysAuth = sysAuthDao.getByPhone(param.getPhone().get(0));
         //生成token
-        Map<String, Object> theMap = CollectionUtil.newHashMap();
+        Map<String, Object> theMap = MapUtil.newHashMap();
         theMap.put("authId", String.valueOf(sysAuth.getId()));
         UserVo.TokenBean tokenBean = userService.generateToken(sysAuth.getUserId(), sysAuth.getId());
         //查找所有在线的业务的项目

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

@@ -3,6 +3,7 @@ package com.ccsens.ptos_tall.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;
@@ -149,7 +150,7 @@ public class UserService implements IUserService {
      */
     @Override
     public UserVo.TokenBean generateToken(Long userId, Object authId) {
-        Map<String, Object> payLoads = CollectionUtil.newHashMap();
+        Map<String, Object> payLoads = MapUtil.newHashMap();
         payLoads.put(WebConstant.PARAMETER_KEY_TOKEN_AUTH_ID, String.valueOf(authId));
 
         UserVo.TokenBean tokenBean = new UserVo.TokenBean();
@@ -511,7 +512,7 @@ public class UserService implements IUserService {
             throw new BaseException(PtOsCodeError.NOT_REFRESH_TOKEN);
         }
         //重新生成token
-        Map<String, Object> payLoads = CollectionUtil.newHashMap();
+        Map<String, Object> payLoads = MapUtil.newHashMap();
         payLoads.put(WebConstant.PARAMETER_KEY_TOKEN_AUTH_ID, String.valueOf(authId));
         //生成过期时间
         long tokenExpired = 3600 * 1000L * 2;

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

@@ -2,10 +2,10 @@ package com.ccsens.util;
 
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.img.ImgUtil;
 import cn.hutool.core.lang.Filter;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.HexUtil;
-import cn.hutool.core.util.ImageUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.asymmetric.KeyType;
 import cn.hutool.crypto.asymmetric.RSA;
@@ -171,9 +171,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

cloudutil/pom.xml → util_cloud/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>cloudutil</artifactId>
+    <artifactId>util_cloud</artifactId>
 
 
     <dependencies>

wechatutil/pom.xml → util_wechat/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>wechatutil</artifactId>
+    <artifactId>util_wechat</artifactId>
     <properties>
         <java.version>1.8</java.version>
     </properties>