Browse Source

😁1、组件注册顺序调整 2、升级Furion v4.9.1.26

zuohuaijun 2 years ago
parent
commit
7b25a49445

+ 1 - 0
Admin.NET/Admin.NET.Application/Configuration/App.json

@@ -29,6 +29,7 @@
     "DateTimeFormatCulture": "zh-CN" // 固定时间区域为特定时区(多语言)
   },
   "CorsAccessorSettings": {
+    // "WithOrigins": ["https://gitee.com"],
     "WithExposedHeaders": [ "Content-Disposition", "X-Pagination", "access-token", "x-access-token" ], // 如果前端不代理且是axios请求
     "SignalRSupport": true // 启用 SignalR 跨域支持
   },

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

@@ -21,9 +21,9 @@
     <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="6.0.15" />
     <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="6.0.15" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.1.25" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.1.25" />
-    <PackageReference Include="Furion.Pure" Version="4.9.1.25" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.1.26" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.1.26" />
+    <PackageReference Include="Furion.Pure" Version="4.9.1.26" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.6" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.5.1" />

+ 2 - 2
Admin.NET/Admin.NET.Core/OAuth/OAuthSetup.cs

@@ -29,8 +29,8 @@ public static class OAuthSetup
             })
             .AddCookie(options =>
             {
-                options.Cookie.SameSite = Microsoft.AspNetCore.Http.SameSiteMode.None;
-                options.Cookie.SecurePolicy = Microsoft.AspNetCore.Http.CookieSecurePolicy.Always;
+                options.Cookie.SameSite = SameSiteMode.None;
+                options.Cookie.SecurePolicy = CookieSecurePolicy.Always;
             })
             .AddWeixin(options =>
             {

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

@@ -155,19 +155,6 @@ public class Startup : AppStartup
             app.UseHsts();
         }
 
-        //// 启用HTTPS
-        //app.UseHttpsRedirection();
-
-        // 启用跨域
-        app.UseCorsAccessor();
-
-        // 启用鉴权授权
-        app.UseAuthentication();
-        app.UseAuthorization();
-
-        // 启用多语言,必须在路由注册之前
-        app.UseAppLocalization();
-
         // 特定文件类型(文件后缀)处理
         var contentTypeProvider = FS.GetFileExtensionContentTypeProvider();
         // contentTypeProvider.Mappings[".文件后缀"] = "MIME 类型";
@@ -176,12 +163,25 @@ public class Startup : AppStartup
             ContentTypeProvider = contentTypeProvider
         });
 
-        // 路由注册
-        app.UseRouting();
+        //// 启用HTTPS
+        //app.UseHttpsRedirection();
 
         // 添加状态码拦截中间件
         app.UseUnifyResultStatusCodes();
 
+        // 启用多语言,必须在 UseRouting 之前
+        app.UseAppLocalization();
+
+        // 路由注册
+        app.UseRouting();
+
+        // 启用跨域,必须在 UseRouting 和 UseAuthentication 之间注册
+        app.UseCorsAccessor();
+
+        // 启用鉴权授权
+        app.UseAuthentication();
+        app.UseAuthorization();
+
         // 图像处理
         app.UseImageSharp();