Browse Source

主机未启动时App.GetOptions方法调整

zuohuaijun 4 năm trước cách đây
mục cha
commit
6724842fab

+ 2 - 2
Admin.NET/Admin.NET.Application/AppConfig.json

@@ -8,7 +8,7 @@
                 "ConfigId": "Dilon",
                 "DbType": "Sqlite", // MySql、SqlServer、Sqlite、Oracle、PostgreSQL、Dm、Kdbndp、Oscar、MySqlConnector、Access
                 "ConnectionString": "DataSource=./Admin.NET.db",
-                "EnableInitDb": true, // 启用库表初始化
+                "EnableInitDb": false, // 启用库表初始化
                 "EnableDiffLog": false // 启用库表差异日志
             },
             // 其他业务库
@@ -16,7 +16,7 @@
                 "ConfigId": "Test",
                 "DbType": "Sqlite",
                 "ConnectionString": "DataSource=./Test.db",
-                "EnableInitDb": true, // 启用库表初始化
+                "EnableInitDb": false, // 启用库表初始化
                 "EnableDiffLog": false // 启用库表差异日志
             }
         ]

+ 1 - 1
Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs

@@ -10,7 +10,7 @@ public static class SqlSugarSetup
     /// <param name="services"></param>
     public static void AddSqlSugar(this IServiceCollection services)
     {
-        var dbOptions = App.GetOptions<DbConnectionOptions>();
+        var dbOptions = App.GetConfig<DbConnectionOptions>("DbConnection", true);
         var configureExternalServices = new ConfigureExternalServices
         {
             EntityService = (type, column) => // 修改列可空-1、带?问号 2、String类型若没有Required

+ 3 - 3
Admin.NET/Admin.NET.Web.Core/Startup.cs

@@ -98,7 +98,7 @@ public class Startup : AppStartup
         });
 
         // OSS对象存储(必须一个个赋值)
-        var ossOpt = App.GetOptions<OSSProviderOptions>();
+        var ossOpt = App.GetConfig<OSSProviderOptions>("OSSProvider", true);
         services.AddOSSService(Enum.GetName(ossOpt.Provider), options =>
         {
             options.Provider = ossOpt.Provider;
@@ -113,7 +113,7 @@ public class Startup : AppStartup
         // 电子邮件
         services.AddMailKit(options =>
         {
-            options.UseMailKit(App.GetOptions<EmailOptions>());
+            options.UseMailKit(App.GetConfig<EmailOptions>("Email", true));
         });
 
         // 模板引擎
@@ -156,7 +156,7 @@ public class Startup : AppStartup
         // 配置雪花Id算法机器码
         YitIdHelper.SetIdGenerator(new IdGeneratorOptions
         {
-            WorkerId = App.GetOptions<SnowIdOptions>().WorkerId
+            WorkerId = App.GetConfig<SnowIdOptions>("SnowId", true).WorkerId
         });
     }