diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/EncryptContext.java b/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/EncryptContext.java
index 2a1543ae8..3340ecdc1 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/EncryptContext.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/EncryptContext.java
@@ -12,7 +12,6 @@ import lombok.Data;
  * @date 2023-01-17 08:31
  */
 @Data
-@Builder
 public class EncryptContext {
     /**
      * 安全秘钥
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/encryptor/AbstractEncryptor.java b/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/AbstractEncryptor.java
similarity index 88%
rename from ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/encryptor/AbstractEncryptor.java
rename to ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/AbstractEncryptor.java
index 16f898646..aaea4ac33 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/encryptor/AbstractEncryptor.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/AbstractEncryptor.java
@@ -1,4 +1,4 @@
-package com.ruoyi.framework.encrypt.encryptor;
+package com.ruoyi.common.encrypt.encryptor;
 
 import com.ruoyi.common.encrypt.EncryptContext;
 import com.ruoyi.common.encrypt.IEncryptor;
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/encryptor/AesEncryptor.java b/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/AesEncryptor.java
similarity index 98%
rename from ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/encryptor/AesEncryptor.java
rename to ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/AesEncryptor.java
index 8b52a60f2..af1b14693 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/encryptor/AesEncryptor.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/AesEncryptor.java
@@ -1,4 +1,4 @@
-package com.ruoyi.framework.encrypt.encryptor;
+package com.ruoyi.common.encrypt.encryptor;
 
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/encryptor/Base64Encryptor.java b/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Base64Encryptor.java
similarity index 96%
rename from ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/encryptor/Base64Encryptor.java
rename to ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Base64Encryptor.java
index 34e895966..75f664217 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/encryptor/Base64Encryptor.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Base64Encryptor.java
@@ -1,4 +1,4 @@
-package com.ruoyi.framework.encrypt.encryptor;
+package com.ruoyi.common.encrypt.encryptor;
 
 import cn.hutool.core.codec.Base64;
 import com.ruoyi.common.encrypt.EncryptContext;
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/encryptor/RsaEncryptor.java b/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/RsaEncryptor.java
similarity index 98%
rename from ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/encryptor/RsaEncryptor.java
rename to ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/RsaEncryptor.java
index a12af5a26..d09abef55 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/encryptor/RsaEncryptor.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/RsaEncryptor.java
@@ -1,4 +1,4 @@
-package com.ruoyi.framework.encrypt.encryptor;
+package com.ruoyi.common.encrypt.encryptor;
 
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.util.ObjectUtil;
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/encryptor/Sm2Encryptor.java b/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Sm2Encryptor.java
similarity index 98%
rename from ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/encryptor/Sm2Encryptor.java
rename to ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Sm2Encryptor.java
index fbbe284c8..0ed177b3c 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/encryptor/Sm2Encryptor.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Sm2Encryptor.java
@@ -1,4 +1,4 @@
-package com.ruoyi.framework.encrypt.encryptor;
+package com.ruoyi.common.encrypt.encryptor;
 
 
 import cn.hutool.core.codec.Base64;
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/encryptor/Sm4Encryptor.java b/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Sm4Encryptor.java
similarity index 98%
rename from ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/encryptor/Sm4Encryptor.java
rename to ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Sm4Encryptor.java
index e9b747f5b..cf999c278 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/encryptor/Sm4Encryptor.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Sm4Encryptor.java
@@ -1,4 +1,4 @@
-package com.ruoyi.framework.encrypt.encryptor;
+package com.ruoyi.common.encrypt.encryptor;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/AlgorithmType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/AlgorithmType.java
index 8d99e5cec..474a5ef08 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/AlgorithmType.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/AlgorithmType.java
@@ -14,27 +14,27 @@ public enum AlgorithmType {
     /**
      * base64
      */
-    BASE64("com.ruoyi.framework.encrypt.encryptor.Base64Encryptor"),
+    BASE64("com.ruoyi.common.encrypt.encryptor.Base64Encryptor"),
 
     /**
      * aes
      */
-    AES("com.ruoyi.framework.encrypt.encryptor.AesEncryptor"),
+    AES("com.ruoyi.common.encrypt.encryptor.AesEncryptor"),
 
     /**
      * rsa
      */
-    RSA("com.ruoyi.framework.encrypt.encryptor.RsaEncryptor"),
+    RSA("com.ruoyi.common.encrypt.encryptor.RsaEncryptor"),
 
     /**
      * sm2
      */
-    SM2("com.ruoyi.framework.encrypt.encryptor.Sm2Encryptor"),
+    SM2("com.ruoyi.common.encrypt.encryptor.Sm2Encryptor"),
 
     /**
      * sm4
      */
-    SM4("com.ruoyi.framework.encrypt.encryptor.Sm4Encryptor");
+    SM4("com.ruoyi.common.encrypt.encryptor.Sm4Encryptor");
 
     private final String clazz;
 }
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/EncryptedFieldsCacheHelper.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/EncryptedFieldsCache.java
similarity index 96%
rename from ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/EncryptedFieldsCacheHelper.java
rename to ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/EncryptedFieldsCache.java
index 53b92496d..e9d2a68ab 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/EncryptedFieldsCacheHelper.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/EncryptedFieldsCache.java
@@ -15,7 +15,7 @@ import java.util.stream.Collectors;
  * @author 老马
  * @date 2023-01-12 11:07
  */
