From f55fa60f4d73a46e143fb49cbc22a093582de3a9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 08 三月 2023 17:53:08 +0800
Subject: [PATCH] fix 修复 加解密拦截器 同一对象多次处理问题
---
ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisEncryptInterceptor.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
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..2a0b560 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
@@ -19,10 +19,7 @@
import java.lang.reflect.Field;
import java.sql.PreparedStatement;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
+import java.util.*;
/**
* 鍏ュ弬鍔犲瘑鎷︽埅鍣�
@@ -49,9 +46,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 +61,24 @@
*
* @param sourceObject 寰呭姞瀵嗗璞�
*/
- @SuppressWarnings("unchecked cast")
private void encryptHandler(Object sourceObject) {
- if (sourceObject instanceof Map) {
- ((Map<?, Object>) sourceObject).values().forEach(this::encryptHandler);
+ if (ObjectUtil.isNull(sourceObject)) {
return;
}
- if (sourceObject instanceof List) {
+ if (sourceObject instanceof Map<?, ?> map) {
+ new HashSet<>(map.values()).forEach(this::encryptHandler);
+ return;
+ }
+ if (sourceObject instanceof List<?> list) {
+ if(CollectionUtil.isEmpty(list)) {
+ return;
+ }
// 鍒ゆ柇绗竴涓厓绱犳槸鍚﹀惈鏈夋敞瑙ｃ�傚鏋滄病鏈夌洿鎺ヨ繑鍥烇紝鎻愰珮鏁堢巼
- 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());
--
Gitblit v1.9.3