From 7e0844874edd4ed2287179725b1e4b4e7c520bbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= Date: Mon, 26 Jul 2021 17:28:50 +0000 Subject: [PATCH] =?UTF-8?q?!88=20=E4=BC=98=E5=8C=96RBAC=E5=8F=96=E5=80=BC?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=97=AE=E9=A2=98=20*=20Merge=20branch=20'de?= =?UTF-8?q?velop'=20into=20dahuihui/develop=20*=20=E3=80=90=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E3=80=91=E4=BC=98=E5=8C=96=E5=90=8E=E7=AB=AF=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=9D=83=E9=99=90=E8=A7=92=E8=89=B2=EF=BC=8C=E5=8F=8D?= =?UTF-8?q?=E5=B0=84controller=E5=92=8Caction=E7=9A=84=E6=95=88=E7=8E=87?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82=20*=20=E3=80=90=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=E5=90=8E=E7=AB=AF=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=95=86=E5=93=81=E9=97=AE=E9=A2=98=E3=80=82=20*=20=E3=80=90?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E3=80=91=E4=BF=AE=E5=A4=8D=E8=85=BE=E8=AE=AF?= =?UTF-8?q?=E4=BA=91cos=E5=AD=98=E5=82=A8=E6=9C=AA=E8=B0=83=E7=94=A8bucket?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82#I42DF0=20*=20Merge=20branch=20'deve?= =?UTF-8?q?lop'=20into=20dahuihui/develop=20*=20=E5=90=AF=E7=94=A8?= =?UTF-8?q?=E6=96=B0=E5=9F=9F=E5=90=8D=E5=8F=8A=E6=BC=94=E7=A4=BA=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=20*=20Merge=20branch=20'develop'=20into=20dahuihui/de?= =?UTF-8?q?velop=20*=20Merge=20branch=20'develop'=20into=20dahuihui/develo?= =?UTF-8?q?p=20*=20=E8=B0=83=E6=95=B4=E8=AF=B4=E6=98=8E=20*=20Merge=20bran?= =?UTF-8?q?ch=20'develop'=20into=20dahuihui/develop=20*=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=B8=8D=E9=9C=80=E8=A6=81=E7=9A=84=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=20*=20=E4=BF=AE=E5=A4=8D=E5=9F=9F=E5=90=8D=E8=BD=AC=E5=8F=91?= =?UTF-8?q?=E8=8E=B7=E5=8F=96ip=E5=9C=B0=E5=9D=80=E9=95=BF=E5=BA=A6?= =?UTF-8?q?=E8=BF=87=E9=95=BF=E9=97=AE=E9=A2=98=E3=80=82=20*=201=E3=80=81?= =?UTF-8?q?=E3=80=90=E5=90=8E=E7=AB=AF=E3=80=91=E8=B0=83=E6=95=B4=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E9=94=99=E8=AF=AF=E8=BF=94=E5=9B=9E=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=AF=AD=E3=80=822=E3=80=81=E3=80=90=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E3=80=91=E4=BF=AE=E5=A4=8D20=E6=97=A5=E5=88=A0?= =?UTF-8?q?=E9=99=A43=E4=B8=AA=E8=A1=A8=E5=90=8E=EF=BC=8C=E6=9C=AA?= =?UTF-8?q?=E6=B8=85=E7=90=86=E5=B9=B2=E5=87=80=E9=97=AE=E9=A2=98=E3=80=82?= =?UTF-8?q?=20*=20Merge=20branch=20'develop'=20into=20dahuihui/develop=20*?= =?UTF-8?q?=20Merge=20branch=20'develop'=20into=20dahuihui/develop=20*=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=85=A8=E5=B1=80=E9=94=99=E8=AF=AF=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=8F=90=E7=A4=BA=E8=AF=AD=20*=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=95=86=E5=93=81=E6=89=B9=E9=87=8F=E5=A4=84=E7=90=86=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=E5=B9=B6=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=95=8C=E9=9D=A2=E3=80=82#I3X8PP=20*=20Merg?= =?UTF-8?q?e=20branch=20'develop'=20into=20dahuihui/develop=20*=20Merge=20?= =?UTF-8?q?branch=20'develop'=20into=20dahuihui/develop=20*=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=BF=87=E6=BB=A4=E6=95=8F=E6=84=9F=E8=AF=8D=E7=9A=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E3=80=82#I3W6CM=20*=20=E5=A2=9E=E5=8A=A0Issu?= =?UTF-8?q?e=20=E5=92=8C=20Pull=20Request=20=E6=A8=A1=E6=9D=BF=20*=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A=E4=B9=89=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=B8=8A=E4=BC=A0=E8=87=B3=E7=AB=99=E7=82=B9?= =?UTF-8?q?=E6=A0=B9=E7=9B=AE=E5=BD=95=EF=BC=8C=E8=80=8C=E9=9D=9Ewwwroot?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20#I41TD1=20*=20Merge=20branch=20'd?= =?UTF-8?q?evelop'=20into=20dahuihui/develop=20*=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E4=B8=8A=E4=BC=A0=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E7=9A=84=E8=A1=A8=E5=8D=95=E5=91=BD=E5=90=8D=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20*=20=E4=BD=BF=E7=94=A8=E6=96=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=20*=20=E3=80=90=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8Dmysql=E6=95=B0=E6=8D=AE=E5=BA=93deci?= =?UTF-8?q?mal=E7=B1=BB=E5=9E=8B=E6=9C=AA=E5=B8=A6=E5=B0=8F=E6=95=B0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82#I3WAUY=20*=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=95=B0=E6=8D=AE=E5=BA=93=E5=8F=8A=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=20*=202021-07-20=20*=20Merge=20branch=20'develop'=20into=20dah?= =?UTF-8?q?uihui/develop=20*=20=E4=BF=AE=E5=A4=8Dwebapi=E4=B8=8D=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E8=B0=83=E8=AF=95=E6=96=AD=E7=82=B9=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82=20*=20Merge=20branch=20'develop'=20into=20da?= =?UTF-8?q?huihui/develop=20*=20=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E5=89=8D=E5=90=8E=E7=AB=AF=E5=88=86=E7=A6=BBtable=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E5=90=AF=E7=94=A8=E8=87=AA=E5=AE=9A=E4=B9=89=E5=9F=9F?= =?UTF-8?q?=E5=90=8D=E9=97=AE=E9=A2=98=E3=80=82=20*=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=89=8D=E5=90=8E=E7=AB=AF=E5=88=86=E7=A6=BB?= =?UTF-8?q?=E5=9F=9F=E5=90=8D=E6=9C=AA=E5=A2=9E=E5=8A=A0=E5=88=B0html?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82=20*=20Merge=20branch=20'develop'=20?= =?UTF-8?q?into=20dahuihui/develop=20*=20=E3=80=90=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9C=9F=E5=AE=9E=E5=A7=93=E5=90=8D=E9=95=BF?= =?UTF-8?q?=E5=BA=A6=E9=97=AE=E9=A2=98=E3=80=82=20*=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E9=85=8D=E9=80=81=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E7=BB=B4=E6=8A=A4=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20*=201=E3=80=81=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=97=AE=E9=A2=98=EF=BC=8C=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=E4=BA=8B=E6=83=85=E3=80=82=E4=B8=8D=E7=84=B6?= =?UTF-8?q?=E7=9B=9B=E6=B4=BE=E7=9A=84=E7=BB=84=E4=BB=B6=E6=9C=89bug?= =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E4=B8=8D=E6=B3=A8=E5=86=8C=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E5=8F=AA=E6=B3=A8=E5=86=8C=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=EF=BC=8C=E8=BF=9B=E8=A1=8C=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=93=8D=E4=BD=9C=EF=BC=8C=E9=BB=98=E8=AE=A4=E8=BF=98?= =?UTF-8?q?=E6=98=AF=E8=B5=B0=E7=9A=84=E6=98=AF=E5=BE=AE=E2=80=A6=20*=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF=E6=A8=A1=E6=9D=BF=E4=B8=8D?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E7=9A=84=E9=97=AE=E9=A2=98=20*=20Merge=20bra?= =?UTF-8?q?nch=20'develop'=20into=20dahuihui/develop=20*=20Merge=20branch?= =?UTF-8?q?=20'develop'=20into=20dahuihui/develop=20*=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=BF=87=E6=9C=9F=E5=A4=B1=E6=95=88=E6=96=87=E6=A1=A3=20*=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BA=8B?= =?UTF-8?q?=E5=8A=A1=20*=20=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3=E7=AB=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E7=95=8C=E9=9D=A2=20*=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E4=B8=8D=E5=B1=85=E4=B8=AD=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20*=20=E8=B0=83=E6=95=B4=E4=B8=80=E4=BA=9B=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=20*=20=E4=BF=AE=E5=A4=8Duni-app=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=EF=BC=8C=E7=94=A8=E6=88=B7=E8=AE=A2=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E3=80=90=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7=E3=80=91?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98=20*=201?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E5=A4=8Dmysql=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E4=B8=8B,=E6=8A=A5=E8=A1=A8=E7=BB=9F=E8=AE=A1sql=E7=9A=84?= =?UTF-8?q?=E8=AF=AD=E6=B3=95=E9=94=99=E8=AF=AF=E3=80=822=E3=80=81?= =?UTF-8?q?=E4=B8=BA=E6=96=B9=E4=BE=BF=E5=89=8D=E7=AB=AF=E5=9C=A8=E4=B8=8D?= =?UTF-8?q?=E9=83=A8=E7=BD=B2=E6=8E=A5=E5=8F=A3=E5=8F=8A=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E6=B5=8B=E8=AF=95uni-app?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BA=86=E6=B5=8B=E8=AF=95=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E2=80=A6=20*=20Merge=20branch=20'develop'=20into=20dahuihui/de?= =?UTF-8?q?velop=20*=20=E8=B0=83=E6=95=B4=E5=91=BD=E5=90=8D=20*=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0docker-compose=E9=83=A8=E7=BD=B2=20*=20Merge?= =?UTF-8?q?=20branch=20'develop'=20into=20dahuihui/develop=20*=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=9B=A0linux=E4=B8=8B=E5=AD=98=E5=9C=A8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=8E=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E5=86=99=E4=B8=8D=E5=AF=B9=E5=BA=94=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=89=BE=E4=B8=8D=E5=88=B0=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E7=89=B9=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E5=8F=91=E5=B8=83=E4=B8=80=E4=BB=BD=E8=A1=A8=E5=90=8D?= =?UTF-8?q?=E4=B8=8E=E5=AE=9E=E4=BD=93=E5=90=8D=E7=A7=B0=E4=B8=80=E4=B8=80?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E8=84=9A=E6=9C=AC=E3=80=82=20*=20=E6=96=B0my?= =?UTF-8?q?sql=E8=A1=A8=E5=90=8D=E5=AD=98=E5=9C=A8=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=E5=86=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AdminsControllerPermission.cs | 51 +++++++++++-------- .../wwwroot/views/good/goods/edit.html | 2 +- 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/CoreCms.Net.Filter/AdminsControllerPermission.cs b/CoreCms.Net.Filter/AdminsControllerPermission.cs index fca13b6..c22458d 100644 --- a/CoreCms.Net.Filter/AdminsControllerPermission.cs +++ b/CoreCms.Net.Filter/AdminsControllerPermission.cs @@ -31,9 +31,13 @@ namespace CoreCms.Net.Filter var types = Assembly.Load("CoreCms.Net.Web.Admin").GetTypes(); - foreach (var type in types) + + var noController = new[] { "ToolsController", "LoginController", "DemoController" }; + + var controllers = types.Where(p => p.Name.Contains("Controller") && !noController.Contains(p.Name)); + foreach (var type in controllers) { - if (type.Name.Length > 10 && type.BaseType.Name == "ControllerBase" && type.Name.EndsWith("Controller")) //如果是Controller + if (type.Name.Length > 10 && type.BaseType.Name == "Controller" && type.Name.EndsWith("Controller")) //如果是Controller { var members = type.GetMethods(); var cp = new ControllerPermission @@ -50,30 +54,37 @@ namespace CoreCms.Net.Filter cp.name += "【" + cp.description + "】"; } - foreach (var member in members) + + var newMembers = members.Where(p => + p.ReturnType.Name == "ActionResult" || p.ReturnType.Name == "FileResult" || + p.ReturnType.Name == "JsonResult" || (p.ReturnType.GenericTypeArguments.Length > 0 && p.ReturnType.GenericTypeArguments[0].Name == "JsonResult")).ToList(); + + foreach (var member in newMembers) { - if (member.Name == "ValidationProblem") continue; + if (member.Name == "ValidationProblem" || member.Name =="Json") continue; - if (member.ReturnType.Name == "ActionResult" || member.ReturnType.Name == "FileResult" || member.ReturnType.Name == "JsonResult" || (member.ReturnType.GenericTypeArguments.Length > 0 && member.ReturnType.GenericTypeArguments[0].Name == "JsonResult")) //如果是Action + //if (member.ReturnType.Name == "ActionResult" || member.ReturnType.Name == "FileResult" || member.ReturnType.Name == "JsonResult" || (member.ReturnType.GenericTypeArguments.Length > 0 && member.ReturnType.GenericTypeArguments[0].Name == "JsonResult")) //如果是Action + //{ + //} + + + var ap = new ActionPermission { - var ap = new ActionPermission - { - name = member.Name, - actionName = member.Name, - controllerName = member.DeclaringType.Name.Substring(0, member.DeclaringType.Name.Length - 10) - }; - // 去掉“Controller”后缀 + name = member.Name, + actionName = member.Name, + controllerName = member.DeclaringType.Name.Substring(0, member.DeclaringType.Name.Length - 10) + }; + // 去掉“Controller”后缀 - var attrs = member.GetCustomAttributes(typeof(DescriptionAttribute), true); - if (attrs.Length > 0) ap.description = (attrs[0] as DescriptionAttribute).Description; - - if (!string.IsNullOrEmpty(ap.description)) - { - ap.name += "【" + ap.description + "】"; - } - cp.action.Add(ap); + var attrs = member.GetCustomAttributes(typeof(DescriptionAttribute), true); + if (attrs.Length > 0) ap.description = (attrs[0] as DescriptionAttribute).Description; + if (!string.IsNullOrEmpty(ap.description)) + { + ap.name += "【" + ap.description + "】"; } + cp.action.Add(ap); + } cp.action = cp.action.Distinct(new ModelComparer()).ToList(); result.Add(cp); diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html index 59d4434..43c2063 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html @@ -201,7 +201,7 @@
- +