Skip to content

Commit 4700a63

Browse files
committed
fix bug.
1 parent aaf00a1 commit 4700a63

4 files changed

Lines changed: 4 additions & 88 deletions

File tree

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

Lines changed: 0 additions & 66 deletions
This file was deleted.

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
public abstract class IdGenInit {
1313

1414
public static void applySnowFlakeIdGen(int machineLen, int machineId) {
15-
RandomUtils.init(new DefaultIdGen(machineLen, 12, machineId));
15+
SnowFlakeGenerator.Factory factory = new SnowFlakeGenerator.Factory(machineLen, 0);
16+
SnowFlakeGenerator snowFlakeGenerator = factory.create(0, machineId);
17+
RandomUtils.init(snowFlakeGenerator::nextId);
1618
}
1719
}

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
import java.util.Objects;
1919
import java.util.UUID;
20-
import java.util.concurrent.ExecutorService;
21-
import java.util.concurrent.Executors;
2220

2321
/**
2422
* @author lorne 2018/12/2
@@ -45,22 +43,4 @@ public static String randomKey() {
4543
public static String simpleKey() {
4644
return String.valueOf(System.nanoTime());
4745
}
48-
49-
static volatile String last = "";
50-
51-
public static void main(String[] args) {
52-
IdGenInit.applySnowFlakeIdGen(10, 1);
53-
System.out.println(randomKey());
54-
55-
ExecutorService executorService = Executors.newFixedThreadPool(20);
56-
for (int i = 0; i < 100; i++) {
57-
executorService.submit(() -> {
58-
String now = randomKey();
59-
if (now.equals(last)) {
60-
System.out.println("error");
61-
}
62-
last = now;
63-
});
64-
}
65-
}
6646
}

txlcn-tm/src/main/java/com/codingapi/txlcn/tm/config/TxManagerConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public TxManagerConfig(ServerProperties serverProperties) {
9393
/**
9494
* 机器ID长度
9595
*/
96-
private int machineIdLen = 20;
96+
private int machineIdLen = 10;
9797

9898
public long getDtxLockTime() {
9999
return dtxLockTime == -1 ? dtxTime : dtxLockTime;

0 commit comments

Comments
 (0)