From f1c3c5f0b840df7fa5fe08a69186c9f2b52ce243 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 18 Mar 2021 15:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-common/src/main/java/com/moral/util/AESUtils.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 33a1aef..19d2c3c 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) {
@@ -70,7 +81,7 @@
}
public static void main(String[] args) {
- System.out.println(encrypt("4048974139","AD42F7787B035B7580000EF93BE20BAD"));
+ System.out.println(encrypt("404897439","AD42F7787B035B7580000EF93BE20BAD"));
System.out.println(encrypt("chenkaiyu111","AD42F7787B035B7580000EF93BE20BAD"));
}
--
Gitblit v1.8.0