diff --git a/Api/Ewide.Core/Manager/IUserManager.cs b/Api/Ewide.Core/Manager/IUserManager.cs index a9c9f42..f3dfa55 100644 --- a/Api/Ewide.Core/Manager/IUserManager.cs +++ b/Api/Ewide.Core/Manager/IUserManager.cs @@ -21,5 +21,6 @@ namespace Ewide.Core Task> GetUserRoleIdList(); Task> GetUserRoleList(string userId); Task> GetUserRoleList(); + Task> GetLoginPermissionList(); } } \ No newline at end of file diff --git a/Api/Ewide.Core/Manager/UserManager.cs b/Api/Ewide.Core/Manager/UserManager.cs index 6512364..19f16c8 100644 --- a/Api/Ewide.Core/Manager/UserManager.cs +++ b/Api/Ewide.Core/Manager/UserManager.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using System.Collections.Generic; +using Ewide.Core.Service; namespace Ewide.Core { @@ -20,6 +21,7 @@ namespace Ewide.Core private readonly IRepository _sysEmpRep; // 员工表 private readonly IRepository _sysOrgRep; private readonly IHttpContextAccessor _httpContextAccessor; + private readonly ISysMenuService _sysMenuService; public string UserId { @@ -52,7 +54,8 @@ namespace Ewide.Core IRepository sysUserRoleRep, IRepository sysEmpRep, IRepository sysOrgRep, - IHttpContextAccessor httpContextAccessor) + IHttpContextAccessor httpContextAccessor, + ISysMenuService sysMenuService) { _sysUserRep = sysUserRep; _sysRoleRep = sysRoleRep; @@ -60,6 +63,7 @@ namespace Ewide.Core _sysEmpRep = sysEmpRep; _sysOrgRep = sysOrgRep; _httpContextAccessor = httpContextAccessor; + _sysMenuService = sysMenuService; } /// @@ -163,5 +167,10 @@ namespace Ewide.Core { return await GetUserRoleList(UserId); } + + public Task> GetLoginPermissionList() + { + return _sysMenuService.GetLoginPermissionList(UserId); + } } } \ No newline at end of file diff --git a/Api/Ewide.Web.Core/Handlers/JwtHandler.cs b/Api/Ewide.Web.Core/Handlers/JwtHandler.cs index 443afe6..2e0bf42 100644 --- a/Api/Ewide.Web.Core/Handlers/JwtHandler.cs +++ b/Api/Ewide.Web.Core/Handlers/JwtHandler.cs @@ -69,7 +69,7 @@ namespace Ewide.Web.Core if (defalutRoute.Contains(routeName)) return true; // 获取用户权限集合(按钮或API接口) - var permissionList = await App.GetService().GetLoginPermissionList(userManager.UserId); + var permissionList = await userManager.GetLoginPermissionList(); // 检查授权 return permissionList.Contains(routeName); diff --git a/web-react/craco.config.js b/web-react/craco.config.js index 59d3aa2..a83f185 100644 --- a/web-react/craco.config.js +++ b/web-react/craco.config.js @@ -28,7 +28,7 @@ module.exports = { ], webpack: { plugins: [ - new MonacoWebpackPlugin() + // new MonacoWebpackPlugin() ] } } \ No newline at end of file