From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev
---
screen-common/src/main/java/com/moral/util/AESUtils.java | 9 ++++++---
1 files changed, 6 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 b887ea9..59ecd74 100644
--- a/screen-common/src/main/java/com/moral/util/AESUtils.java
+++ b/screen-common/src/main/java/com/moral/util/AESUtils.java
@@ -67,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));
@@ -81,8 +81,11 @@
}
public static void main(String[] args) {
- System.out.println(encrypt("123456","AD42F7787B035B7580000EF93BE20BAD"));
+ // System.out.println(encrypt("123456","AD42F7787B035B7580000EF93BE20BAD"));
//123456 KoWjfDMZQhJMLlG1crBPqQ==
+ // ������������
+ String str = decrypt("KoWjfDMZQhJMLlG1crBPqQ==", "AD42F7787B035B7580000EF93BE20BAD");
+ System.out.println(str);
}
}
--
Gitblit v1.8.0