diff --git a/jcpp-infrastructure-cache/src/main/java/sanbing/jcpp/infrastructure/cache/JCPPJCPPRedisSentinelConfiguration.java b/jcpp-infrastructure-cache/src/main/java/sanbing/jcpp/infrastructure/cache/JCPPJCPPRedisSentinelConfiguration.java index 434feaa..02e6cae 100644 --- a/jcpp-infrastructure-cache/src/main/java/sanbing/jcpp/infrastructure/cache/JCPPJCPPRedisSentinelConfiguration.java +++ b/jcpp-infrastructure-cache/src/main/java/sanbing/jcpp/infrastructure/cache/JCPPJCPPRedisSentinelConfiguration.java @@ -8,16 +8,14 @@ package sanbing.jcpp.infrastructure.cache; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.connection.RedisSentinelConfiguration; import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; import org.springframework.data.redis.connection.lettuce.LettucePoolingClientConfiguration; @Configuration -@ConditionalOnMissingBean(JCPPCaffeineCacheConfiguration.class) -@ConditionalOnProperty(prefix = "redis.connection", value = "type", havingValue = "sentinel") +@ConditionalOnExpression("'${cache.type:null}'=='redis' && '${redis.connection.type:null}'=='sentinel'") @Slf4j public class JCPPJCPPRedisSentinelConfiguration extends JCPPRedisCacheConfiguration { diff --git a/jcpp-infrastructure-cache/src/main/java/sanbing/jcpp/infrastructure/cache/JCPPJCPPRedisStandaloneConfiguration.java b/jcpp-infrastructure-cache/src/main/java/sanbing/jcpp/infrastructure/cache/JCPPJCPPRedisStandaloneConfiguration.java index 8425ccc..dbe5022 100644 --- a/jcpp-infrastructure-cache/src/main/java/sanbing/jcpp/infrastructure/cache/JCPPJCPPRedisStandaloneConfiguration.java +++ b/jcpp-infrastructure-cache/src/main/java/sanbing/jcpp/infrastructure/cache/JCPPJCPPRedisStandaloneConfiguration.java @@ -8,8 +8,7 @@ package sanbing.jcpp.infrastructure.cache; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.connection.RedisStandaloneConfiguration; import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; @@ -18,8 +17,7 @@ import org.springframework.data.redis.connection.lettuce.LettucePoolingClientCon import java.time.Duration; @Configuration -@ConditionalOnMissingBean(JCPPCaffeineCacheConfiguration.class) -@ConditionalOnProperty(prefix = "redis.connection", value = "type", havingValue = "standalone") +@ConditionalOnExpression("'${cache.type:null}'=='redis' && '${redis.connection.type:null}'=='standalone'") @Slf4j public class JCPPJCPPRedisStandaloneConfiguration extends JCPPRedisCacheConfiguration {