From 28776b56db3bbd2fbbfd64394e40aa11a6b7ea29 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 15 Nov 2023 17:30:53 +0800
Subject: [PATCH] fix:补充提交

---
 screen-common/src/main/java/com/moral/util/AESUtils.java |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/screen-common/src/main/java/com/moral/util/AESUtils.java b/screen-common/src/main/java/com/moral/util/AESUtils.java
index 2ab0b0f..59ecd74 100644
--- a/screen-common/src/main/java/com/moral/util/AESUtils.java
+++ b/screen-common/src/main/java/com/moral/util/AESUtils.java
@@ -6,6 +6,8 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.net.util.Base64;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 /**
  * @ClassName AESUtil
@@ -15,9 +17,10 @@
  * @Version TODO
  **/
 @Slf4j
+@Component
 public class AESUtils {
     //������
-    public static String key = "AD42F7787B035B7580000EF93BE20BAD";
+    public static String key ;
     //���������
     private static String charset = "utf-8";
     // ���������
@@ -25,6 +28,14 @@
     //AES������
     private static String transformation = "AES/CBC/PKCS5Padding";
     private static String algorithm = "AES";
+
+
+    @Value("${AES.KEY}")
+    public  void setKey(String key) {
+        AESUtils.key = key;
+    }
+
+
 
     //������
     public static String encrypt(String content) {
@@ -56,8 +67,8 @@
     //������
     public static String decrypt(String content, String key) {
         try {
-            SecretKeySpec skey = new SecretKeySpec(key.getBytes(), algorithm);
-            IvParameterSpec iv = new IvParameterSpec(key.getBytes(), 0, offset);
+            SecretKeySpec skey = new SecretKeySpec(key.getBytes("utf-8"), algorithm);
+            IvParameterSpec iv = new IvParameterSpec(key.getBytes("utf-8"), 0, offset);
             Cipher cipher = Cipher.getInstance(transformation);
             cipher.init(Cipher.DECRYPT_MODE, skey, iv);// ���������
             byte[] result = cipher.doFinal(new Base64().decode(content));
@@ -69,5 +80,12 @@
         return null;
     }
 
+    public static void main(String[] args) {
+       // System.out.println(encrypt("123456","AD42F7787B035B7580000EF93BE20BAD"));
+        //123456 KoWjfDMZQhJMLlG1crBPqQ==
+        // ������������
+        String str = decrypt("KoWjfDMZQhJMLlG1crBPqQ==", "AD42F7787B035B7580000EF93BE20BAD");
+        System.out.println(str);
+    }
 
 }

--
Gitblit v1.8.0