From 3c8d864b5f68af5167199e0d5c9ff6c0c5852638 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 一月 2025 11:35:45 +0800
Subject: [PATCH] !639 发布 5.3.0-BETA 公测版本 Merge pull request !639 from 疯狂的狮子Li/dev
---
ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java
index 356b043..b5f194d 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java
@@ -1,11 +1,11 @@
package org.dromara.common.encrypt.core;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ReflectUtil;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.io.Resources;
+import org.dromara.common.core.utils.ObjectUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.encrypt.annotation.EncryptField;
import org.springframework.context.ConfigurableApplicationContext;
@@ -17,7 +17,10 @@
import org.springframework.util.ClassUtils;
import java.lang.reflect.Field;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
@@ -34,7 +37,7 @@
/**
* 缂撳瓨鍔犲瘑鍣�
*/
- Map<EncryptContext, IEncryptor> encryptorMap = new ConcurrentHashMap<>();
+ Map<Integer, IEncryptor> encryptorMap = new ConcurrentHashMap<>();
/**
* 绫诲姞瀵嗗瓧娈电紦瀛�
@@ -47,7 +50,7 @@
* @param typeAliasesPackage 瀹炰綋绫诲寘
*/
public EncryptorManager(String typeAliasesPackage) {
- this.fieldCache = scanEncryptClasses(typeAliasesPackage);
+ scanEncryptClasses(typeAliasesPackage);
}
@@ -55,10 +58,7 @@
* 鑾峰彇绫诲姞瀵嗗瓧娈电紦瀛�
*/
public Set<Field> getFieldCache(Class<?> sourceClazz) {
- if (ObjectUtil.isNotNull(fieldCache)) {
- return fieldCache.get(sourceClazz);
- }
- return null;
+ return ObjectUtils.notNullGetter(fieldCache, f -> f.get(sourceClazz));
}
/**
@@ -67,11 +67,12 @@
* @param encryptContext 鍔犲瘑鎵ц鑰呴渶瑕佺殑鐩稿叧閰嶇疆鍙傛暟
*/
public IEncryptor registAndGetEncryptor(EncryptContext encryptContext) {
- if (encryptorMap.containsKey(encryptContext)) {
- return encryptorMap.get(encryptContext);
+ int key = encryptContext.hashCode();
+ if (encryptorMap.containsKey(key)) {
+ return encryptorMap.get(key);
}
IEncryptor encryptor = ReflectUtil.newInstance(encryptContext.getAlgorithm().getClazz(), encryptContext);
- encryptorMap.put(encryptContext, encryptor);
+ encryptorMap.put(key, encryptor);
return encryptor;
}
@@ -81,7 +82,7 @@
* @param encryptContext 鍔犲瘑鎵ц鑰呴渶瑕佺殑鐩稿叧閰嶇疆鍙傛暟
*/
public void removeEncryptor(EncryptContext encryptContext) {
- this.encryptorMap.remove(encryptContext);
+ this.encryptorMap.remove(encryptContext.hashCode());
}
/**
@@ -109,8 +110,7 @@
/**
* 閫氳繃 typeAliasesPackage 璁剧疆鐨勬壂鎻忓寘 鎵弿缂撳瓨瀹炰綋
*/
- private Map<Class<?>, Set<Field>> scanEncryptClasses(String typeAliasesPackage) {
- Map<Class<?>, Set<Field>> fieldCache = new HashMap<>();
+ private void scanEncryptClasses(String typeAliasesPackage) {
PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
CachingMetadataReaderFactory factory = new CachingMetadataReaderFactory();
String[] packagePatternArray = StringUtils.splitPreserveAllTokens(typeAliasesPackage, ConfigurableApplicationContext.CONFIG_LOCATION_DELIMITERS);
@@ -131,7 +131,6 @@
} catch (Exception e) {
log.error("鍒濆鍖栨暟鎹畨鍏ㄧ紦瀛樻椂鍑洪敊:{}", e.getMessage());
}
- return fieldCache;
}
/**
--
Gitblit v1.9.3