From d463bd828238d4d293b2a8df2d2240a9e2e1f89b Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 3 Apr 2025 11:05:22 +0800
Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E9=9B=86=E7=BE=A4=E5=A4=9A?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=20ID=20=E5=86=B2=E7=AA=81=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=85=8D=E7=BD=AE=E6=9C=BA=E5=99=A8=20ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/dataease/utils/IDUtils.java   | 11 ++++++++++-
 .../src/main/java/io/dataease/utils/SnowFlake.java | 14 ++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

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
      *