fix:ID GEN;

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/IDGenerator.java

@@ -2,13 +2,13 @@ package com.liquidnet.commons.lang.util;
 
 import java.net.NetworkInterface;
 import java.net.SocketException;
-import java.util.Arrays;
 import java.util.Enumeration;
 
 public class IDGenerator {
-    private static final long twepoch = 1605456000000L;
-    private static final long workerIdBits = 5L;
-    private static final long dataCenterIdBits = 5L;
+    private static final long twepoch = 1624118400000L;
+//    private static final long twepoch = 961421243000L;
+    private static final long workerIdBits = 2L;
+    private static final long dataCenterIdBits = 1L;
     //// 最大支持机器节点数0~31，一共32个
     // 最大支持数据中心节点数0~31，一共32个
     @SuppressWarnings({"PointlessBitwiseExpression", "FieldCanBeLocal"})
@@ -40,7 +40,7 @@ public class IDGenerator {
 
     /* ---------------------------------------------------------------------------------------- */
 
-    public static synchronized Long nextSnowId() {
+    public static synchronized String nextSnowId() {
         long timestamp = genTime();
         if (timestamp < lastTimestamp) {
             if (lastTimestamp - timestamp < 2000) {
@@ -63,7 +63,10 @@ public class IDGenerator {
 
         lastTimestamp = timestamp;
 
-        return ((timestamp - twepoch) << timestampLeftShift) | (dataCenterId << dataCenterIdShift) | (workerId << workerIdShift) | sequence;
+        long l = ((timestamp - twepoch) << timestampLeftShift) | (dataCenterId << dataCenterIdShift) | (workerId << workerIdShift) | sequence;
+
+//        return l;
+        return l + ("" + System.nanoTime()).substring(9);
     }
 
     /**