From ea5dedd06d5cf98f9083bf9efc974239442106dc Mon Sep 17 00:00:00 2001
From: shiningrise <shiningrise@qq.com>
Date: Wed, 25 Dec 2024 10:16:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=9B=AA=E8=8A=B1=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin.NET.Core/Extension/YitIdHelperExtension.cs  |  8 ++++++++
 Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs    | 11 ++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Admin.NET/Admin.NET.Core/Extension/YitIdHelperExtension.cs b/Admin.NET/Admin.NET.Core/Extension/YitIdHelperExtension.cs
index d2f8b831..403498b7 100644
--- a/Admin.NET/Admin.NET.Core/Extension/YitIdHelperExtension.cs
+++ b/Admin.NET/Admin.NET.Core/Extension/YitIdHelperExtension.cs
@@ -19,6 +19,14 @@ public static class YitIdHelperExtension
 
     public static void AddYitIdHelper(this IServiceCollection services, SnowIdOptions options)
     {
+        if (App.GetConfig<CacheOptions>("Cache", true).CacheType == CacheTypeEnum.Memory.ToString())
+        {
+            YitIdHelper.SetIdGenerator(options);
+            SnowFlakeSingle.WorkId = options.WorkerId;
+            Console.WriteLine($"###########当前应用WorkId:【{options.WorkerId}】###########");
+            return;
+        }
+
         _options = options;
 
         // 排除开发环境和Windows服务器
diff --git a/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs b/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs
index 46c110d2..6ac5d636 100644
--- a/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs
+++ b/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs
@@ -22,15 +22,8 @@ public static class SqlSugarSetup
     {
         // 注册雪花Id
         var snowIdOpt = App.GetConfig<SnowIdOptions>("SnowId", true);
-        if (App.GetConfig<CacheOptions>("Cache", true).CacheType == CacheTypeEnum.Memory.ToString())
-        {
-            YitIdHelper.SetIdGenerator(snowIdOpt);
-            SnowFlakeSingle.WorkId = snowIdOpt.WorkerId;
-        }
-        else
-        {
-            services.AddYitIdHelper(snowIdOpt);
-        }
+
+        services.AddYitIdHelper(snowIdOpt);
 
         StaticConfig.CustomSnowFlakeFunc = () =>
         {