diff --git a/mkl-building/libs/html-parse-2.1.1.jar b/mkl-building/libs/html-parse-2.1.1.jar new file mode 100644 index 0000000..cd1fd82 Binary files /dev/null and b/mkl-building/libs/html-parse-2.1.1.jar differ diff --git a/mkl-building/pom.xml b/mkl-building/pom.xml index 2fbf01f..ddac1db 100644 --- a/mkl-building/pom.xml +++ b/mkl-building/pom.xml @@ -47,6 +47,8 @@ cc.casually html-parse 2.1.1 + system + ${project.basedir}\libs\html-parse-2.1.1.jar diff --git a/mkl-building/src/main/java/com/ruoyi/utils/FileUtil.java b/mkl-building/src/main/java/com/ruoyi/utils/FileUtil.java index ab7b6c0..e1f9c02 100644 --- a/mkl-building/src/main/java/com/ruoyi/utils/FileUtil.java +++ b/mkl-building/src/main/java/com/ruoyi/utils/FileUtil.java @@ -1,8 +1,9 @@ package com.ruoyi.utils; -import sun.misc.BASE64Encoder; + import java.io.*; +import java.util.Base64; /** * 文件管理工具类 @@ -73,6 +74,6 @@ public class FileUtil { byte[] buffer = new byte[(int) file.length()]; inputFile.read(buffer); inputFile.close(); - return new BASE64Encoder().encode(buffer); + return Base64.getMimeEncoder().encodeToString(buffer); } } diff --git a/mkl-building/src/main/java/com/ruoyi/utils/ImageUtils.java b/mkl-building/src/main/java/com/ruoyi/utils/ImageUtils.java index 6d981cd..6b78128 100644 --- a/mkl-building/src/main/java/com/ruoyi/utils/ImageUtils.java +++ b/mkl-building/src/main/java/com/ruoyi/utils/ImageUtils.java @@ -1,9 +1,8 @@ package com.ruoyi.utils; -import org.apache.commons.codec.binary.Base64; + import org.apache.commons.lang3.StringUtils; -import sun.misc.BASE64Decoder; -import sun.misc.BASE64Encoder; + import javax.imageio.ImageIO; import javax.imageio.ImageReadParam; @@ -16,6 +15,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Iterator; import java.util.UUID; +import java.util.Base64; /** * mergeImage 合成图拼 @@ -269,7 +269,7 @@ public class ImageUtils { // 将图片转化为base64并返回 byte[] data = outputStream.toByteArray(); // 此处一定要使用org.apache.tomcat.util.codec.binary.Base64，防止再linux上出现换行等特殊符号 - base64Image = Base64.encodeBase64String(data); + base64Image = Base64.getEncoder().encodeToString(data); } catch (Exception e) { // 抛出异常 throw e; @@ -299,7 +299,7 @@ public class ImageUtils { return base64Image; } - static BASE64Decoder decoder = new BASE64Decoder(); + /** * base64压缩图片至指定大小 @@ -319,7 +319,7 @@ public class ImageUtils { ByteArrayInputStream inputStream = null; try { - byte[] bytes1 = decoder.decodeBuffer(imageBase); + byte[] bytes1 = Base64.getDecoder().decode(imageBase); ByteArrayInputStream bais = new ByteArrayInputStream(bytes1); BufferedImage image = ImageIO.read(bais); @@ -355,7 +355,7 @@ public class ImageUtils { // 将图片转化为base64并返回 byte[] data = outputStream.toByteArray(); // 此处一定要使用org.apache.tomcat.util.codec.binary.Base64，防止再linux上出现换行等特殊符号 - base64Image = Base64.encodeBase64String(data); + base64Image = Base64.getEncoder().encodeToString(data); if(StringUtils.isEmpty(base64Image)) { base64Image = imageBase; } @@ -402,8 +402,8 @@ public class ImageUtils { } } // 加密 - BASE64Encoder encoder = new BASE64Encoder(); - return encoder.encode(data); + + return Base64.getEncoder().encodeToString(data); } } diff --git a/mkl-business/libs/html-parse-2.1.1.jar b/mkl-business/libs/html-parse-2.1.1.jar new file mode 100644 index 0000000..cd1fd82 Binary files /dev/null and b/mkl-business/libs/html-parse-2.1.1.jar differ diff --git a/mkl-business/pom.xml b/mkl-business/pom.xml index a67ea73..c7cd28b 100644 --- a/mkl-business/pom.xml +++ b/mkl-business/pom.xml @@ -26,7 +26,9 @@ cc.casually html-parse - 2.1.5 + 2.1.1 + system + ${project.basedir}\libs\html-parse-2.1.1.jar diff --git a/mkl-business/src/main/java/com/ruoyi/helmet/comp/encrypt/AESEncrypt.java b/mkl-business/src/main/java/com/ruoyi/helmet/comp/encrypt/AESEncrypt.java index 8c19bbf..2b1974b 100644 --- a/mkl-business/src/main/java/com/ruoyi/helmet/comp/encrypt/AESEncrypt.java +++ b/mkl-business/src/main/java/com/ruoyi/helmet/comp/encrypt/AESEncrypt.java @@ -2,8 +2,7 @@ package com.ruoyi.helmet.comp.encrypt; import com.ruoyi.helmet.comp.conf.ThreeAPIInfo; -import sun.misc.BASE64Decoder; -import sun.misc.BASE64Encoder; + import javax.crypto.BadPaddingException; import javax.crypto.Cipher; diff --git a/mkl-iot/libs/html-parse-2.1.1.jar b/mkl-iot/libs/html-parse-2.1.1.jar new file mode 100644 index 0000000..cd1fd82 Binary files /dev/null and b/mkl-iot/libs/html-parse-2.1.1.jar differ diff --git a/mkl-iot/pom.xml b/mkl-iot/pom.xml index 0c90ba4..a6d5e75 100644 --- a/mkl-iot/pom.xml +++ b/mkl-iot/pom.xml @@ -33,7 +33,9 @@ cc.casually html-parse - 2.1.5 + 2.1.1 + system + ${project.basedir}\libs\html-parse-2.1.1.jar diff --git a/mkl-screen/libs/html-parse-2.1.1.jar b/mkl-screen/libs/html-parse-2.1.1.jar new file mode 100644 index 0000000..cd1fd82 Binary files /dev/null and b/mkl-screen/libs/html-parse-2.1.1.jar differ diff --git a/mkl-screen/pom.xml b/mkl-screen/pom.xml index e7cd322..f1c37b8 100644 --- a/mkl-screen/pom.xml +++ b/mkl-screen/pom.xml @@ -29,7 +29,9 @@ cc.casually html-parse - 2.1.5 + 2.1.1 + system + ${project.basedir}\libs\html-parse-2.1.1.jar com.ruoyi diff --git a/mkl-screen/src/main/java/com/ruoyi/weixin/controller/ApiEnvironmentController.java b/mkl-screen/src/main/java/com/ruoyi/weixin/controller/ApiEnvironmentController.java index 3ee12bc..753260c 100644 --- a/mkl-screen/src/main/java/com/ruoyi/weixin/controller/ApiEnvironmentController.java +++ b/mkl-screen/src/main/java/com/ruoyi/weixin/controller/ApiEnvironmentController.java @@ -9,7 +9,7 @@ import com.ruoyi.weixin.service.IEnvironmentService; import com.ruoyi.weixin.service.ISmzTeamLeaderNameService; import com.ruoyi.weixin.util.GetRequestJsonUtils; import org.apache.poi.ss.formula.functions.T; -import org.omg.CORBA.OBJ_ADAPTER; +//import org.omg.CORBA.OBJ_ADAPTER; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Configuration; diff --git a/mkl-screen/src/main/java/com/ruoyi/weixin/service/impl/EnvironmentServiceImpl.java b/mkl-screen/src/main/java/com/ruoyi/weixin/service/impl/EnvironmentServiceImpl.java index a91ffeb..4ef29ee 100644 --- a/mkl-screen/src/main/java/com/ruoyi/weixin/service/impl/EnvironmentServiceImpl.java +++ b/mkl-screen/src/main/java/com/ruoyi/weixin/service/impl/EnvironmentServiceImpl.java @@ -14,8 +14,8 @@ import com.ruoyi.weixin.mapper.EnvironmentMapper; import com.ruoyi.weixin.service.IEnvironmentService; import com.ruoyi.weixin.util.RequestUtils; import org.jasig.cas.client.util.CommonUtils; -import org.omg.CORBA.MARSHAL; -import org.omg.CORBA.Request; +//import org.omg.CORBA.MARSHAL; +//import org.omg.CORBA.Request; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/pom.xml b/pom.xml index 0727bc8..9aeaed9 100644 --- a/pom.xml +++ b/pom.xml @@ -298,6 +298,13 @@ mkl-examine ${ruoyi.version} + + + org.slf4j + slf4j-api + 1.7.32 + + @@ -348,7 +355,7 @@ public aliyun nexus - http://maven.aliyun.com/nexus/content/groups/public/ + https://maven.aliyun.com/nexus/content/groups/public/ true @@ -359,7 +366,7 @@ public aliyun nexus - http://maven.aliyun.com/nexus/content/groups/public/ + https://maven.aliyun.com/nexus/content/groups/public/ true diff --git a/ruoyi-common/libs/aspose-cells-8.5.2.jar b/ruoyi-common/libs/aspose-cells-8.5.2.jar new file mode 100644 index 0000000..d0e1aca Binary files /dev/null and b/ruoyi-common/libs/aspose-cells-8.5.2.jar differ diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index c434297..e7d380b 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -160,8 +160,10 @@ com.aspose - cells + aspose-cells 8.5.2 + system + ${project.basedir}\libs\aspose-cells-8.5.2.jar