From cbab0b0c682d3ebbd94db7d00413d7e956ad23ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=80=80=E5=AE=87?= <312904176@qq.com>
Date: Wed, 2 Apr 2025 17:14:48 +0800
Subject: [PATCH 1/4] =?UTF-8?q?[ohscript]=20=E4=BF=AE=E6=94=B9ohscript?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E9=9A=8F=E6=9C=BAuuid=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/modelengine/fit/ohscript/util/Tool.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/ohscript/src/main/java/modelengine/fit/ohscript/util/Tool.java b/framework/ohscript/src/main/java/modelengine/fit/ohscript/util/Tool.java
index 83443e7c..a8c7f0fb 100644
--- a/framework/ohscript/src/main/java/modelengine/fit/ohscript/util/Tool.java
+++ b/framework/ohscript/src/main/java/modelengine/fit/ohscript/util/Tool.java
@@ -96,7 +96,7 @@ public static void grammarError(String info) {
      * @return 返回生成的UUID
      */
     public static String uuid() {
-        return UUIDUtil.fastUuid();
+        return String.valueOf(newId());
     }
 
     /**

From 4c6b221d588695c365dbfa3ef90ef459db53f96f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=80=80=E5=AE=87?= <312904176@qq.com>
Date: Wed, 9 Apr 2025 10:52:11 +0800
Subject: [PATCH 2/4] =?UTF-8?q?[ohscript]=20=E5=8E=BB=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E6=95=88=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/modelengine/fit/ohscript/util/Tool.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/ohscript/src/main/java/modelengine/fit/ohscript/util/Tool.java b/framework/ohscript/src/main/java/modelengine/fit/ohscript/util/Tool.java
index a8c7f0fb..551222fc 100644
--- a/framework/ohscript/src/main/java/modelengine/fit/ohscript/util/Tool.java
+++ b/framework/ohscript/src/main/java/modelengine/fit/ohscript/util/Tool.java
@@ -36,7 +36,7 @@
  * @since 1.0
  */
 public class Tool {
-    private static AtomicLong id = new AtomicLong(1); // remove static
+    private static AtomicLong id = new AtomicLong(1);
 
     /**
      * 打印警告信息

From 86d1fce58e3ddb7ce8584d2a060901280c90282f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=80=80=E5=AE=87?= <312904176@qq.com>
Date: Wed, 9 Apr 2025 11:20:36 +0800
Subject: [PATCH 3/4] =?UTF-8?q?[ohscript]=20=E4=BC=98=E5=8C=96=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96id=E9=94=81=E7=B2=92=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/modelengine/fit/ohscript/util/Tool.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/framework/ohscript/src/main/java/modelengine/fit/ohscript/util/Tool.java b/framework/ohscript/src/main/java/modelengine/fit/ohscript/util/Tool.java
index 551222fc..bea2aeae 100644
--- a/framework/ohscript/src/main/java/modelengine/fit/ohscript/util/Tool.java
+++ b/framework/ohscript/src/main/java/modelengine/fit/ohscript/util/Tool.java
@@ -16,6 +16,7 @@
 import modelengine.fit.ohscript.script.parser.nodes.FunctionDeclareNode;
 import modelengine.fit.ohscript.script.semanticanalyzer.type.expressions.TypeExprFactory;
 import modelengine.fitframework.beans.ObjectInstantiator;
+import modelengine.fitframework.util.LockUtils;
 import modelengine.fitframework.util.ObjectUtils;
 
 import net.bytebuddy.ByteBuddy;
@@ -38,6 +39,8 @@
 public class Tool {
     private static AtomicLong id = new AtomicLong(1);
 
+    private static final Object lock = LockUtils.newSynchronizedLock();
+
     /**
      * 打印警告信息
      *
@@ -73,9 +76,11 @@ protected static void setId(long value) {
     /**
      * 初始化id，只有在id为非正数时生效
      */
-    private static synchronized void initId() {
-        if (id.get() <= 0) {
-            setId(1);
+    private static void initId() {
+        synchronized (lock) {
+            if (id.get() <= 0) {
+                setId(1);
+            }
         }
     }
 

From 6b7daee6ac58b6e2313d7f43b170fe5311103d9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=80=80=E5=AE=87?= <312904176@qq.com>
Date: Thu, 10 Apr 2025 19:44:47 +0800
Subject: [PATCH 4/4] =?UTF-8?q?[ohscript]=20=E4=BF=AE=E6=94=B9=E6=AA=A2?=
 =?UTF-8?q?=E8=A6=96=E6=84=8F=E8=A6=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/modelengine/fit/ohscript/util/Tool.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/ohscript/src/main/java/modelengine/fit/ohscript/util/Tool.java b/framework/ohscript/src/main/java/modelengine/fit/ohscript/util/Tool.java
index bea2aeae..e6abeae6 100644
--- a/framework/ohscript/src/main/java/modelengine/fit/ohscript/util/Tool.java
+++ b/framework/ohscript/src/main/java/modelengine/fit/ohscript/util/Tool.java
@@ -37,10 +37,10 @@
  * @since 1.0
  */
 public class Tool {
-    private static AtomicLong id = new AtomicLong(1);
-
     private static final Object lock = LockUtils.newSynchronizedLock();
 
+    private static AtomicLong id = new AtomicLong(1);
+
     /**
      * 打印警告信息
      *