From 31980c80bbd5f47e2ed52de0d228e26cc4c1154b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Wed, 27 Sep 2023 10:11:48 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Infrastructure/Model/ApiResult.cs             | 24 +++++++------------
 .../Controllers/System/SysRoleController.cs   |  4 ++--
 .../Filters/ActionPermissionFilter.cs         |  3 ++-
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/Infrastructure/Model/ApiResult.cs b/Infrastructure/Model/ApiResult.cs
index eb675cc..dd4b675 100644
--- a/Infrastructure/Model/ApiResult.cs
+++ b/Infrastructure/Model/ApiResult.cs
@@ -1,26 +1,24 @@
 using Infrastructure.Constant;
-using Newtonsoft.Json;
 using System.Collections.Generic;
 
 namespace Infrastructure.Model
 {
     public class ApiResult : Dictionary<string, object>
     {
-        /** 状态码 */
+        /// <summary>
+        /// 状态码
+        /// </summary>
         public static readonly string CODE_TAG = "code";
 
-        /** 返回内容 */
+        /// <summary>
+        /// 返回内容
+        /// </summary>
         public static readonly string MSG_TAG = "msg";
 
-        /** 数据对象 */
-        public static readonly string DATA_TAG = "data";
-        //public int Code { get; set; }
-        //public string Msg { get; set; }
         /// <summary>
-        /// 如果data值为null，则忽略序列化将不会返回data字段
+        /// 数据对象
         /// </summary>
-        //[JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        //public object Data { get; set; }
+        public static readonly string DATA_TAG = "data";
 
         /// <summary>
         /// 初始化一个新创建的APIResult对象，使其表示一个空消息
@@ -55,6 +53,7 @@ namespace Infrastructure.Model
                 Add(DATA_TAG, data);
             }
         }
+
         /// <summary>
         /// 返回成功消息
         /// </summary>
@@ -125,9 +124,4 @@ namespace Infrastructure.Model
             return this;
         }
     }
-
-    public class ApiResult<T> : ApiResult
-    {
-        public T Result { get; set; }
-    }
 }
diff --git a/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs b/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs
index 35954c3..790a8d9 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs
@@ -168,7 +168,7 @@ namespace ZR.Admin.WebApi.Controllers.System
         /// <returns></returns>
         [Log(BusinessType = BusinessType.EXPORT, IsSaveResponseData = false, Title = "角色导出")]
         [HttpGet("export")]
-        //[ActionPermissionFilter(Permission = "system:role:export")]
+        [ActionPermissionFilter(Permission = "system:role:export")]
         public IActionResult Export()
         {
             var list = sysRoleService.SelectRoleAll();
@@ -184,7 +184,7 @@ namespace ZR.Admin.WebApi.Controllers.System
         /// <returns></returns>
         [Log(BusinessType = BusinessType.EXPORT, IsSaveResponseData = false, Title = "角色菜单导出")]
         [HttpGet("exportRoleMenu")]
-        [AllowAnonymous]
+        [ActionPermissionFilter(Permission = "system:role:export")]
         public IActionResult ExportRoleMenu(int roleId)
         {
             MenuQueryDto dto = new() { Status = "0", MenuTypeIds = "M,C,F" };
diff --git a/ZR.ServiceCore/Filters/ActionPermissionFilter.cs b/ZR.ServiceCore/Filters/ActionPermissionFilter.cs
index cff36f6..b6cec49 100644
--- a/ZR.ServiceCore/Filters/ActionPermissionFilter.cs
+++ b/ZR.ServiceCore/Filters/ActionPermissionFilter.cs
@@ -82,10 +82,11 @@ namespace ZR.ServiceCore.Middleware
                 if (!HasPermi && !Permission.Equals("common"))
                 {
                     logger.Info($"用户{info.UserName}没有权限访问{url}，当前权限[{Permission}]");
-                    JsonResult result = new(new ApiResult((int)ResultCode.FORBIDDEN, $"你当前没有权限[{Permission}]访问,请联系管理员", url))
+                    JsonResult result = new(new ApiResult((int)ResultCode.FORBIDDEN, $"你当前没有权限访问,请联系管理员", url))
                     {
                         ContentType = "application/json",
                     };
+                    context.HttpContext.Response.StatusCode = 403;
                     context.Result = result;
                 }
             }