diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/MenuAggregateRoot.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/MenuAggregateRoot.cs index c79a1978..fdf49281 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/MenuAggregateRoot.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/MenuAggregateRoot.cs @@ -1,4 +1,5 @@ -using NUglify.Helpers; +using System.Web; +using NUglify.Helpers; using SqlSugar; using Volo.Abp; using Volo.Abp.Auditing; @@ -246,8 +247,8 @@ namespace Yi.Framework.Rbac.Domain.Entities .Where(m => m.MenuSource == MenuSourceEnum.Pure) .Select(m => new Vue3PureRouterDto { - Path = m.Router.StartsWith("/")?m.Router:"/"+m.Router, - Name = m.RouterName, + Path =m.Router.StartsWith("/")?m.Router:"/"+m.Router, + Name =m.IsLink==true?"Link": m.RouterName, component = m.Component, Meta = new MetaPureRouterDto() { diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/UserManager.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/UserManager.cs index 2e14bbd5..d3a50014 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/UserManager.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/UserManager.cs @@ -231,10 +231,11 @@ namespace Yi.Framework.Rbac.Domain.Managers var userRoleMenu = new UserRoleMenuDto(); //首先获取到该用户全部信息,导航到角色、菜单,(菜单需要去重,完全交给Set来处理即可) - //if (user is null) - //{ - // throw new UserFriendlyException($"数据错误,用户id:{nameof(userId)} 不存在,请重新登录"); - //} + if (user is null) + { + //为了解决token前端缓存,后端数据库重新dbseed + throw new UserFriendlyException($"数据错误,查询用户不存在,请重新登录"); + } user.EncryPassword.Password = string.Empty; user.EncryPassword.Salt = string.Empty; diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuPureDataSeed.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuPureDataSeed.cs index 948d6412..75bd258f 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuPureDataSeed.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuPureDataSeed.cs @@ -44,7 +44,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds MenuName = "系统监控", MenuType = MenuTypeEnum.Catalogue, Router = "/monitor", - MenuIcon = "menus.pureSysMonitor", + MenuIcon = "ep:monitor", OrderNum = 99, }; entities.Add(monitoring); @@ -68,13 +68,13 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds //Yi框架 MenuAggregateRoot guide = new MenuAggregateRoot(_guidGenerator.Create()) { - MenuName = "Yi框架", MenuType = MenuTypeEnum.Catalogue, - Router = "https://gitee.com/ccnetcore/yi", + Router = "https://ccnetcore.com", IsLink = true, - MenuIcon = "guide", + MenuIcon = "ri:at-line", OrderNum = 90, + Component = null }; entities.Add(guide); diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuRuoYiDataSeed.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuRuoYiDataSeed.cs index d3264a32..1dda106e 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuRuoYiDataSeed.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuRuoYiDataSeed.cs @@ -564,7 +564,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds MenuName = "Yi框架", MenuType = MenuTypeEnum.Catalogue, - Router = "https://gitee.com/ccnetcore/yi", + Router = "https://ccnetcore.com", IsShow = true, IsLink = true, MenuIcon = "guide",