更新seq到1.7.2

lib/seq-1.7.2-pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.yanghuanglin</groupId>
     <artifactId>seq</artifactId>
-    <version>1.1.0</version>
+    <version>1.7.2</version>
     <name>seq</name>
     <description>seq</description>
     <properties>
@@ -21,12 +21,6 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>8.0.28</version>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

pom.xml

@@ -39,7 +39,7 @@
         <dependency>
             <groupId>com.yanghuanglin</groupId>
             <artifactId>seq</artifactId>
-            <version>1.1.0</version>
+            <version>1.7.2</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework</groupId>
@@ -92,13 +92,13 @@
                             <goal>install-file</goal>
                         </goals>
                         <configuration>
-                            <file>${project.basedir}/lib/seq-1.1.0.jar</file>
+                            <file>${project.basedir}/lib/seq-1.7.2.jar</file>
-                            <pomFile>${pom.basedir}/lib/seq-1.1.0-pom.xml</pomFile>
+                            <pomFile>${project.basedir}/lib/seq-1.7.2-pom.xml</pomFile>
-                            <sources>${project.basedir}/lib/seq-1.1.0-sources.jar</sources>
+                            <sources>${project.basedir}/lib/seq-1.7.2-sources.jar</sources>
                             <repositoryLayout>default</repositoryLayout>
                             <groupId>com.yanghuanglin</groupId>
                             <artifactId>seq</artifactId>
-                            <version>1.1.0</version>
+                            <version>1.7.2</version>
                             <packaging>jar</packaging>
                             <generatePom>true</generatePom>
                         </configuration>

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;
 
@@ -24,19 +25,24 @@ public class SeqGeneratorConfig {
         tableConfig.setTable("sequences");
         tableConfig.setKeyColumn("SEQUENCE_KEY");
         tableConfig.setTypeColumn("SEQUENCE_TYPE");
-        tableConfig.setSeqColumn("NEXT_ID");
+        tableConfig.setSeqColumn("CURRENT");
         return tableConfig;
     }
 
+    @DependsOn("tableConfig")
     @Bean
     public GeneratorConfig generatorConfig(TableConfig tableConfig) {
         GeneratorConfig generatorConfig = new GeneratorConfig();
         generatorConfig.setJdbcTemplate(jdbcTemplate);
         generatorConfig.setTransactionTemplate(transactionTemplate);
         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);

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#");
+                String formattedSeq = generator.format(sequences.getSeq(), "处〔#year#〕10801#seq#");
-                if(finalI %5==4)
-                    System.out.println(3/0);
                 generator.lock(sequences);
                 set.add(formattedSeq);
                 System.out.println(formattedSeq);