diff --git a/lib/seq-1.3.1-sources.jar b/lib/seq-1.3.1-sources.jar deleted file mode 100644 index bd5f930..0000000 Binary files a/lib/seq-1.3.1-sources.jar and /dev/null differ diff --git a/lib/seq-1.3.1.jar b/lib/seq-1.3.1.jar deleted file mode 100644 index d5fc26e..0000000 Binary files a/lib/seq-1.3.1.jar and /dev/null differ diff --git a/lib/seq-1.3.1-pom.xml b/lib/seq-1.4.1-pom.xml similarity index 98% rename from lib/seq-1.3.1-pom.xml rename to lib/seq-1.4.1-pom.xml index faca844..4e82545 100644 --- a/lib/seq-1.3.1-pom.xml +++ b/lib/seq-1.4.1-pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.yanghuanglin seq - 1.3.1 + 1.4.1 seq seq diff --git a/lib/seq-1.4.1-sources.jar b/lib/seq-1.4.1-sources.jar new file mode 100644 index 0000000..55ed658 Binary files /dev/null and b/lib/seq-1.4.1-sources.jar differ diff --git a/lib/seq-1.4.1.jar b/lib/seq-1.4.1.jar new file mode 100644 index 0000000..b41e509 Binary files /dev/null and b/lib/seq-1.4.1.jar differ diff --git a/pom.xml b/pom.xml index b51c072..250e9a8 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ com.yanghuanglin seq - 1.3.1 + 1.4.1 org.springframework @@ -92,13 +92,13 @@ install-file - ${project.basedir}/lib/seq-1.3.1.jar - ${pom.basedir}/lib/seq-1.3.1-pom.xml - ${project.basedir}/lib/seq-1.3.1-sources.jar + ${project.basedir}/lib/seq-1.4.1.jar + ${pom.basedir}/lib/seq-1.4.1-pom.xml + ${project.basedir}/lib/seq-1.4.1-sources.jar default com.yanghuanglin seq - 1.3.1 + 1.4.1 jar true diff --git a/src/main/java/com/yanghuanglin/springseq/config/SeqGeneratorConfig.java b/src/main/java/com/yanghuanglin/springseq/config/SeqGeneratorConfig.java index 4064b0d..cad44c2 100644 --- a/src/main/java/com/yanghuanglin/springseq/config/SeqGeneratorConfig.java +++ b/src/main/java/com/yanghuanglin/springseq/config/SeqGeneratorConfig.java @@ -6,6 +6,7 @@ import com.yanghuanglin.seq.generator.Generator; import com.yanghuanglin.seq.generator.impl.SequencesGenerator; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.DependsOn; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.transaction.support.TransactionTemplate; @@ -28,6 +29,7 @@ public class SeqGeneratorConfig { return tableConfig; } + @DependsOn("tableConfig") @Bean public GeneratorConfig generatorConfig(TableConfig tableConfig) { GeneratorConfig generatorConfig = new GeneratorConfig(); @@ -36,9 +38,11 @@ public class SeqGeneratorConfig { generatorConfig.setTableConfig(tableConfig); generatorConfig.setStep(1); generatorConfig.setType("MISSION"); + generatorConfig.setMinLength(6); return generatorConfig; } + @DependsOn("generatorConfig") @Bean public Generator generator(GeneratorConfig generatorConfig) { return new SequencesGenerator(generatorConfig); diff --git a/src/main/java/com/yanghuanglin/springseq/config/Startup.java b/src/main/java/com/yanghuanglin/springseq/config/Startup.java index 92028ae..682964c 100644 --- a/src/main/java/com/yanghuanglin/springseq/config/Startup.java +++ b/src/main/java/com/yanghuanglin/springseq/config/Startup.java @@ -27,12 +27,9 @@ public class Startup implements ApplicationRunner { //开启多线程进行测试 ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(50, 50, 1, TimeUnit.MINUTES, new ArrayBlockingQueue<>(1000)); for (int i = 0; i < 200; i++) { - int finalI = i; threadPoolExecutor.execute(() -> { Sequences sequences = generator.generate("SNT", "MISSION"); - String formattedSeq = generator.format(sequences.getSeq(), 5, "处〔#year#〕10801#seq#"); - if(finalI %5==4) - System.out.println(3/0); + String formattedSeq = generator.format(sequences.getSeq(), "处〔#year#〕10801#seq#"); generator.lock(sequences); set.add(formattedSeq); System.out.println(formattedSeq);