From dcf1c2c513bca71d401f3630cf71af69227600a3 Mon Sep 17 00:00:00 2001
From: gaozhaochen <gaozhaochen@wondersgroup.com>
Date: Wed, 21 Jun 2023 14:01:37 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E6=89=80=E6=9C=89=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E4=BD=BF=E7=94=A8AES?=
 =?UTF-8?q?=E5=8A=A0=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sict/theme/common/crypto/EncryptionUtil.java    | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/common/crypto/EncryptionUtil.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/common/crypto/EncryptionUtil.java
index 948cda9..099f7fe 100644
--- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/common/crypto/EncryptionUtil.java
+++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/common/crypto/EncryptionUtil.java
@@ -1,19 +1,13 @@
 package cn.sh.stc.sict.theme.common.crypto;
 
-import cn.hutool.core.codec.Base64;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.crypto.asymmetric.KeyType;
 import cn.hutool.crypto.asymmetric.RSA;
 import cn.hutool.crypto.symmetric.AES;
-import sun.misc.BASE64Encoder;
+import cn.sh.stc.sict.cloud.common.core.util.CryptUtil;
 
 import java.io.InputStream;
-import java.security.KeyPair;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * @author gao
@@ -25,6 +19,8 @@ public class EncryptionUtil {
 
     private static final int DEFAULT_RSA_KEY_SIZE = 1024;
 
+    private static final String DEFAULT_AES_KEY = "1qaz@WSX3edc$RFV";
+
     public static final String PRIVATE_KEY = "MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEAjQnqX7O3S6eDLzw4tw9K2IsWUuS9WCptg32AmaNMN+1YawmqDVOtrnkOyECZleuir62Y6ptw8yN0cyYzMFezDQIDAQABAkB9c5Jr6flia+/+Nfzkp8+VabJDrX7WS3b5/MpE3sHPBBQ/9HhAyg7k/MHTFZ8wScziFLPQ/wb6+szacNvA1RrpAiEA2Ei7JY6L/dv9hQ+YKYblCeGIQG8FUi4Uy7xheg1M/ZMCIQCm7/xBJCMubyyKHgRXr6MonqPdu2IE51IqmerXQV/w3wIgZ9jMGuVNrC8zk+7/5XiCgnMKg72KtYGwtH4X4419WQcCIExumHpix1DdSfE66RYUrolMiQ5eWvSPzMkAi8tefUTVAiB6F4fXbtKbqpJxW5dQttJl0RsEB39HGgOjy4mLaYZgvg==";
     public static final String PUBLIC_KEY = "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAI0J6l+zt0ungy88OLcPStiLFlLkvVgqbYN9gJmjTDftWGsJqg1Tra55DshAmZXroq+tmOqbcPMjdHMmMzBXsw0CAwEAAQ==";
 
@@ -35,7 +31,8 @@ public class EncryptionUtil {
      * 获取加密返回
      */
     public static String getEncodeResponse(String encryptionData) {
-        return Base64.encode(encryptionData);
+//        return Base64.encode(encryptionData);
+        return CryptUtil.toAES(encryptionData, DEFAULT_AES_KEY);
     }
 
     /**
-- 
2.22.0