From b7a8f2464f068fbc1aff4d0e66ba7641774e945f Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Thu, 16 Oct 2025 09:27:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../software/common/util/AESUtils.java        | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/AESUtils.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/AESUtils.java
index 2167ac2..62707d0 100644
--- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/AESUtils.java
+++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/AESUtils.java
@@ -1,17 +1,8 @@
 package com.electromagnetic.industry.software.common.util;
 
 
-import cn.hutool.core.codec.Base64;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.spec.SecretKeySpec;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.Security;
+import cn.hutool.crypto.SecureUtil;
+import cn.hutool.crypto.symmetric.AES;
 
 /**
  * <p>Description: [AES对称加密和解密]</p>
@@ -31,13 +22,12 @@ public class AESUtils {
      */
     public static String decrypt(String enc, String key) {
         try {
-            SecretKeySpec secretKeySpec = new SecretKeySpec(key.getBytes(), "AES");
-            Security.addProvider(new BouncyCastleProvider());
-            Cipher cipher = Cipher.getInstance("AES/ECB/PKCS7Padding");
-            cipher.init(Cipher.DECRYPT_MODE, secretKeySpec);
-            return new String(cipher.doFinal(Base64.decode(enc)));
-        } catch (NoSuchPaddingException | IllegalBlockSizeException | NoSuchAlgorithmException | BadPaddingException |
-                 InvalidKeyException e) {
+            // 使用Hutool创建AES解密器（ECB模式，PKCS7Padding）
+            AES aes = SecureUtil.aes(key.getBytes());
+            // 执行解密（Hutool会自动处理Base64解码）
+            byte[] decrypted = aes.decrypt(enc);
+            return new String(decrypted);
+        } catch (Exception e) {
             throw new RuntimeException(e);
         }
     }