From c53a7a991742494ae26d86b14a29b129bedea0bf Mon Sep 17 00:00:00 2001 From: liu xm Date: Tue, 6 Jul 2021 14:26:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E4=BF=9D=E9=9A=9C=E6=A8=A1=E5=9D=97.factories=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=BD=8D=E7=BD=AE=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/{resources => }/META-INF/spring.factories | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename yudao-framework/yudao-spring-boot-starter-protection/src/main/resources/{resources => }/META-INF/spring.factories (100%) diff --git a/yudao-framework/yudao-spring-boot-starter-protection/src/main/resources/resources/META-INF/spring.factories b/yudao-framework/yudao-spring-boot-starter-protection/src/main/resources/META-INF/spring.factories similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-protection/src/main/resources/resources/META-INF/spring.factories rename to yudao-framework/yudao-spring-boot-starter-protection/src/main/resources/META-INF/spring.factories From 6143930a96d109ff7e4461c60fd66a41ca13a975 Mon Sep 17 00:00:00 2001 From: liu xm Date: Tue, 6 Jul 2021 14:29:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E4=BF=9D=E9=9A=9C=E6=A8=A1=E5=9D=97=E9=85=8D=E7=BD=AE=E7=B1=BB?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../idempotent/config/YudaoIdempotentConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/config/YudaoIdempotentConfiguration.java b/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/config/YudaoIdempotentConfiguration.java index 8c39ffe33..3760bed19 100644 --- a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/config/YudaoIdempotentConfiguration.java +++ b/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/config/YudaoIdempotentConfiguration.java @@ -6,7 +6,7 @@ import cn.iocoder.yudao.framework.idempotent.core.keyresolver.impl.ExpressionIde import cn.iocoder.yudao.framework.idempotent.core.keyresolver.IdempotentKeyResolver; import cn.iocoder.yudao.framework.idempotent.core.redis.IdempotentRedisDAO; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; +import cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.core.StringRedisTemplate; @@ -14,7 +14,7 @@ import org.springframework.data.redis.core.StringRedisTemplate; import java.util.List; @Configuration(proxyBeanMethods = false) -@AutoConfigureAfter(RedisAutoConfiguration.class) +@AutoConfigureAfter(YudaoRedisAutoConfiguration.class) public class YudaoIdempotentConfiguration { @Bean