From 0144ae91e88e2538d3e7dd6438849af69eb0b2f9 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Fri, 20 Sep 2024 09:53:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E7=A7=98=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/encrypt/crypto.js | 7 +++++--
 src/utils/encrypt/index.js  | 3 ++-
 src/utils/request.js        | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/utils/encrypt/crypto.js b/src/utils/encrypt/crypto.js
index 5c085683..0b44f276 100644
--- a/src/utils/encrypt/crypto.js
+++ b/src/utils/encrypt/crypto.js
@@ -5,7 +5,11 @@ import { getPublicKey } from "@/api/user.js"
 export const Crypto = {
     AES: {
         encrypt: function (plaintext, secretKey) {
-            return CryptoJS.AES.encrypt(plaintext, secretKey).toString();
+            return CryptoJS.AES.encrypt(plaintext, CryptoJS.enc.Utf8.parse(secretKey), {
+                mode: CryptoJS.mode.ECB,
+                padding: CryptoJS.pad.Pkcs7,
+                iv: ''
+            }).ciphertext.toString(CryptoJS.enc.Base64).replace(/\+/g, '-').replace(/\//g, '_');
         },
         decrypt: function (ciphertext, secretKey) {
             const bytes = CryptoJS.AES.decrypt(ciphertext, secretKey);
@@ -31,7 +35,6 @@ export const Encrypt = {
                 console.log(err)
             }
         }
-        console.log(PublicKey)
         let encryptor = new JSEncrypt()
         encryptor.setPublicKey(PublicKey)
         return encryptor.encrypt(plaintext)
diff --git a/src/utils/encrypt/index.js b/src/utils/encrypt/index.js
index 2be2cd66..606451aa 100644
--- a/src/utils/encrypt/index.js
+++ b/src/utils/encrypt/index.js
@@ -1,6 +1,6 @@
 import { Encrypt, Crypto } from "./crypto";
 export const encryptConfig = async (config) => {
-    let secretKey = randomRange(10, 43);
+    let secretKey = randomRange(32, 32);
     let encryptSecretKey = await Encrypt.encrypt(secretKey); // 密钥进行非对称加密
     if (encryptSecretKey) {
         config.headers['X-Encrypted-Key'] = encryptSecretKey;
@@ -8,6 +8,7 @@ export const encryptConfig = async (config) => {
     if (config.data && Object.prototype.toString.call(config.data) === '[object Object]') {
         Object.keys(config.data).forEach(async key => {
             config.data[key] = Crypto.AES.encrypt(config.data[key], secretKey)
+            console.log(config.data[key], 'KEY')
             // config.data[key] = await Encrypt.encrypt(config.data[key])
         })
     }
diff --git a/src/utils/request.js b/src/utils/request.js
index 7cc7d22c..861e3d0c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -23,9 +23,9 @@ service.interceptors.request.use(
     config.headers['Accept-Language'] = language === 'en' ? 'en-US,en;q=0.5' : 'zh-CN,zh;q=0.9'
     config.headers['TimeZoneId'] = moment.tz.guess()
     // if (config.ENCRYPT) {
-    //   try{
+    //   try {
     //     config = await encryptConfig(config)
-    //   }catch(err){
+    //   } catch (err) {
     //     console.log(err)
     //   }
     // }