From ccbbb618075c30401a5c6975c6f19ee027479468 Mon Sep 17 00:00:00 2001 From: "Mr. Liang" <1822213252@qq.com> Date: Sat, 2 Aug 2025 16:05:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96EncryptUtils?= =?UTF-8?q?=E5=9B=A0data=E4=B8=BAnull=E6=8A=A5=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/encrypt/utils/EncryptUtils.java | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java index ff0fbc812..c8e1a12d0 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java @@ -8,6 +8,7 @@ import cn.hutool.crypto.SmUtil; import cn.hutool.crypto.asymmetric.KeyType; import cn.hutool.crypto.asymmetric.RSA; import cn.hutool.crypto.asymmetric.SM2; +import org.dromara.common.core.utils.StringUtils; import java.nio.charset.StandardCharsets; import java.util.HashMap; @@ -37,6 +38,9 @@ public class EncryptUtils { * @return 加密后字符串 */ public static String encryptByBase64(String data) { + if (StringUtils.isBlank(data)) { + return StringUtils.EMPTY; + } return Base64.encode(data, StandardCharsets.UTF_8); } @@ -47,6 +51,9 @@ public class EncryptUtils { * @return 解密后字符串 */ public static String decryptByBase64(String data) { + if (StringUtils.isBlank(data)) { + return StringUtils.EMPTY; + } return Base64.decodeStr(data, StandardCharsets.UTF_8); } @@ -58,6 +65,9 @@ public class EncryptUtils { * @return 加密后字符串, 采用Base64编码 */ public static String encryptByAes(String data, String password) { + if (StringUtils.isBlank(data)) { + return StringUtils.EMPTY; + } if (StrUtil.isBlank(password)) { throw new IllegalArgumentException("AES需要传入秘钥信息"); } @@ -77,6 +87,9 @@ public class EncryptUtils { * @return 加密后字符串, 采用Hex编码 */ public static String encryptByAesHex(String data, String password) { + if (StringUtils.isBlank(data)) { + return StringUtils.EMPTY; + } if (StrUtil.isBlank(password)) { throw new IllegalArgumentException("AES需要传入秘钥信息"); } @@ -96,6 +109,9 @@ public class EncryptUtils { * @return 解密后字符串 */ public static String decryptByAes(String data, String password) { + if (StringUtils.isBlank(data)) { + return StringUtils.EMPTY; + } if (StrUtil.isBlank(password)) { throw new IllegalArgumentException("AES需要传入秘钥信息"); } @@ -115,6 +131,9 @@ public class EncryptUtils { * @return 加密后字符串, 采用Base64编码 */ public static String encryptBySm4(String data, String password) { + if (StringUtils.isBlank(data)) { + return StringUtils.EMPTY; + } if (StrUtil.isBlank(password)) { throw new IllegalArgumentException("SM4需要传入秘钥信息"); } @@ -134,6 +153,9 @@ public class EncryptUtils { * @return 加密后字符串, 采用Hex编码 */ public static String encryptBySm4Hex(String data, String password) { + if (StringUtils.isBlank(data)) { + return StringUtils.EMPTY; + } if (StrUtil.isBlank(password)) { throw new IllegalArgumentException("SM4需要传入秘钥信息"); } @@ -153,6 +175,9 @@ public class EncryptUtils { * @return 解密后字符串 */ public static String decryptBySm4(String data, String password) { + if (StringUtils.isBlank(data)) { + return StringUtils.EMPTY; + } if (StrUtil.isBlank(password)) { throw new IllegalArgumentException("SM4需要传入秘钥信息"); } @@ -185,6 +210,9 @@ public class EncryptUtils { * @return 加密后字符串, 采用Base64编码 */ public static String encryptBySm2(String data, String publicKey) { + if (StringUtils.isBlank(data)) { + return StringUtils.EMPTY; + } if (StrUtil.isBlank(publicKey)) { throw new IllegalArgumentException("SM2需要传入公钥进行加密"); } @@ -200,6 +228,9 @@ public class EncryptUtils { * @return 加密后字符串, 采用Hex编码 */ public static String encryptBySm2Hex(String data, String publicKey) { + if (StringUtils.isBlank(data)) { + return StringUtils.EMPTY; + } if (StrUtil.isBlank(publicKey)) { throw new IllegalArgumentException("SM2需要传入公钥进行加密"); } @@ -215,6 +246,9 @@ public class EncryptUtils { * @return 解密后字符串 */ public static String decryptBySm2(String data, String privateKey) { + if (StringUtils.isBlank(data)) { + return StringUtils.EMPTY; + } if (StrUtil.isBlank(privateKey)) { throw new IllegalArgumentException("SM2需要传入私钥进行解密"); } @@ -243,6 +277,9 @@ public class EncryptUtils { * @return 加密后字符串, 采用Base64编码 */ public static String encryptByRsa(String data, String publicKey) { + if (StringUtils.isBlank(data)) { + return StringUtils.EMPTY; + } if (StrUtil.isBlank(publicKey)) { throw new IllegalArgumentException("RSA需要传入公钥进行加密"); } @@ -258,6 +295,9 @@ public class EncryptUtils { * @return 加密后字符串, 采用Hex编码 */ public static String encryptByRsaHex(String data, String publicKey) { + if (StringUtils.isBlank(data)) { + return StringUtils.EMPTY; + } if (StrUtil.isBlank(publicKey)) { throw new IllegalArgumentException("RSA需要传入公钥进行加密"); } @@ -273,6 +313,9 @@ public class EncryptUtils { * @return 解密后字符串 */ public static String decryptByRsa(String data, String privateKey) { + if (StringUtils.isBlank(data)) { + return StringUtils.EMPTY; + } if (StrUtil.isBlank(privateKey)) { throw new IllegalArgumentException("RSA需要传入私钥进行解密"); } @@ -287,6 +330,9 @@ public class EncryptUtils { * @return 加密后字符串, 采用Hex编码 */ public static String encryptByMd5(String data) { + if (StringUtils.isBlank(data)) { + return StringUtils.EMPTY; + } return SecureUtil.md5(data); } @@ -297,6 +343,9 @@ public class EncryptUtils { * @return 加密后字符串, 采用Hex编码 */ public static String encryptBySha256(String data) { + if (StringUtils.isBlank(data)) { + return StringUtils.EMPTY; + } return SecureUtil.sha256(data); } @@ -307,6 +356,9 @@ public class EncryptUtils { * @return 加密后字符串, 采用Hex编码 */ public static String encryptBySm3(String data) { + if (StringUtils.isBlank(data)) { + return StringUtils.EMPTY; + } return SmUtil.sm3(data); } -- Gitee From de94521fd45213a54a093fd19b40cdacd6dd7a61 Mon Sep 17 00:00:00 2001 From: "Mr. Liang" <1822213252@qq.com> Date: Sat, 2 Aug 2025 16:23:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96EncryptUtils?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=AD=97=E7=AC=A6=E4=B8=B2=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=B1=BB=E4=B8=BAStrUtil?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/encrypt/utils/EncryptUtils.java | 69 +++++++++---------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java index c8e1a12d0..0a8053112 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java @@ -8,7 +8,6 @@ import cn.hutool.crypto.SmUtil; import cn.hutool.crypto.asymmetric.KeyType; import cn.hutool.crypto.asymmetric.RSA; import cn.hutool.crypto.asymmetric.SM2; -import org.dromara.common.core.utils.StringUtils; import java.nio.charset.StandardCharsets; import java.util.HashMap; @@ -38,8 +37,8 @@ public class EncryptUtils { * @return 加密后字符串 */ public static String encryptByBase64(String data) { - if (StringUtils.isBlank(data)) { - return StringUtils.EMPTY; + if (StrUtil.isBlank(data)) { + return StrUtil.EMPTY; } return Base64.encode(data, StandardCharsets.UTF_8); } @@ -51,8 +50,8 @@ public class EncryptUtils { * @return 解密后字符串 */ public static String decryptByBase64(String data) { - if (StringUtils.isBlank(data)) { - return StringUtils.EMPTY; + if (StrUtil.isBlank(data)) { + return StrUtil.EMPTY; } return Base64.decodeStr(data, StandardCharsets.UTF_8); } @@ -65,8 +64,8 @@ public class EncryptUtils { * @return 加密后字符串, 采用Base64编码 */ public static String encryptByAes(String data, String password) { - if (StringUtils.isBlank(data)) { - return StringUtils.EMPTY; + if (StrUtil.isBlank(data)) { + return StrUtil.EMPTY; } if (StrUtil.isBlank(password)) { throw new IllegalArgumentException("AES需要传入秘钥信息"); @@ -87,8 +86,8 @@ public class EncryptUtils { * @return 加密后字符串, 采用Hex编码 */ public static String encryptByAesHex(String data, String password) { - if (StringUtils.isBlank(data)) { - return StringUtils.EMPTY; + if (StrUtil.isBlank(data)) { + return StrUtil.EMPTY; } if (StrUtil.isBlank(password)) { throw new IllegalArgumentException("AES需要传入秘钥信息"); @@ -109,8 +108,8 @@ public class EncryptUtils { * @return 解密后字符串 */ public static String decryptByAes(String data, String password) { - if (StringUtils.isBlank(data)) { - return StringUtils.EMPTY; + if (StrUtil.isBlank(data)) { + return StrUtil.EMPTY; } if (StrUtil.isBlank(password)) { throw new IllegalArgumentException("AES需要传入秘钥信息"); @@ -131,8 +130,8 @@ public class EncryptUtils { * @return 加密后字符串, 采用Base64编码 */ public static String encryptBySm4(String data, String password) { - if (StringUtils.isBlank(data)) { - return StringUtils.EMPTY; + if (StrUtil.isBlank(data)) { + return StrUtil.EMPTY; } if (StrUtil.isBlank(password)) { throw new IllegalArgumentException("SM4需要传入秘钥信息"); @@ -153,8 +152,8 @@ public class EncryptUtils { * @return 加密后字符串, 采用Hex编码 */ public static String encryptBySm4Hex(String data, String password) { - if (StringUtils.isBlank(data)) { - return StringUtils.EMPTY; + if (StrUtil.isBlank(data)) { + return StrUtil.EMPTY; } if (StrUtil.isBlank(password)) { throw new IllegalArgumentException("SM4需要传入秘钥信息"); @@ -175,8 +174,8 @@ public class EncryptUtils { * @return 解密后字符串 */ public static String decryptBySm4(String data, String password) { - if (StringUtils.isBlank(data)) { - return StringUtils.EMPTY; + if (StrUtil.isBlank(data)) { + return StrUtil.EMPTY; } if (StrUtil.isBlank(password)) { throw new IllegalArgumentException("SM4需要传入秘钥信息"); @@ -210,8 +209,8 @@ public class EncryptUtils { * @return 加密后字符串, 采用Base64编码 */ public static String encryptBySm2(String data, String publicKey) { - if (StringUtils.isBlank(data)) { - return StringUtils.EMPTY; + if (StrUtil.isBlank(data)) { + return StrUtil.EMPTY; } if (StrUtil.isBlank(publicKey)) { throw new IllegalArgumentException("SM2需要传入公钥进行加密"); @@ -228,8 +227,8 @@ public class EncryptUtils { * @return 加密后字符串, 采用Hex编码 */ public static String encryptBySm2Hex(String data, String publicKey) { - if (StringUtils.isBlank(data)) { - return StringUtils.EMPTY; + if (StrUtil.isBlank(data)) { + return StrUtil.EMPTY; } if (StrUtil.isBlank(publicKey)) { throw new IllegalArgumentException("SM2需要传入公钥进行加密"); @@ -246,8 +245,8 @@ public class EncryptUtils { * @return 解密后字符串 */ public static String decryptBySm2(String data, String privateKey) { - if (StringUtils.isBlank(data)) { - return StringUtils.EMPTY; + if (StrUtil.isBlank(data)) { + return StrUtil.EMPTY; } if (StrUtil.isBlank(privateKey)) { throw new IllegalArgumentException("SM2需要传入私钥进行解密"); @@ -277,8 +276,8 @@ public class EncryptUtils { * @return 加密后字符串, 采用Base64编码 */ public static String encryptByRsa(String data, String publicKey) { - if (StringUtils.isBlank(data)) { - return StringUtils.EMPTY; + if (StrUtil.isBlank(data)) { + return StrUtil.EMPTY; } if (StrUtil.isBlank(publicKey)) { throw new IllegalArgumentException("RSA需要传入公钥进行加密"); @@ -295,8 +294,8 @@ public class EncryptUtils { * @return 加密后字符串, 采用Hex编码 */ public static String encryptByRsaHex(String data, String publicKey) { - if (StringUtils.isBlank(data)) { - return StringUtils.EMPTY; + if (StrUtil.isBlank(data)) { + return StrUtil.EMPTY; } if (StrUtil.isBlank(publicKey)) { throw new IllegalArgumentException("RSA需要传入公钥进行加密"); @@ -313,8 +312,8 @@ public class EncryptUtils { * @return 解密后字符串 */ public static String decryptByRsa(String data, String privateKey) { - if (StringUtils.isBlank(data)) { - return StringUtils.EMPTY; + if (StrUtil.isBlank(data)) { + return StrUtil.EMPTY; } if (StrUtil.isBlank(privateKey)) { throw new IllegalArgumentException("RSA需要传入私钥进行解密"); @@ -330,8 +329,8 @@ public class EncryptUtils { * @return 加密后字符串, 采用Hex编码 */ public static String encryptByMd5(String data) { - if (StringUtils.isBlank(data)) { - return StringUtils.EMPTY; + if (StrUtil.isBlank(data)) { + return StrUtil.EMPTY; } return SecureUtil.md5(data); } @@ -343,8 +342,8 @@ public class EncryptUtils { * @return 加密后字符串, 采用Hex编码 */ public static String encryptBySha256(String data) { - if (StringUtils.isBlank(data)) { - return StringUtils.EMPTY; + if (StrUtil.isBlank(data)) { + return StrUtil.EMPTY; } return SecureUtil.sha256(data); } @@ -356,8 +355,8 @@ public class EncryptUtils { * @return 加密后字符串, 采用Hex编码 */ public static String encryptBySm3(String data) { - if (StringUtils.isBlank(data)) { - return StringUtils.EMPTY; + if (StrUtil.isBlank(data)) { + return StrUtil.EMPTY; } return SmUtil.sm3(data); } -- Gitee