From cb8056882898d5e1d23d06a82a03d8697f4c844d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 17 二月 2023 12:45:39 +0800
Subject: [PATCH] update 优化 encrypt 加解密模块语法 简化代码消除警告
---
ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/config/EncryptorAutoConfiguration.java | 2 ++
ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/properties/EncryptorProperties.java | 2 --
ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisEncryptInterceptor.java | 14 ++++++--------
ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisDecryptInterceptor.java | 10 +++++-----
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 d77226d..55be902 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 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 @@
* @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 925d4e4..066b13c 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 @@
* @param sourceObject 寰呭姞瀵嗗璞�
*/
private void decryptHandler(Object sourceObject) {
- if (sourceObject instanceof Map) {
- ((Map<?, Object>) 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<Field> 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 97fc0a4..28793cc 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 @@
@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 @@
*
* @param sourceObject 寰呭姞瀵嗗璞�
*/
- @SuppressWarnings("unchecked cast")
private void encryptHandler(Object sourceObject) {
- if (sourceObject instanceof Map) {
- ((Map<?, Object>) 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<Field> 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 bd8c28d..003db6c 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.EncodeType;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
/**
* 鍔犺В瀵嗗睘鎬ч厤缃被
@@ -13,7 +12,6 @@
* @version 4.6.0
*/
@Data
-@Component
@ConfigurationProperties(prefix = "mybatis-encryptor")
public class EncryptorProperties {
--
Gitblit v1.9.3