From 348b72eb749bdf73955607c5a93e9d2b4638a492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Thu, 3 Oct 2019 06:15:51 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20#614=20=E5=8F=91?=
 =?UTF-8?q?=E5=8F=B7=E5=99=A8sequence=E4=BD=BF=E7=94=A8=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BC=9A=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sequence/SequenceAutoConfiguration.java   | 51 -------------------
 .../properties/SequenceDbProperties.java      |  4 +-
 2 files changed, 2 insertions(+), 53 deletions(-)

diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/SequenceAutoConfiguration.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/SequenceAutoConfiguration.java
index b89781d71..d668df866 100644
--- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/SequenceAutoConfiguration.java
+++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/SequenceAutoConfiguration.java
@@ -17,24 +17,15 @@
 
 package com.pig4cloud.pigx.common.sequence;
 
-import com.pig4cloud.pigx.common.sequence.builder.DbSeqBuilder;
-import com.pig4cloud.pigx.common.sequence.builder.RedisSeqBuilder;
 import com.pig4cloud.pigx.common.sequence.builder.SnowflakeSeqBuilder;
-import com.pig4cloud.pigx.common.sequence.properties.SequenceDbProperties;
-import com.pig4cloud.pigx.common.sequence.properties.SequenceRedisProperties;
 import com.pig4cloud.pigx.common.sequence.properties.SequenceSnowflakeProperties;
-import com.pig4cloud.pigx.common.sequence.range.impl.name.DateBizName;
-import com.pig4cloud.pigx.common.sequence.range.impl.name.DefaultBizName;
 import com.pig4cloud.pigx.common.sequence.sequence.Sequence;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
-import javax.sql.DataSource;
-
 /**
  * @author lengleng
  * @date 2019-05-26
@@ -44,48 +35,6 @@ import javax.sql.DataSource;
 @ConditionalOnMissingBean(Sequence.class)
 public class SequenceAutoConfiguration {
 
-	/**
-	 * 数据库作为发号器的存储介质
-	 *
-	 * @param dataSource
-	 * @param properties
-	 * @return
-	 */
-	@Bean
-	@ConditionalOnBean(SequenceDbProperties.class)
-	public Sequence dbSequence(DataSource dataSource,
-							   SequenceDbProperties properties) {
-		return DbSeqBuilder
-				.create()
-				.bizName(new DefaultBizName(properties.getBizName()))
-				.dataSource(dataSource)
-				.step(properties.getStep())
-				.retryTimes(properties.getRetryTimes())
-				.tableName(properties.getTableName())
-				.build();
-	}
-
-	/**
-	 * Redis 作为发号器的存储介质
-	 *
-	 * @param redisProperties
-	 * @param properties
-	 * @return
-	 */
-	@Bean
-	@ConditionalOnBean(SequenceRedisProperties.class)
-	public Sequence redisSequence(RedisProperties redisProperties,
-								  SequenceRedisProperties properties) {
-		return RedisSeqBuilder
-				.create()
-				.bizName(new DateBizName(properties.getBizName()))
-				.ip(redisProperties.getHost())
-				.port(redisProperties.getPort())
-				.auth(redisProperties.getPassword())
-				.step(properties.getStep())
-				.build();
-	}
-
 	/**
 	 * snowflak 算法作为发号器实现
 	 *
diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/properties/SequenceDbProperties.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/properties/SequenceDbProperties.java
index b1329ca93..e2f1c333f 100644
--- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/properties/SequenceDbProperties.java
+++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/properties/SequenceDbProperties.java
@@ -22,10 +22,10 @@ public class SequenceDbProperties extends BaseSequenceProperties {
 	/**
 	 * 表名称
 	 */
-	private String tableName;
+	private String tableName = "pigx_sequence";
 	/**
 	 * 重试次数
 	 */
-	private int retryTimes;
+	private int retryTimes = 1;
 
 }
\ No newline at end of file