From 1b45197a985684d930ee2ca58635d89bae6b6da8 Mon Sep 17 00:00:00 2001
From: cjl <chenjl@deyt.cn>
Date: Sat, 08 Jul 2023 20:05:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into cjl

---
 screen-common/src/main/java/com/moral/util/AESUtils.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 7f77b15..6d6f32f 100644
--- a/screen-common/src/main/java/com/moral/util/AESUtils.java
+++ b/screen-common/src/main/java/com/moral/util/AESUtils.java
@@ -81,7 +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