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; + /** * 数据加密器 *