From 75e8234402c37495b2425fcbe4d19aa5ef97fd7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=5F=E8=80=81=E9=A9=AC=5F?= Date: Wed, 17 Jan 2024 10:24:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=85=E5=AE=B9=E5=A6=82?= =?UTF-8?q?=E4=B8=8B:=201.@Resource=E6=9B=BF=E6=8D=A2=E4=B8=BA@Autowired?= =?UTF-8?q?=202.=E5=8C=85=E5=90=8D=E8=87=AA=E5=8A=A8=E5=BC=95=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../encrypt/config/EncryptorAutoConfiguration.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java index 0f3aee97d..a0e86a6a6 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java @@ -3,7 +3,6 @@ package org.dromara.common.encrypt.config; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties; -import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.io.Resources; import org.dromara.common.encrypt.annotation.EncryptField; @@ -11,11 +10,13 @@ import org.dromara.common.encrypt.core.EncryptorManager; import org.dromara.common.encrypt.interceptor.MybatisDecryptInterceptor; import org.dromara.common.encrypt.interceptor.MybatisEncryptInterceptor; import org.dromara.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.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; +import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.ResourcePatternResolver; import org.springframework.core.type.ClassMetadata; @@ -40,9 +41,9 @@ import static org.springframework.util.StringUtils.tokenizeToStringArray; @Slf4j public class EncryptorAutoConfiguration { - @Resource + @Autowired private EncryptorProperties properties; - @Resource + @Autowired private MybatisPlusProperties mybatisPlusProperties; @Bean @@ -58,9 +59,9 @@ public class EncryptorAutoConfiguration { String[] packagePatternArray = tokenizeToStringArray(typeAliasesPackage, ConfigurableApplicationContext.CONFIG_LOCATION_DELIMITERS); for (String packagePattern : packagePatternArray) { - org.springframework.core.io.Resource[] resources = new PathMatchingResourcePatternResolver().getResources(ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX + Resource[] resources = new PathMatchingResourcePatternResolver().getResources(ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX + ClassUtils.convertClassNameToResourcePath(packagePattern) + "/**/*.class"); - for (org.springframework.core.io.Resource resource : resources) { + for (Resource resource : resources) { ClassMetadata classMetadata = new CachingMetadataReaderFactory().getMetadataReader(resource).getClassMetadata(); Class clazz = Resources.classForName(classMetadata.getClassName()); Set encryptFieldSet = getEncryptFieldSetFromClazz(clazz);