From 09c45c4ba46acf610b5999b4f2f6ff4647238a7b 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: Fri, 18 Aug 2023 07:09:11 +0800 Subject: [PATCH] =?UTF-8?q?:zap:Action=E6=96=B0=E5=A2=9E=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs b/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs index 09fe303..85167be 100644 --- a/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs +++ b/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs @@ -1,6 +1,4 @@ -using Infrastructure; -using Infrastructure.Model; -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using ZR.Model.System.Dto; @@ -17,8 +15,11 @@ namespace ZR.Admin.WebApi.Filters /// 权限字符串，例如 system:user:view /// public string Permission { get; set; } = string.Empty; + /// + /// 角色字符串，例如 common,admin + /// + public string RolePermi { get; set; } = string.Empty; private bool HasPermi { get; set; } - private bool HasRole { get; set; } public ActionPermissionFilter() { } public ActionPermissionFilter(string permission) { @@ -52,7 +53,10 @@ namespace ZR.Admin.WebApi.Filters { HasPermi = perms.Exists(f => f.ToLower() == Permission.ToLower()); } - + if (!HasPermi && !string.IsNullOrEmpty(RolePermi)) + { + HasPermi = info.RoleIds.Contains(RolePermi); + } bool isDemoMode = AppSettings.GetAppConfig("DemoMode", false); var url = context.HttpContext.Request.Path; //演示公开环境屏蔽权限