diff --git a/pom.xml b/pom.xml index 1215b887..83a8d2af 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ cn.hutool hutool-all - 4.1.21 + 5.7.15 diff --git a/signin/pom.xml b/signin/pom.xml index 1c84766e..78ce9610 100644 --- a/signin/pom.xml +++ b/signin/pom.xml @@ -17,18 +17,76 @@ cloudutil + + + bcprov-jdk15on + org.bouncycastle + + + httpcore + org.apache.httpcomponents + + + httpclient + org.apache.httpcomponents + + + jackson-dataformat-xml + com.fasterxml.jackson.dataformat + + com.ccsens 1.0-SNAPSHOT util + + + fastjson + com.alibaba + + + bcmail-jdk14 + org.bouncycastle + + + bcprov-jdk14 + org.bouncycastle + + + httpcore + org.apache.httpcomponents + + + httpclient + org.apache.httpcomponents + + + jackson-dataformat-xml + com.fasterxml.jackson.dataformat + + com.ccsens 1.0-SNAPSHOT wechatutil + + + httpcore + org.apache.httpcomponents + + + httpclient + org.apache.httpcomponents + + + jackson-dataformat-xml + com.fasterxml.jackson.dataformat + + com.ccsens 1.0-SNAPSHOT diff --git a/signin/src/main/java/com/ccsens/signin/api/UserController.java b/signin/src/main/java/com/ccsens/signin/api/UserController.java index 0f20220c..721e8c0d 100644 --- 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 theMap = CollectionUtil.newHashMap(); + Map 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 theMap = CollectionUtil.newHashMap(); + Map 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 theMap = CollectionUtil.newHashMap(); + Map 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 theMap = CollectionUtil.newHashMap(); + Map 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 theMap = CollectionUtil.newHashMap(); + Map 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 theMap = CollectionUtil.newHashMap(); + Map theMap = MapUtil.newHashMap(); theMap.put("authId", String.valueOf(userSignVo.getAuthId())); tokenBean = userService.getUserInfoAndToken(clientType, identifyType,userSignVo, theMap); } diff --git a/signin/src/main/java/com/ccsens/signin/service/UserInfoService.java b/signin/src/main/java/com/ccsens/signin/service/UserInfoService.java index 78c0d250..0f38746d 100644 --- 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; diff --git a/signin/src/main/java/com/ccsens/signin/service/UserService.java b/signin/src/main/java/com/ccsens/signin/service/UserService.java index dc3ebc03..11b6f9cc 100644 --- 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 theMap = CollectionUtil.newHashMap(); + Map theMap = MapUtil.newHashMap(); theMap.put("authId", String.valueOf(userSignVo.getAuthId())); long tokenExpired = 3600 * 1000L * 24 * 100; diff --git a/tall/src/main/java/com/ccsens/tall/service/ExportWbsService.java b/tall/src/main/java/com/ccsens/tall/service/ExportWbsService.java index 0c61de9a..a5c47838 100644 --- 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 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())) { diff --git a/tall/src/main/java/com/ccsens/tall/service/UserInfoService.java b/tall/src/main/java/com/ccsens/tall/service/UserInfoService.java index 4af59a72..df1834ab 100644 --- 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; diff --git a/tall/src/main/java/com/ccsens/tall/service/UserService.java b/tall/src/main/java/com/ccsens/tall/service/UserService.java index a704cdf0..c3be1883 100644 --- 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 theMap = CollectionUtil.newHashMap(); + Map theMap = MapUtil.newHashMap(); theMap.put("authId", String.valueOf(userSignVo.getAuthId())); long tokenExpired = 3600 * 1000L * 24 * 100; diff --git a/tall/src/main/java/com/ccsens/tall/web/UserController.java b/tall/src/main/java/com/ccsens/tall/web/UserController.java index fe7d266d..64024600 100644 --- 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 theMap = CollectionUtil.newHashMap(); + Map 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 theMap = CollectionUtil.newHashMap(); + Map 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 theMap = CollectionUtil.newHashMap(); + Map 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 theMap = CollectionUtil.newHashMap(); + Map 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 theMap = CollectionUtil.newHashMap(); + Map theMap = MapUtil.newHashMap(); theMap.put("authId", String.valueOf(userSignVo.getAuthId())); tokenBean = userService.getUserInfoAndToken(clientType, identifyType,userSignVo, theMap); } diff --git a/tall/src/main/java/com/ccsens/tall/web/UserInfoController.java b/tall/src/main/java/com/ccsens/tall/web/UserInfoController.java index 1a829955..2e4eb897 100644 --- 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; diff --git a/util/src/test/java/com/ccsens/util/OtherTest.java b/util/src/test/java/com/ccsens/util/OtherTest.java index 3a9d08f9..23eeb9c6 100644 --- 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