xiongzhu hace 3 años
padre
commit
03fdbeb8a5

+ 1 - 1
libs/org/libjpegturbo/mozjpeg4j/maven-metadata-local.xml

@@ -7,6 +7,6 @@
     <versions>
       <version>1.1</version>
     </versions>
-    <lastUpdated>20211106131217</lastUpdated>
+    <lastUpdated>20220331162415</lastUpdated>
   </versioning>
 </metadata>

+ 1 - 1
libs/org/pngquant/pngquant4j/maven-metadata-local.xml

@@ -7,6 +7,6 @@
     <versions>
       <version>1.0.1</version>
     </versions>
-    <lastUpdated>20211106131218</lastUpdated>
+    <lastUpdated>20220331162425</lastUpdated>
   </versioning>
 </metadata>

+ 14 - 1
src/main/java/com/izouma/nineth/config/SnowflakeIdWorkerConfig.java

@@ -5,12 +5,25 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import java.net.InetAddress;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 @Configuration
 @Slf4j
 public class SnowflakeIdWorkerConfig {
     @Bean
     public SnowflakeIdWorker snowflakeIdWorker(GeneralProperties generalProperties) {
-        log.info("init snowflakeIdWorker worker={} dataCenter={}", generalProperties.getWorkerId(), generalProperties.getDataCenterId());
+        int workerId = generalProperties.getWorkerId();
+        try {
+            String hostName = InetAddress.getLocalHost().getHostName();
+            Matcher matcher = Pattern.compile("raex-server-(?<num>\\d{3})").matcher(hostName);
+            if (matcher.matches()) {
+                workerId = Integer.parseInt(matcher.group("num"));
+            }
+        } catch (Exception e) {
+        }
+        log.info("init snowflakeIdWorker worker={} dataCenter={}", workerId, generalProperties.getDataCenterId());
         return new SnowflakeIdWorker(generalProperties.getWorkerId(), generalProperties.getDataCenterId());
     }
 }

+ 1 - 0
src/test/java/com/izouma/nineth/CommonTest.java

@@ -71,6 +71,7 @@ import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ForkJoinPool;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.IntStream;