From d737142a7b98294dac6d17cb6eb71bffe45f39d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Sat, 27 Jul 2019 11:08:35 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.fix=20#441=20=E3=80=90?= =?UTF-8?q?=E5=8F=91=E5=8F=B7=E5=99=A8=E6=A8=A1=E5=9D=97=E3=80=91=20Sequen?= =?UTF-8?q?ceAutoConfiguration=20=E9=BB=98=E8=AE=A4=E6=B3=A8=E5=85=A5bean?= =?UTF-8?q?=20=E9=80=BB=E8=BE=91=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/sequence/SequenceAutoConfiguration.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/SequenceAutoConfiguration.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/SequenceAutoConfiguration.java index 01c56d841..3369a1a54 100644 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/SequenceAutoConfiguration.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/SequenceAutoConfiguration.java @@ -11,7 +11,6 @@ import com.pig4cloud.common.sequence.range.impl.name.DefaultBizName; import com.pig4cloud.common.sequence.sequence.Sequence; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.data.redis.RedisProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -36,8 +35,7 @@ public class SequenceAutoConfiguration { * @return */ @Bean - @ConditionalOnBean(DataSource.class) - @ConditionalOnProperty("xsequence.db") + @ConditionalOnBean(SequenceDbProperties.class) public Sequence dbSequence(DataSource dataSource, SequenceDbProperties properties) { return DbSeqBuilder @@ -58,7 +56,7 @@ public class SequenceAutoConfiguration { * @return */ @Bean - @ConditionalOnProperty("xsequence.redis") + @ConditionalOnBean(SequenceRedisProperties.class) public Sequence redisSequence(RedisProperties redisProperties, SequenceRedisProperties properties) { return RedisSeqBuilder @@ -78,7 +76,7 @@ public class SequenceAutoConfiguration { * @return */ @Bean - @ConditionalOnProperty("xsequence.snowflake") + @ConditionalOnBean(SequenceSnowflakeProperties.class) public Sequence snowflakeSequence(SequenceSnowflakeProperties properties) { return SnowflakeSeqBuilder .create()