From b6822e3364cc3d0c561162da5e778d0ae04aecc6 Mon Sep 17 00:00:00 2001
From: zhangqi <2794379662@qq.com>
Date: Mon, 28 Jun 2021 17:12:14 +0800
Subject: [PATCH] =?UTF-8?q?update:=E8=B7=AF=E7=94=B1=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=94=BE=E5=88=B0userManager=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Api/Ewide.Core/Manager/IUserManager.cs    |  1 +
 Api/Ewide.Core/Manager/UserManager.cs     | 11 ++++++++++-
 Api/Ewide.Web.Core/Handlers/JwtHandler.cs |  2 +-
 web-react/craco.config.js                 |  2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

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<List<string>> GetUserRoleIdList();
         Task<List<SysRole>> GetUserRoleList(string userId);
         Task<List<SysRole>> GetUserRoleList();
+        Task<List<string>> 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<SysEmp> _sysEmpRep;   // 员工表
         private readonly IRepository<SysOrg> _sysOrgRep;
         private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly ISysMenuService _sysMenuService;
 
         public string UserId
         {
@@ -52,7 +54,8 @@ namespace Ewide.Core
             IRepository<SysUserRole> sysUserRoleRep,
             IRepository<SysEmp> sysEmpRep,
             IRepository<SysOrg> 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;
         }
 
         /// <summary>
@@ -163,5 +167,10 @@ namespace Ewide.Core
         {
             return await GetUserRoleList(UserId);
         }
+
+        public Task<List<string>> 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<ISysMenuService>().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