Bläddra i källkod

😁1、增加雪花ID分布式部署时机器码处理 2、优化数据库配置连接初始化

zuohuaijun 2 år sedan
förälder
incheckning
bd00a3a533

+ 2 - 1
Admin.NET/Admin.NET.Core/Option/DbConnectionOptions.cs

@@ -28,7 +28,8 @@ public sealed class DbConnectionOptions : IConfigurableOptions<DbConnectionOptio
     {
         foreach (var dbConfig in options.ConnectionConfigs)
         {
-            dbConfig.ConfigId ??= SqlSugarConst.MainConfigId;
+            if (string.IsNullOrWhiteSpace(dbConfig.ConfigId))
+                dbConfig.ConfigId = SqlSugarConst.MainConfigId;
         }
     }
 }

+ 6 - 5
Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs

@@ -17,12 +17,13 @@ public static class SqlSugarSetup
     /// <param name="services"></param>
     public static void AddSqlSugar(this IServiceCollection services)
     {
-        // 注册雪花Id
-        var snowIdOpt = App.GetConfig<SnowIdOptions>("SnowId", true);
-        YitIdHelper.SetIdGenerator(snowIdOpt);
+        //// 注册雪花Id
+        //var snowIdOpt = App.GetConfig<SnowIdOptions>("SnowId", true);
+        //YitIdHelper.SetIdGenerator(snowIdOpt);
 
-        //// 注册雪花Id-支持分布式
-        //services.AddYitIdHelper(snowIdOpt);
+        // 注册雪花Id-支持分布式
+        var snowIdOpt = App.GetConfig<SnowIdOptions>("SnowId", true);
+        services.AddYitIdHelper(snowIdOpt);
 
         // 自定义 SqlSugar 雪花ID算法
         SnowFlakeSingle.WorkId = snowIdOpt.WorkerId;

+ 0 - 4
Admin.NET/Admin.NET.Web.Core/Startup.cs

@@ -146,10 +146,6 @@ public class Startup : AppStartup
 
         // 控制台logo
         services.AddConsoleLogo();
-
-        // 设置机器码
-        var snowOpt = App.GetConfig<SnowIdOptions>("SnowId", true);
-        services.AddYitIdHelper(snowOpt);
     }
 
     public void Configure(IApplicationBuilder app, IWebHostEnvironment env)