-public class EncryptedFieldsCacheHelper {
+public class EncryptedFieldsCache {
     private static final Map<Class<?>, Set<Field>> ENCRYPTED_FIELD_CACHE = new ConcurrentHashMap<>();
 
     public static Set<Field> get(Class<?> sourceClazz) {
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/EncryptorManager.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/EncryptorManager.java
index aaa0105ea..3faa7ea4a 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/EncryptorManager.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/EncryptorManager.java
@@ -39,12 +39,11 @@ public class EncryptorManager {
         if (encryptorMap.containsKey(encryptorKey)) {
             return encryptorMap.get(encryptorKey);
         }
-        EncryptContext encryptContext = EncryptContext.builder()
-            .password(properties.getPassword())
-            .privateKey(properties.getPrivateKey())
-            .publicKey(properties.getPublicKey())
-            .encode(properties.getEncode())
-            .build();
+        EncryptContext encryptContext = new EncryptContext();
+        encryptContext.setPassword(properties.getPassword());
+        encryptContext.setPrivateKey(properties.getPrivateKey());
+        encryptContext.setPublicKey(properties.getPublicKey());
+        encryptContext.setEncode(properties.getEncode());
         Class<IEncryptor> clazz = null;
         try {
             clazz = ClassLoaderUtil.loadClass(properties.getAlgorithm().getClazz());
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/MybatisDecryptInterceptor.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/MybatisDecryptInterceptor.java
index 6d99f09c3..1cdb58e1f 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/MybatisDecryptInterceptor.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/MybatisDecryptInterceptor.java
@@ -57,13 +57,13 @@ public class MybatisDecryptInterceptor implements Interceptor {
         if (sourceObject instanceof List) {
             // 判断第一个元素是否含有注解。如果没有直接返回，提高效率
             Object firstItem = ((List<?>) sourceObject).get(0);
-            if (CollectionUtil.isEmpty(EncryptedFieldsCacheHelper.get(firstItem.getClass()))) {
+            if (CollectionUtil.isEmpty(EncryptedFieldsCache.get(firstItem.getClass()))) {
                 return;
             }
             ((List<?>) sourceObject).forEach(this::decryptHandler);
             return;
         }
-        Set<Field> fields = EncryptedFieldsCacheHelper.get(sourceObject.getClass());
+        Set<Field> fields = EncryptedFieldsCache.get(sourceObject.getClass());
         try {
             for (Field field : fields) {
                 field.set(sourceObject, this.decryptField(String.valueOf(field.get(sourceObject)), field));
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/MybatisEncryptInterceptor.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/MybatisEncryptInterceptor.java
index a8334f46f..4fd5289e0 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/MybatisEncryptInterceptor.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/MybatisEncryptInterceptor.java
@@ -68,13 +68,13 @@ public class MybatisEncryptInterceptor implements Interceptor {
         if (sourceObject instanceof List) {
             // 判断第一个元素是否含有注解。如果没有直接返回，提高效率
             Object firstItem = ((List<?>) sourceObject).get(0);
-            if (CollectionUtil.isEmpty(EncryptedFieldsCacheHelper.get(firstItem.getClass()))) {
+            if (CollectionUtil.isEmpty(EncryptedFieldsCache.get(firstItem.getClass()))) {
                 return;
             }
             ((List<?>) sourceObject).forEach(this::encryptHandler);
             return;
         }
-        Set<Field> fields = EncryptedFieldsCacheHelper.get(sourceObject.getClass());
+        Set<Field> fields = EncryptedFieldsCache.get(sourceObject.getClass());
         try {
             for (Field field : fields) {
                 field.set(sourceObject, this.encryptField(String.valueOf(field.get(sourceObject)), field));