From 4e956b95e4e55a4f6905aa791b83ca6d1cd6c714 Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Sat, 8 Jul 2023 02:17:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=A0=E5=AF=86=E5=99=A8?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/orion/ops/framework/common}/crypto/ValueCrypto.java  | 2 +-
 .../security/config/OrionCryptoAutoConfiguration.java        | 5 ++---
 .../ops/framework/security/core/crypto/CryptoProcessor.java  | 2 ++
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename orion-ops-framework/{orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/core => orion-ops-common/src/main/java/com/orion/ops/framework/common}/crypto/ValueCrypto.java (83%)

diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/core/crypto/ValueCrypto.java b/orion-ops-framework/orion-ops-common/src/main/java/com/orion/ops/framework/common/crypto/ValueCrypto.java
similarity index 83%
rename from orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/core/crypto/ValueCrypto.java
rename to orion-ops-framework/orion-ops-common/src/main/java/com/orion/ops/framework/common/crypto/ValueCrypto.java
index 883d4565..a25fe87f 100644
--- a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/core/crypto/ValueCrypto.java
+++ b/orion-ops-framework/orion-ops-common/src/main/java/com/orion/ops/framework/common/crypto/ValueCrypto.java
@@ -1,4 +1,4 @@
-package com.orion.ops.framework.security.core.crypto;
+package com.orion.ops.framework.common.crypto;
 
 import com.orion.lang.utils.crypto.symmetric.SymmetricCrypto;
 
diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/config/OrionCryptoAutoConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/config/OrionCryptoAutoConfiguration.java
index 19ff0856..c2f31bd1 100644
--- a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/config/OrionCryptoAutoConfiguration.java
+++ b/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/config/OrionCryptoAutoConfiguration.java
@@ -1,7 +1,7 @@
 package com.orion.ops.framework.security.config;
 
+import com.orion.ops.framework.common.crypto.ValueCrypto;
 import com.orion.ops.framework.common.utils.CryptoUtils;
-import com.orion.ops.framework.security.core.crypto.ValueCrypto;
 import com.orion.ops.framework.security.core.crypto.aes.AesCryptoProcessor;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -32,8 +32,7 @@ public class OrionCryptoAutoConfiguration {
     @Bean(initMethod = "init")
     @ConditionalOnProperty(value = "orion.crypto.aes.enabled", havingValue = "true")
     public ValueCrypto aes() {
-        AesCryptoProcessor processor = new AesCryptoProcessor(config.getAes());
-        processor.init();
+        ValueCrypto processor = new AesCryptoProcessor(config.getAes());
         // 设置工具委托类 委托需要与 @Primary 相同, 否则会导致工具类和bean的结果不同
         CryptoUtils.delegate = processor;
         return processor;
diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/core/crypto/CryptoProcessor.java b/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/core/crypto/CryptoProcessor.java
index d935c594..4bfa7338 100644
--- a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/core/crypto/CryptoProcessor.java
+++ b/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/core/crypto/CryptoProcessor.java
@@ -1,5 +1,7 @@
 package com.orion.ops.framework.security.core.crypto;
 
+import com.orion.ops.framework.common.crypto.ValueCrypto;
+
 /**
  * 数据加密器
  *