فهرست منبع

😊 升级 `Furion v4.9.3` 版本,解决破坏性更改

百小僧 1 سال پیش
والد
کامیت
cb9c4a6585

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

@@ -20,9 +20,9 @@
     <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="6.0.15" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.13.12" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.2.42" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.2.42" />
-    <PackageReference Include="Furion.Pure" Version="4.9.2.42" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.3" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.3" />
+    <PackageReference Include="Furion.Pure" Version="4.9.3" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="IPTools.International" Version="1.6.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.6" />

+ 11 - 0
Admin.NET/Admin.NET.Core/Util/AdminResultProvider.cs

@@ -12,6 +12,17 @@ namespace Admin.NET.Core;
 [UnifyModel(typeof(AdminResult<>))]
 public class AdminResultProvider : IUnifyResultProvider
 {
+    /// <summary>
+    /// JWT 授权异常返回值
+    /// </summary>
+    /// <param name="context"></param>
+    /// <param name="metadata"></param>
+    /// <returns></returns>
+    public IActionResult OnAuthorizeException(DefaultHttpContext context, ExceptionMetadata metadata)
+    {
+        return new JsonResult(RESTfulResult(metadata.StatusCode, data: metadata.Data, errors: metadata.Errors), UnifyContext.GetSerializerSettings(context));
+    }
+
     /// <summary>
     /// 异常返回值
     /// </summary>

+ 2 - 1
Admin.NET/Admin.NET.Web.Core/Handlers/JwtHandler.cs

@@ -30,8 +30,9 @@ namespace Admin.NET.Web.Core
         /// 自动刷新Token
         /// </summary>
         /// <param name="context"></param>
+        /// <param name="httpContext"></param>
         /// <returns></returns>
-        public override async Task HandleAsync(AuthorizationHandlerContext context)
+        public override async Task HandleAsync(AuthorizationHandlerContext context, DefaultHttpContext httpContext)
         {
             // var serviceProvider = context.GetCurrentHttpContext().RequestServices;
             using var serviceScope = _serviceProvider.CreateScope();

+ 11 - 0
Admin.NET/Plugins/Admin.NET.Plugin.GoView/Util/GoViewResultProvider.cs

@@ -12,6 +12,17 @@ namespace Admin.NET.Plugin.GoView;
 [UnifyModel(typeof(GoViewResult<>))]
 public class GoViewResultProvider : IUnifyResultProvider
 {
+    /// <summary>
+    /// JWT 授权异常返回值
+    /// </summary>
+    /// <param name="context"></param>
+    /// <param name="metadata"></param>
+    /// <returns></returns>
+    public IActionResult OnAuthorizeException(DefaultHttpContext context, ExceptionMetadata metadata)
+    {
+        return new JsonResult(RESTfulResult(metadata.StatusCode, data: metadata.Data, errors: metadata.Errors));
+    }
+
     /// <summary>
     /// 异常返回值
     /// </summary>