From 4402814b0d32b3c7d78164066c8027e11e9ae734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Thu, 29 Aug 2019 14:43:11 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E5=92=8C=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E3=80=82=20pigx-c?= =?UTF-8?q?ommon-sequence=20=E6=A8=A1=E5=9D=97=E5=A2=9E=E5=8A=A0=20pigx?= =?UTF-8?q?=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sequence/SequenceAutoConfiguration.java | 39 +++++++++++++------ .../common/sequence/builder/DbSeqBuilder.java | 10 ++--- .../sequence/builder/RedisSeqBuilder.java | 10 ++--- .../common/sequence/builder/SeqBuilder.java | 4 +- .../sequence/builder/SnowflakeSeqBuilder.java | 6 +-- .../sequence/exception/SeqException.java | 2 +- .../properties/BaseSequenceProperties.java | 2 +- .../properties/SequenceDbProperties.java | 2 +- .../properties/SequenceRedisProperties.java | 2 +- .../SequenceSnowflakeProperties.java | 2 +- .../common/sequence/range/BizName.java | 2 +- .../common/sequence/range/SeqRange.java | 2 +- .../common/sequence/range/SeqRangeMgr.java | 4 +- .../sequence/range/impl/db/BaseDbHelper.java | 4 +- .../sequence/range/impl/db/DbSeqRangeMgr.java | 8 ++-- .../sequence/range/impl/name/DateBizName.java | 4 +- .../range/impl/name/DefaultBizName.java | 4 +- .../range/impl/redis/RedisSeqRangeMgr.java | 8 ++-- .../sequence/sequence/RangeSequence.java | 6 +-- .../common/sequence/sequence/Sequence.java | 4 +- .../sequence/impl/DefaultRangeSequence.java | 12 +++--- .../sequence/impl/SnowflakeSequence.java | 6 +-- .../main/resources/META-INF/spring.factories | 2 +- .../pigx/pay/config/SequenceConfig.java | 6 +-- .../handler/impl/AbstractPayOrderHandler.java | 2 +- 25 files changed, 85 insertions(+), 68 deletions(-) rename pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/{ => pigx}/common/sequence/SequenceAutoConfiguration.java (56%) rename pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/{ => pigx}/common/sequence/builder/DbSeqBuilder.java (86%) rename pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/{ => pigx}/common/sequence/builder/RedisSeqBuilder.java (84%) rename pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/{ => pigx}/common/sequence/builder/SeqBuilder.java (64%) rename pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/{ => pigx}/common/sequence/builder/SnowflakeSeqBuilder.java (83%) rename pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/{ => pigx}/common/sequence/exception/SeqException.java (84%) rename pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/{ => pigx}/common/sequence/properties/BaseSequenceProperties.java (87%) rename pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/{ => pigx}/common/sequence/properties/SequenceDbProperties.java (90%) rename pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/{ => pigx}/common/sequence/properties/SequenceRedisProperties.java (88%) rename pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/{ => pigx}/common/sequence/properties/SequenceSnowflakeProperties.java (92%) rename pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/{ => pigx}/common/sequence/range/BizName.java (75%) rename pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/{ => pigx}/common/sequence/range/SeqRange.java (96%) rename pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/{ => pigx}/common/sequence/range/SeqRangeMgr.java (73%) rename pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/{ => pigx}/common/sequence/range/impl/db/BaseDbHelper.java (97%) rename pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/{ => pigx}/common/sequence/range/impl/db/DbSeqRangeMgr.java (92%) rename pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/{ => pigx}/common/sequence/range/impl/name/DateBizName.java (77%) rename pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/{ => pigx}/common/sequence/range/impl/name/DefaultBizName.java (72%) rename pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/{ => pigx}/common/sequence/range/impl/redis/RedisSeqRangeMgr.java (90%) rename pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/{ => pigx}/common/sequence/sequence/RangeSequence.java (67%) rename pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/{ => pigx}/common/sequence/sequence/Sequence.java (76%) rename pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/{ => pigx}/common/sequence/sequence/impl/DefaultRangeSequence.java (84%) rename pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/{ => pigx}/common/sequence/sequence/impl/SnowflakeSequence.java (95%) 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/pigx/common/sequence/SequenceAutoConfiguration.java similarity index 56% rename from pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/SequenceAutoConfiguration.java rename to pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/SequenceAutoConfiguration.java index 3369a1a54..b89781d71 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/pigx/common/sequence/SequenceAutoConfiguration.java @@ -1,14 +1,31 @@ -package com.pig4cloud.common.sequence; +/* + * Copyright (c) 2018-2025, lengleng All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the pig4cloud.com developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: lengleng (wangiegie@gmail.com) + */ -import com.pig4cloud.common.sequence.builder.DbSeqBuilder; -import com.pig4cloud.common.sequence.builder.RedisSeqBuilder; -import com.pig4cloud.common.sequence.builder.SnowflakeSeqBuilder; -import com.pig4cloud.common.sequence.properties.SequenceDbProperties; -import com.pig4cloud.common.sequence.properties.SequenceRedisProperties; -import com.pig4cloud.common.sequence.properties.SequenceSnowflakeProperties; -import com.pig4cloud.common.sequence.range.impl.name.DateBizName; -import com.pig4cloud.common.sequence.range.impl.name.DefaultBizName; -import com.pig4cloud.common.sequence.sequence.Sequence; +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; @@ -23,7 +40,7 @@ import javax.sql.DataSource; * @date 2019-05-26 */ @Configuration -@ComponentScan("com.pig4cloud.common.sequence") +@ComponentScan("com.pig4cloud.pigx.common.sequence") @ConditionalOnMissingBean(Sequence.class) public class SequenceAutoConfiguration { diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/builder/DbSeqBuilder.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/builder/DbSeqBuilder.java similarity index 86% rename from pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/builder/DbSeqBuilder.java rename to pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/builder/DbSeqBuilder.java index 7812ae2dc..c0cd8bb4a 100755 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/builder/DbSeqBuilder.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/builder/DbSeqBuilder.java @@ -1,10 +1,10 @@ -package com.pig4cloud.common.sequence.builder; +package com.pig4cloud.pigx.common.sequence.builder; -import com.pig4cloud.common.sequence.range.BizName; -import com.pig4cloud.common.sequence.range.impl.db.DbSeqRangeMgr; -import com.pig4cloud.common.sequence.sequence.Sequence; -import com.pig4cloud.common.sequence.sequence.impl.DefaultRangeSequence; +import com.pig4cloud.pigx.common.sequence.range.BizName; +import com.pig4cloud.pigx.common.sequence.range.impl.db.DbSeqRangeMgr; +import com.pig4cloud.pigx.common.sequence.sequence.Sequence; +import com.pig4cloud.pigx.common.sequence.sequence.impl.DefaultRangeSequence; import javax.sql.DataSource; diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/builder/RedisSeqBuilder.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/builder/RedisSeqBuilder.java similarity index 84% rename from pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/builder/RedisSeqBuilder.java rename to pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/builder/RedisSeqBuilder.java index fd34d04cb..efed9b976 100755 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/builder/RedisSeqBuilder.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/builder/RedisSeqBuilder.java @@ -1,10 +1,10 @@ -package com.pig4cloud.common.sequence.builder; +package com.pig4cloud.pigx.common.sequence.builder; -import com.pig4cloud.common.sequence.range.BizName; -import com.pig4cloud.common.sequence.range.impl.redis.RedisSeqRangeMgr; -import com.pig4cloud.common.sequence.sequence.Sequence; -import com.pig4cloud.common.sequence.sequence.impl.DefaultRangeSequence; +import com.pig4cloud.pigx.common.sequence.range.BizName; +import com.pig4cloud.pigx.common.sequence.range.impl.redis.RedisSeqRangeMgr; +import com.pig4cloud.pigx.common.sequence.sequence.Sequence; +import com.pig4cloud.pigx.common.sequence.sequence.impl.DefaultRangeSequence; /** * 基于redis取步长，序列号生成器构建者 diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/builder/SeqBuilder.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/builder/SeqBuilder.java similarity index 64% rename from pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/builder/SeqBuilder.java rename to pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/builder/SeqBuilder.java index 364287e87..e5eb05254 100755 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/builder/SeqBuilder.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/builder/SeqBuilder.java @@ -1,7 +1,7 @@ -package com.pig4cloud.common.sequence.builder; +package com.pig4cloud.pigx.common.sequence.builder; -import com.pig4cloud.common.sequence.sequence.Sequence; +import com.pig4cloud.pigx.common.sequence.sequence.Sequence; /** * 序列号生成器构建者 diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/builder/SnowflakeSeqBuilder.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/builder/SnowflakeSeqBuilder.java similarity index 83% rename from pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/builder/SnowflakeSeqBuilder.java rename to pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/builder/SnowflakeSeqBuilder.java index 12cd8f49a..eabb641c0 100755 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/builder/SnowflakeSeqBuilder.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/builder/SnowflakeSeqBuilder.java @@ -1,8 +1,8 @@ -package com.pig4cloud.common.sequence.builder; +package com.pig4cloud.pigx.common.sequence.builder; -import com.pig4cloud.common.sequence.sequence.Sequence; -import com.pig4cloud.common.sequence.sequence.impl.SnowflakeSequence; +import com.pig4cloud.pigx.common.sequence.sequence.Sequence; +import com.pig4cloud.pigx.common.sequence.sequence.impl.SnowflakeSequence; /** * 基于雪花算法，序列号生成器构建者 diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/exception/SeqException.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/exception/SeqException.java similarity index 84% rename from pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/exception/SeqException.java rename to pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/exception/SeqException.java index e5b5720fb..b60093432 100755 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/exception/SeqException.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/exception/SeqException.java @@ -1,4 +1,4 @@ -package com.pig4cloud.common.sequence.exception; +package com.pig4cloud.pigx.common.sequence.exception; /** * 序列号生成异常 diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/properties/BaseSequenceProperties.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/properties/BaseSequenceProperties.java similarity index 87% rename from pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/properties/BaseSequenceProperties.java rename to pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/properties/BaseSequenceProperties.java index 425736fae..05c23e836 100644 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/properties/BaseSequenceProperties.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/properties/BaseSequenceProperties.java @@ -1,4 +1,4 @@ -package com.pig4cloud.common.sequence.properties; +package com.pig4cloud.pigx.common.sequence.properties; import lombok.Data; diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/properties/SequenceDbProperties.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/properties/SequenceDbProperties.java similarity index 90% rename from pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/properties/SequenceDbProperties.java rename to pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/properties/SequenceDbProperties.java index bd94caad6..b1329ca93 100644 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/properties/SequenceDbProperties.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/properties/SequenceDbProperties.java @@ -1,4 +1,4 @@ -package com.pig4cloud.common.sequence.properties; +package com.pig4cloud.pigx.common.sequence.properties; /** * @author lengleng diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/properties/SequenceRedisProperties.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/properties/SequenceRedisProperties.java similarity index 88% rename from pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/properties/SequenceRedisProperties.java rename to pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/properties/SequenceRedisProperties.java index c6d6e9e5a..22a6e4ca2 100644 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/properties/SequenceRedisProperties.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/properties/SequenceRedisProperties.java @@ -1,4 +1,4 @@ -package com.pig4cloud.common.sequence.properties; +package com.pig4cloud.pigx.common.sequence.properties; /** * @author lengleng diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/properties/SequenceSnowflakeProperties.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/properties/SequenceSnowflakeProperties.java similarity index 92% rename from pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/properties/SequenceSnowflakeProperties.java rename to pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/properties/SequenceSnowflakeProperties.java index e12b5e62a..ee6d90bb8 100644 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/properties/SequenceSnowflakeProperties.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/properties/SequenceSnowflakeProperties.java @@ -1,4 +1,4 @@ -package com.pig4cloud.common.sequence.properties; +package com.pig4cloud.pigx.common.sequence.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/BizName.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/BizName.java similarity index 75% rename from pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/BizName.java rename to pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/BizName.java index 813fa7883..93ef9ec9b 100644 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/BizName.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/BizName.java @@ -1,4 +1,4 @@ -package com.pig4cloud.common.sequence.range; +package com.pig4cloud.pigx.common.sequence.range; /** * @author lengleng diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/SeqRange.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/SeqRange.java similarity index 96% rename from pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/SeqRange.java rename to pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/SeqRange.java index ce0979df0..4ab04926c 100755 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/SeqRange.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/SeqRange.java @@ -1,4 +1,4 @@ -package com.pig4cloud.common.sequence.range; +package com.pig4cloud.pigx.common.sequence.range; import java.util.concurrent.atomic.AtomicLong; diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/SeqRangeMgr.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/SeqRangeMgr.java similarity index 73% rename from pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/SeqRangeMgr.java rename to pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/SeqRangeMgr.java index 9dfd974ab..7590461fe 100755 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/SeqRangeMgr.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/SeqRangeMgr.java @@ -1,7 +1,7 @@ -package com.pig4cloud.common.sequence.range; +package com.pig4cloud.pigx.common.sequence.range; -import com.pig4cloud.common.sequence.exception.SeqException; +import com.pig4cloud.pigx.common.sequence.exception.SeqException; /** * 区间管理器 diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/impl/db/BaseDbHelper.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/BaseDbHelper.java similarity index 97% rename from pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/impl/db/BaseDbHelper.java rename to pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/BaseDbHelper.java index 0442d7bd4..a413b8c34 100755 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/impl/db/BaseDbHelper.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/BaseDbHelper.java @@ -1,7 +1,7 @@ -package com.pig4cloud.common.sequence.range.impl.db; +package com.pig4cloud.pigx.common.sequence.range.impl.db; -import com.pig4cloud.common.sequence.exception.SeqException; +import com.pig4cloud.pigx.common.sequence.exception.SeqException; import javax.sql.DataSource; import java.sql.*; diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/impl/db/DbSeqRangeMgr.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/DbSeqRangeMgr.java similarity index 92% rename from pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/impl/db/DbSeqRangeMgr.java rename to pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/DbSeqRangeMgr.java index b34008d85..ca9ee099d 100755 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/impl/db/DbSeqRangeMgr.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/DbSeqRangeMgr.java @@ -1,9 +1,9 @@ -package com.pig4cloud.common.sequence.range.impl.db; +package com.pig4cloud.pigx.common.sequence.range.impl.db; -import com.pig4cloud.common.sequence.exception.SeqException; -import com.pig4cloud.common.sequence.range.SeqRange; -import com.pig4cloud.common.sequence.range.SeqRangeMgr; +import com.pig4cloud.pigx.common.sequence.exception.SeqException; +import com.pig4cloud.pigx.common.sequence.range.SeqRange; +import com.pig4cloud.pigx.common.sequence.range.SeqRangeMgr; import javax.sql.DataSource; diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/impl/name/DateBizName.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/name/DateBizName.java similarity index 77% rename from pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/impl/name/DateBizName.java rename to pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/name/DateBizName.java index f44817098..ee78d136c 100644 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/impl/name/DateBizName.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/name/DateBizName.java @@ -1,7 +1,7 @@ -package com.pig4cloud.common.sequence.range.impl.name; +package com.pig4cloud.pigx.common.sequence.range.impl.name; import cn.hutool.core.date.DateUtil; -import com.pig4cloud.common.sequence.range.BizName; +import com.pig4cloud.pigx.common.sequence.range.BizName; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/impl/name/DefaultBizName.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/name/DefaultBizName.java similarity index 72% rename from pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/impl/name/DefaultBizName.java rename to pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/name/DefaultBizName.java index c77b11555..3c7e160c3 100644 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/impl/name/DefaultBizName.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/name/DefaultBizName.java @@ -1,6 +1,6 @@ -package com.pig4cloud.common.sequence.range.impl.name; +package com.pig4cloud.pigx.common.sequence.range.impl.name; -import com.pig4cloud.common.sequence.range.BizName; +import com.pig4cloud.pigx.common.sequence.range.BizName; import lombok.AllArgsConstructor; /** diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/impl/redis/RedisSeqRangeMgr.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/redis/RedisSeqRangeMgr.java similarity index 90% rename from pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/impl/redis/RedisSeqRangeMgr.java rename to pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/redis/RedisSeqRangeMgr.java index e69cbe262..38bc4d48c 100755 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/range/impl/redis/RedisSeqRangeMgr.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/redis/RedisSeqRangeMgr.java @@ -1,9 +1,9 @@ -package com.pig4cloud.common.sequence.range.impl.redis; +package com.pig4cloud.pigx.common.sequence.range.impl.redis; import cn.hutool.core.util.StrUtil; -import com.pig4cloud.common.sequence.exception.SeqException; -import com.pig4cloud.common.sequence.range.SeqRange; -import com.pig4cloud.common.sequence.range.SeqRangeMgr; +import com.pig4cloud.pigx.common.sequence.exception.SeqException; +import com.pig4cloud.pigx.common.sequence.range.SeqRange; +import com.pig4cloud.pigx.common.sequence.range.SeqRangeMgr; import redis.clients.jedis.Jedis; /** diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/sequence/RangeSequence.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/sequence/RangeSequence.java similarity index 67% rename from pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/sequence/RangeSequence.java rename to pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/sequence/RangeSequence.java index 7eaa28d6f..a1576830b 100755 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/sequence/RangeSequence.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/sequence/RangeSequence.java @@ -1,8 +1,8 @@ -package com.pig4cloud.common.sequence.sequence; +package com.pig4cloud.pigx.common.sequence.sequence; -import com.pig4cloud.common.sequence.range.BizName; -import com.pig4cloud.common.sequence.range.SeqRangeMgr; +import com.pig4cloud.pigx.common.sequence.range.BizName; +import com.pig4cloud.pigx.common.sequence.range.SeqRangeMgr; /** * 序列号区间生成器接口 diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/sequence/Sequence.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/sequence/Sequence.java similarity index 76% rename from pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/sequence/Sequence.java rename to pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/sequence/Sequence.java index 6dc7a8b1e..63594bf6f 100755 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/sequence/Sequence.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/sequence/Sequence.java @@ -1,7 +1,7 @@ -package com.pig4cloud.common.sequence.sequence; +package com.pig4cloud.pigx.common.sequence.sequence; -import com.pig4cloud.common.sequence.exception.SeqException; +import com.pig4cloud.pigx.common.sequence.exception.SeqException; /** * 序列号生成器接口 diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/sequence/impl/DefaultRangeSequence.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/sequence/impl/DefaultRangeSequence.java similarity index 84% rename from pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/sequence/impl/DefaultRangeSequence.java rename to pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/sequence/impl/DefaultRangeSequence.java index 7ef109b5e..f272335e3 100755 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/sequence/impl/DefaultRangeSequence.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/sequence/impl/DefaultRangeSequence.java @@ -1,13 +1,13 @@ -package com.pig4cloud.common.sequence.sequence.impl; +package com.pig4cloud.pigx.common.sequence.sequence.impl; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; -import com.pig4cloud.common.sequence.exception.SeqException; -import com.pig4cloud.common.sequence.range.BizName; -import com.pig4cloud.common.sequence.range.SeqRange; -import com.pig4cloud.common.sequence.range.SeqRangeMgr; -import com.pig4cloud.common.sequence.sequence.RangeSequence; +import com.pig4cloud.pigx.common.sequence.exception.SeqException; +import com.pig4cloud.pigx.common.sequence.range.BizName; +import com.pig4cloud.pigx.common.sequence.range.SeqRange; +import com.pig4cloud.pigx.common.sequence.range.SeqRangeMgr; +import com.pig4cloud.pigx.common.sequence.sequence.RangeSequence; import java.util.Date; import java.util.concurrent.locks.Lock; diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/sequence/impl/SnowflakeSequence.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/sequence/impl/SnowflakeSequence.java similarity index 95% rename from pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/sequence/impl/SnowflakeSequence.java rename to pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/sequence/impl/SnowflakeSequence.java index 9aedfbecc..d2355cb1d 100755 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/common/sequence/sequence/impl/SnowflakeSequence.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/sequence/impl/SnowflakeSequence.java @@ -1,8 +1,8 @@ -package com.pig4cloud.common.sequence.sequence.impl; +package com.pig4cloud.pigx.common.sequence.sequence.impl; -import com.pig4cloud.common.sequence.exception.SeqException; -import com.pig4cloud.common.sequence.sequence.Sequence; +import com.pig4cloud.pigx.common.sequence.exception.SeqException; +import com.pig4cloud.pigx.common.sequence.sequence.Sequence; /** * 使用雪花算法 diff --git a/pigx-common/pigx-common-sequence/src/main/resources/META-INF/spring.factories b/pigx-common/pigx-common-sequence/src/main/resources/META-INF/spring.factories index 80446dc9b..33ba602f0 100755 --- a/pigx-common/pigx-common-sequence/src/main/resources/META-INF/spring.factories +++ b/pigx-common/pigx-common-sequence/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.pig4cloud.common.sequence.SequenceAutoConfiguration \ No newline at end of file + com.pig4cloud.pigx.common.sequence.SequenceAutoConfiguration \ No newline at end of file diff --git a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/config/SequenceConfig.java b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/config/SequenceConfig.java index fed0964f2..f8ad87ada 100644 --- a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/config/SequenceConfig.java +++ b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/config/SequenceConfig.java @@ -1,9 +1,9 @@ package com.pig4cloud.pigx.pay.config; import cn.hutool.core.date.DateUtil; -import com.pig4cloud.common.sequence.builder.DbSeqBuilder; -import com.pig4cloud.common.sequence.properties.SequenceDbProperties; -import com.pig4cloud.common.sequence.sequence.Sequence; +import com.pig4cloud.pigx.common.sequence.builder.DbSeqBuilder; +import com.pig4cloud.pigx.common.sequence.properties.SequenceDbProperties; +import com.pig4cloud.pigx.common.sequence.sequence.Sequence; import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AbstractPayOrderHandler.java b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AbstractPayOrderHandler.java index 8339ac738..ceea5d3a4 100644 --- a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AbstractPayOrderHandler.java +++ b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AbstractPayOrderHandler.java @@ -17,7 +17,7 @@ package com.pig4cloud.pigx.pay.handler.impl; -import com.pig4cloud.common.sequence.sequence.Sequence; +import com.pig4cloud.pigx.common.sequence.sequence.Sequence; import com.pig4cloud.pigx.pay.entity.PayGoodsOrder; import com.pig4cloud.pigx.pay.entity.PayTradeOrder; import com.pig4cloud.pigx.pay.handler.PayOrderHandler;