From cb8056882898d5e1d23d06a82a03d8697f4c844d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Fri, 17 Feb 2023 12:45:39 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20encrypt=20?= =?UTF-8?q?=E5=8A=A0=E8=A7=A3=E5=AF=86=E6=A8=A1=E5=9D=97=E8=AF=AD=E6=B3=95?= =?UTF-8?q?=20=E7=AE=80=E5=8C=96=E4=BB=A3=E7=A0=81=E6=B6=88=E9=99=A4?= =?UTF-8?q?=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../encrypt/config/EncryptorAutoConfiguration.java | 2 ++ .../interceptor/MybatisDecryptInterceptor.java | 10 +++++----- .../interceptor/MybatisEncryptInterceptor.java | 14 ++++++-------- .../encrypt/properties/EncryptorProperties.java | 2 -- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/config/EncryptorAutoConfiguration.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/config/EncryptorAutoConfiguration.java index d77226d0a..55be902db 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/config/EncryptorAutoConfiguration.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/config/EncryptorAutoConfiguration.java @@ -7,6 +7,7 @@ import com.ruoyi.common.encrypt.properties.EncryptorProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; /** @@ -16,6 +17,7 @@ import org.springframework.context.annotation.Bean; * @version 4.6.0 */ @AutoConfiguration +@EnableConfigurationProperties(EncryptorProperties.class) @ConditionalOnProperty(value = "mybatis-encryptor.enable", havingValue = "true") public class EncryptorAutoConfiguration { diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisDecryptInterceptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisDecryptInterceptor.java index 925d4e419..066b13c37 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisDecryptInterceptor.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisDecryptInterceptor.java @@ -55,17 +55,17 @@ public class MybatisDecryptInterceptor implements Interceptor { * @param sourceObject 待加密对象 */ private void decryptHandler(Object sourceObject) { - if (sourceObject instanceof Map) { - ((Map) sourceObject).values().forEach(this::decryptHandler); + if (sourceObject instanceof Map map) { + map.values().forEach(this::decryptHandler); return; } - if (sourceObject instanceof List) { + if (sourceObject instanceof List list) { // 判断第一个元素是否含有注解。如果没有直接返回，提高效率 - Object firstItem = ((List) sourceObject).get(0); + Object firstItem = list.get(0); if (CollectionUtil.isEmpty(encryptorManager.getFieldCache(firstItem.getClass()))) { return; } - ((List) sourceObject).forEach(this::decryptHandler); + list.forEach(this::decryptHandler); return; } Set fields = encryptorManager.getFieldCache(sourceObject.getClass()); diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisEncryptInterceptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisEncryptInterceptor.java index 97fc0a450..28793ccde 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisEncryptInterceptor.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisEncryptInterceptor.java @@ -49,9 +49,8 @@ public class MybatisEncryptInterceptor implements Interceptor { @Override public Object plugin(Object target) { - if (target instanceof ParameterHandler) { + if (target instanceof ParameterHandler parameterHandler) { // 进行加密操作 - ParameterHandler parameterHandler = (ParameterHandler) target; Object parameterObject = parameterHandler.getParameterObject(); if (ObjectUtil.isNotNull(parameterObject) && !(parameterObject instanceof String)) { this.encryptHandler(parameterObject); @@ -65,19 +64,18 @@ public class MybatisEncryptInterceptor implements Interceptor { * * @param sourceObject 待加密对象 */ - @SuppressWarnings("unchecked cast") private void encryptHandler(Object sourceObject) { - if (sourceObject instanceof Map) { - ((Map) sourceObject).values().forEach(this::encryptHandler); + if (sourceObject instanceof Map map) { + map.values().forEach(this::encryptHandler); return; } - if (sourceObject instanceof List) { + if (sourceObject instanceof List list) { // 判断第一个元素是否含有注解。如果没有直接返回，提高效率 - Object firstItem = ((List) sourceObject).get(0); + Object firstItem = list.get(0); if (CollectionUtil.isEmpty(encryptorManager.getFieldCache(firstItem.getClass()))) { return; } - ((List) sourceObject).forEach(this::encryptHandler); + list.forEach(this::encryptHandler); return; } Set fields = encryptorManager.getFieldCache(sourceObject.getClass()); diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/properties/EncryptorProperties.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/properties/EncryptorProperties.java index bd8c28d0e..003db6cb6 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/properties/EncryptorProperties.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/properties/EncryptorProperties.java @@ -4,7 +4,6 @@ import com.ruoyi.common.encrypt.enumd.AlgorithmType; import com.ruoyi.common.encrypt.enumd.EncodeType; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; /** * 加解密属性配置类 @@ -13,7 +12,6 @@ import org.springframework.stereotype.Component; * @version 4.6.0 */ @Data -@Component @ConfigurationProperties(prefix = "mybatis-encryptor") public class EncryptorProperties {