fix bug.

Author: ujued

txlcn-common/src/main/java/com/codingapi/txlcn/common/util/id/DefaultIdGen.java

@@ -25,11 +25,11 @@ public class DefaultIdGen implements IdGen {
      */
     private final static long START_STAMP = 1546272000000L;
 
-    public DefaultIdGen(int machineOffset, int sequenceOffset, int machineId) {
-        this.maxSequenceValue = ~(-1 << sequenceOffset);
-        this.timeOffset = 63 - machineOffset - sequenceOffset;
+    public DefaultIdGen(int machineLen, int sequenceLen, int machineId) {
+        this.maxSequenceValue = ~(-1 << sequenceLen);
+        this.machineOffset = sequenceLen;
+        this.timeOffset = machineOffset + machineLen;
         this.machineId = machineId;
-        this.machineOffset = machineOffset;
     }
 
     @Override

txlcn-common/src/main/java/com/codingapi/txlcn/common/util/id/RandomUtils.java

@@ -17,6 +17,8 @@
 
 import java.util.Objects;
 import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * @author lorne 2018/12/2
@@ -44,8 +46,21 @@ public static String simpleKey() {
         return String.valueOf(System.nanoTime());
     }
 
+    static volatile String last = "";
+
     public static void main(String[] args) {
         IdGenInit.applySnowFlakeIdGen(10, 1);
         System.out.println(randomKey());
+
+        ExecutorService executorService = Executors.newFixedThreadPool(20);
+        for (int i = 0; i < 100; i++) {
+            executorService.submit(() -> {
+                String now = randomKey();
+                if (now.equals(last)) {
+                    System.out.println("error");
+                }
+                last = now;
+            });
+        }
     }
 }

txlcn-tm/src/main/java/com/codingapi/txlcn/tm/txmsg/EnsureIdGenEngine.java

@@ -1,6 +1,8 @@
 package com.codingapi.txlcn.tm.txmsg;
 
 import com.codingapi.txlcn.common.runner.TxLcnInitializer;
+import com.codingapi.txlcn.common.util.ApplicationInformation;
+import com.codingapi.txlcn.common.util.Transactions;
 import com.codingapi.txlcn.common.util.id.IdGenInit;
 import com.codingapi.txlcn.logger.TxLogger;
 import com.codingapi.txlcn.tm.config.TxManagerConfig;
@@ -9,6 +11,8 @@
 import com.codingapi.txlcn.txmsg.listener.HeartbeatListener;
 import com.codingapi.txlcn.txmsg.listener.RpcConnectionListener;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.web.ServerProperties;
+import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.stereotype.Component;
 
 /**
@@ -26,11 +30,18 @@ public class EnsureIdGenEngine implements RpcConnectionListener, HeartbeatListen
 
     private final TxLogger txLogger;
 
+    private final ConfigurableEnvironment environment;
+
+    private final ServerProperties serverProperties;
+
     @Autowired
-    public EnsureIdGenEngine(ManagerService managerService, TxManagerConfig managerConfig, TxLogger txLogger) {
+    public EnsureIdGenEngine(ManagerService managerService, TxManagerConfig managerConfig, TxLogger txLogger,
+                             ConfigurableEnvironment environment, ServerProperties serverProperties) {
         this.managerService = managerService;
         this.managerConfig = managerConfig;
         this.txLogger = txLogger;
+        this.environment = environment;
+        this.serverProperties = serverProperties;
     }
 
     @Override
@@ -45,6 +56,8 @@ public void disconnect(String remoteKey, String appName) {
     @Override
     public void init() throws Exception {
         IdGenInit.applySnowFlakeIdGen(managerConfig.getMachineIdLen(), managerService.machineIdSync());
+
+        Transactions.setApplicationIdWhenRunning(ApplicationInformation.modId(environment, serverProperties));
     }
 
     @Override