2022

修改test配置文件的ip
修改pom文件
13 changed files with 104 additions and 26 deletions
--- a/cloudutil/src/main/resources/application-util-test.yml
+++ b/cloudutil/src/main/resources/application-util-test.yml
@ -85,7 +85,7 @@ eureka:
 #      defaultZone: http://admin:admin@49.232.6.143:7010/eureka/
 #      defaultZone: http://admin:admin@192.168.0.99:7010/eureka/

-      defaultZone: http://admin:admin@127.0.0.1:7010/eureka/
+      defaultZone: http://admin:admin@49.233.89.188:7010/eureka/
 #      defaultZone: http://admin:admin@192.168.31.13:7010/eureka/
 #      defaultZone: http://admin:admin@test.tall.wiki:7010/eureka/
  instance:
--- a/pom.xml
+++ b/pom.xml
@ -112,6 +112,10 @@
                    <groupId>com.vaadin.external.google</groupId>
                    <artifactId>android-json</artifactId>
                </exclusion>
+                <exclusion>
+                    <artifactId>asm</artifactId>
+                    <groupId>org.ow2.asm</groupId>
+                </exclusion>
            </exclusions>
            <scope>test</scope>
        </dependency>
@ -124,7 +128,7 @@
        <dependency>
            <groupId>cn.hutool</groupId>
            <artifactId>hutool-all</artifactId>
-            <version>4.1.21</version>
+            <version>5.7.15</version>
        </dependency>

        <!--Poi Excel -->
@ -236,6 +240,12 @@
            <groupId>org.apache.httpcomponents</groupId>
            <artifactId>httpclient</artifactId>
            <version>4.5.1</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>httpcore</artifactId>
+                    <groupId>org.apache.httpcomponents</groupId>
+                </exclusion>
+            </exclusions>
        </dependency>
        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore -->
        <dependency>
@ -248,6 +258,12 @@
            <groupId>com.github.qcloudsms</groupId>
            <artifactId>qcloudsms</artifactId>
            <version>1.0.5</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>httpclient</artifactId>
+                    <groupId>org.apache.httpcomponents</groupId>
+                </exclusion>
+            </exclusions>
        </dependency>
        <dependency>
            <groupId>com.alibaba</groupId>
--- a/signin/pom.xml
+++ b/signin/pom.xml
@ -17,18 +17,76 @@
        <!--cloud 工具类-->
        <dependency>
            <artifactId>cloudutil</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>bcprov-jdk15on</artifactId>
+                    <groupId>org.bouncycastle</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>httpcore</artifactId>
+                    <groupId>org.apache.httpcomponents</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>httpclient</artifactId>
+                    <groupId>org.apache.httpcomponents</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>jackson-dataformat-xml</artifactId>
+                    <groupId>com.fasterxml.jackson.dataformat</groupId>
+                </exclusion>
+            </exclusions>
            <groupId>com.ccsens</groupId>
            <version>1.0-SNAPSHOT</version>
        </dependency>
        <!--util 工具类-->
        <dependency>
            <artifactId>util</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>fastjson</artifactId>
+                    <groupId>com.alibaba</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>bcmail-jdk14</artifactId>
+                    <groupId>org.bouncycastle</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>bcprov-jdk14</artifactId>
+                    <groupId>org.bouncycastle</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>httpcore</artifactId>
+                    <groupId>org.apache.httpcomponents</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>httpclient</artifactId>
+                    <groupId>org.apache.httpcomponents</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>jackson-dataformat-xml</artifactId>
+                    <groupId>com.fasterxml.jackson.dataformat</groupId>
+                </exclusion>
+            </exclusions>
            <groupId>com.ccsens</groupId>
            <version>1.0-SNAPSHOT</version>
        </dependency>
        <!--wechatUtil 工具类-->
        <dependency>
            <artifactId>wechatutil</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>httpcore</artifactId>
+                    <groupId>org.apache.httpcomponents</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>httpclient</artifactId>
+                    <groupId>org.apache.httpcomponents</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>jackson-dataformat-xml</artifactId>
+                    <groupId>com.fasterxml.jackson.dataformat</groupId>
+                </exclusion>
+            </exclusions>
            <groupId>com.ccsens</groupId>
            <version>1.0-SNAPSHOT</version>
        </dependency>
--- a/signin/src/main/java/com/ccsens/signin/api/UserController.java
+++ b/signin/src/main/java/com/ccsens/signin/api/UserController.java
@ -1,6 +1,8 @@
 package com.ccsens.signin.api;

+import cn.hutool.core.collection.CollUtil;
 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 +98,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 +138,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 +194,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 +214,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 +253,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);
@ -344,7 +346,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);
        }
--- a/signin/src/main/java/com/ccsens/signin/service/UserInfoService.java
+++ b/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;
--- a/signin/src/main/java/com/ccsens/signin/service/UserService.java
+++ b/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;
@ -1370,7 +1371,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;

--- a/signin/src/main/resources/application-test.yml
+++ b/signin/src/main/resources/application-test.yml
@ -31,7 +31,7 @@ swagger:
  enable: true
 eureka:
  instance:
-    ip-address: 127.0.0.1
+    ip-address: 101.201.226.163

 gatewayUrl: https://test.tall.wiki/gateway/
 notGatewayUrl: https://test.tall.wiki/
--- a/tall/src/main/java/com/ccsens/tall/service/ExportWbsService.java
+++ b/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())) {
--- a/tall/src/main/java/com/ccsens/tall/service/UserInfoService.java
+++ b/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;
--- a/tall/src/main/java/com/ccsens/tall/service/UserService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/UserService.java
@ -3,6 +3,7 @@ package com.ccsens.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;
@ -1523,7 +1524,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;

--- a/tall/src/main/java/com/ccsens/tall/web/UserController.java
+++ b/tall/src/main/java/com/ccsens/tall/web/UserController.java
@ -1,6 +1,7 @@
 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 +100,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 +140,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 +205,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 +225,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 +298,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);
        }
--- a/tall/src/main/java/com/ccsens/tall/web/UserInfoController.java
+++ b/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;
--- a/util/src/test/java/com/ccsens/util/OtherTest.java
+++ b/util/src/test/java/com/ccsens/util/OtherTest.java
@ -2,10 +2,9 @@ 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;
@ -162,9 +161,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
Author	SHA1	Message	Date
zhangye	162fca6a40	2022	2 years ago
zhangye	ead89a8b25	修改test配置文件的ip	3 years ago
zhangye	d592a3f594	修改pom文件	3 years ago