diff --git a/bonus-common-biz/src/main/java/com/bonus/common/houqin/utils/SM4EncryptUtils.java b/bonus-common-biz/src/main/java/com/bonus/common/houqin/utils/SM4EncryptUtils.java index 72f39051..93e2a0f4 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/houqin/utils/SM4EncryptUtils.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/houqin/utils/SM4EncryptUtils.java @@ -8,6 +8,7 @@ import cn.hutool.crypto.Padding; import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.SmUtil; import cn.hutool.crypto.symmetric.SM4; +import com.bonus.common.core.utils.encryption.Sm4Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,41 +27,20 @@ public class SM4EncryptUtils { public static String sm4Encrypt(String data) { try { - return SmUtil.sm4(SecureUtil.decode(properties.getSm4Key())).encryptBase64(data) + "##encrypted"; + return data = Sm4Utils.encrypt(data); } catch (Exception var2) { log.debug("SM4加密异常:{}", var2.getMessage()); return data; } } - public static String sm4Encryptbyconfig(String data) { - try { - return properties.isEncrypted() ? SmUtil.sm4(SecureUtil.decode(properties.getSm4Key())).encryptBase64(data) + "##encrypted" : data; - } catch (Exception var2) { - log.debug("SM4加密异常:{}", var2.getMessage()); - return data; - } - } - - public static String desensitizedByConfig(String data, DesensitizedUtil.DesensitizedType desensitizedType) { - try { - if (properties.isDesensitization()) { - return data.endsWith("##encrypted") ? DesensitizedUtil.desensitized(sm4Decrypt(data), desensitizedType) : DesensitizedUtil.desensitized(data, desensitizedType); - } else { - return data; - } - } catch (Exception var3) { - log.debug("脱敏异常:{}", var3.getMessage()); - return data; - } - } - public static String sm4Decrypt(String data) { try { if (data.endsWith("##encrypted")) { data = data.substring(0, data.length() - "##encrypted".length()); return SmUtil.sm4(SecureUtil.decode(properties.getSm4Key())).decryptStr(data); } else { + data = Sm4Utils.decrypt(data); return data; } } catch (Exception var2) { diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/encrypt/SM4EncryptUtils.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/encrypt/SM4EncryptUtils.java index 55d8a8c4..80da539b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/encrypt/SM4EncryptUtils.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/encrypt/SM4EncryptUtils.java @@ -25,18 +25,9 @@ public class SM4EncryptUtils { return dataEncDecProperties; //(DataEncDecProperties)SpringContextHolder.getBean(DataEncDecProperties.class); } - public static String sm4Encrypt(String data) { - try { - return SmUtil.sm4(SecureUtil.decode(properties.getSm4Key())).encryptBase64(data) + "##encrypted"; - } catch (Exception var2) { - log.debug("SM4加密异常:{}", var2.getMessage()); - return data; - } - } - public static String sm4Encryptbyconfig(String data) { try { - return properties.isEncrypted() ? SmUtil.sm4(SecureUtil.decode(properties.getSm4Key())).encryptBase64(data) + "##encrypted" : data; + return properties.isEncrypted() ? Sm4Utils.encrypt(data) : data; } catch (Exception var2) { log.debug("SM4加密异常:{}", var2.getMessage()); return data; @@ -46,7 +37,7 @@ public class SM4EncryptUtils { public static String desensitizedByConfig(String data, DesensitizedUtil.DesensitizedType desensitizedType) { try { if (properties.isDesensitization()) { - return data.endsWith("##encrypted") ? DesensitizedUtil.desensitized(sm4Decrypt(data), desensitizedType) : DesensitizedUtil.desensitized(data, desensitizedType); + return data.endsWith("##encrypted") ? DesensitizedUtil.desensitized(sm4Decrypt(data), desensitizedType) : DesensitizedUtil.desensitized(Sm4Utils.decrypt(data), desensitizedType); } else { return data; }