diff --git a/sdk/common/src/main/java/io/dataease/utils/IDUtils.java b/sdk/common/src/main/java/io/dataease/utils/IDUtils.java index e362279d63..23883327bb 100644 --- a/sdk/common/src/main/java/io/dataease/utils/IDUtils.java +++ b/sdk/common/src/main/java/io/dataease/utils/IDUtils.java @@ -1,12 +1,21 @@ package io.dataease.utils; +import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.RandomStringUtils; +import org.springframework.stereotype.Component; +@Component public class IDUtils { - private static SnowFlake snowFlake = new SnowFlake(1, 1); + + private static SnowFlake snowFlake; + + @Resource + public void setSnowFlake(SnowFlake snowFlake) { + IDUtils.snowFlake = snowFlake; + } public static String randomID(Integer num) { num = ObjectUtils.isEmpty(num) ? 16 : num; diff --git a/sdk/common/src/main/java/io/dataease/utils/SnowFlake.java b/sdk/common/src/main/java/io/dataease/utils/SnowFlake.java index 4d0b44e22f..4529423787 100644 --- a/sdk/common/src/main/java/io/dataease/utils/SnowFlake.java +++ b/sdk/common/src/main/java/io/dataease/utils/SnowFlake.java @@ -1,7 +1,17 @@ package io.dataease.utils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +@Component public class SnowFlake { + + @Value("${dataease.machine-id:1}") + public void setMachineId(long machineId) { + this.machineId = machineId; + } + /** * 起始的时间戳 */ @@ -44,6 +54,10 @@ public class SnowFlake { this.machineId = machineId; } + public SnowFlake() { + this.datacenterId = 1; + } + /** * 产生下一个ID *