orga0063
/
BootstrapAdmin
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(#I1286W): 演示系统内置菜单保护 

#Comment
comment #I1286W

#Issue
link https://gitee.com/LongbowEnterprise/dashboard/issues?id=I1286W
This commit is contained in:
Argo Zhang 2019-09-21 00:46:05 +08:00
parent b1b80abfc7
commit 09c61075d6
No known key found for this signature in database
GPG Key ID: 152E398953DDF19F
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/admin/Bootstrap.Admin/appsettings.Development.json
View File

@ -89,6 +89,7 @@
"HomePath": "/Admin/Profiles",
"App": "0"
},
"AppMenus": [ "首页", "测试页面", "关于", "返回码云", "多级菜单", "第二层", "第三层", "第四层" ],
"LongbowCache": {
"Enabled": true,
"CorsItems": [

23
src/admin/Bootstrap.DataAccess/Helper/MenuHelper.cs
View File

@ -1,6 +1,8 @@
using Bootstrap.Security;
using Bootstrap.Security.DataAccess;
using Longbow.Cache;
using Longbow.Configuration;
using Microsoft.Extensions.Configuration;
using System.Collections.Generic;
using System.Linq;
@ -31,13 +33,20 @@ namespace Bootstrap.DataAccess
// 不允许保存系统菜单与前台演示系统的默认菜单
if (DictHelper.RetrieveSystemModel())
{
if (p.Category == "0" || p.Application == "2") return true;
if (p.Category == "0") return true;
// 查找原有数据比对是否为系统菜单与演示菜单
if (!string.IsNullOrEmpty(p.Id))
{
var menus = RetrieveAllMenus("Admin").FirstOrDefault(m => m.Id.Equals(p.Id, System.StringComparison.OrdinalIgnoreCase));
if (menus != null && menus.Category == "0" || p.Application == "2") return true;
// 系统菜单
var menus = RetrieveAllMenus("Admin");
var menu = menus.FirstOrDefault(m => m.Id.Equals(p.Id, System.StringComparison.OrdinalIgnoreCase));
if (menu != null && menu.Category == "0") return true;
// 演示系统
var appMenus = ConfigurationManager.GetSection("AppMenus").Get<ICollection<string>>();
if (appMenus.Any(m => m.Equals(menu.Name, System.StringComparison.OrdinalIgnoreCase))) return true;
}
}
@ -56,9 +65,15 @@ namespace Bootstrap.DataAccess
if (DictHelper.RetrieveSystemModel())
{
// 不允许删除系统菜单与前台演示系统的默认菜单
var systemMenus = RetrieveAllMenus("Admin").Where(m => m.Category == "0" || m.Application == "2");
var systemMenus = RetrieveAllMenus("Admin").Where(m => m.Category == "0");
value = value.Where(v => !systemMenus.Any(m => m.Id == v));
if (!value.Any()) return true;
// 演示系统
var appMenus = ConfigurationManager.GetSection("AppMenus").Get<ICollection<string>>();
var appIds = RetrieveAllMenus("Admin").Where(m => appMenus.Any(app => m.Name.Equals(app, System.StringComparison.OrdinalIgnoreCase))).Select(m => m.Id);
value = value.Where(m => !appIds.Any(app => app.Equals(m, System.StringComparison.OrdinalIgnoreCase)));
if (!value.Any()) return true;
}
var ret = DbContextManager.Create<Menu>().Delete(value);
if (ret) CacheCleanUtility.ClearCache(menuIds: value);