Bläddra i källkod

升级Furion v4.5.6 恢复App.GetOption<TOptions>()的使用

zuohuaijun 3 år sedan
förälder
incheckning
c572899f76

+ 3 - 3
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -24,9 +24,9 @@
 
   <ItemGroup>
     <PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.5.5" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.5.5" />
-    <PackageReference Include="Furion.Pure" Version="4.5.5" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.5.6" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.5.6" />
+    <PackageReference Include="Furion.Pure" Version="4.5.6" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.6.4" />
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.6.4" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.9" />

+ 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.GetConfig<DbConnectionOptions>("DbConnection", true);
+        var dbOptions = App.GetOptions<DbConnectionOptions>();
         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.GetConfig<OSSProviderOptions>("OSSProvider", true);
+        var ossOpt = App.GetOptions<OSSProviderOptions>();
         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.GetConfig<EmailOptions>("Email", true));
+            options.UseMailKit(App.GetOptions<EmailOptions>());
         });
 
         // 模板引擎
@@ -156,7 +156,7 @@ public class Startup : AppStartup
         // 配置雪花Id算法机器码
         YitIdHelper.SetIdGenerator(new IdGeneratorOptions
         {
-            WorkerId = App.GetConfig<SnowIdOptions>("SnowId", true).WorkerId
+            WorkerId = App.GetOptions<SnowIdOptions>().WorkerId
         });
     }