From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001 From: guoyujie <guoyujie@ng.com> Date: 星期四, 12 六月 2025 16:48:35 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override --- north-glass-erp/src/main/java/com/example/erp/config/StpInterfaceImpl.java | 22 +++++----------------- 1 files changed, 5 insertions(+), 17 deletions(-) diff --git a/north-glass-erp/src/main/java/com/example/erp/config/StpInterfaceImpl.java b/north-glass-erp/src/main/java/com/example/erp/config/StpInterfaceImpl.java index b48de64..1e5386d 100644 --- a/north-glass-erp/src/main/java/com/example/erp/config/StpInterfaceImpl.java +++ b/north-glass-erp/src/main/java/com/example/erp/config/StpInterfaceImpl.java @@ -11,10 +11,11 @@ /** * 鑷畾涔夋潈闄愯璇佹帴鍙f墿灞曪紝Sa-Token 灏嗕粠姝ゅ疄鐜扮被鑾峰彇姣忎釜璐﹀彿鎷ユ湁鐨勬潈闄愮爜 * - * @author kong - * @since 2022-10-13 */ -@Component // 鎵撳紑姝ゆ敞瑙o紝淇濊瘉姝ょ被琚玸pringboot鎵弿锛屽嵆鍙畬鎴恠a-token鐨勮嚜瀹氫箟鏉冮檺楠岃瘉鎵╁睍 + + +// 鎵撳紑姝ゆ敞瑙o紝淇濊瘉姝ょ被琚玸pringboot鎵弿锛屽嵆鍙畬鎴恠a-token鐨勮嚜瀹氫箟鏉冮檺楠岃瘉鎵╁睍 +@Component public class StpInterfaceImpl implements StpInterface { private final PermissionRoleService permissionRoleService; @@ -27,14 +28,6 @@ */ @Override public List<String> getPermissionList(Object loginId, String loginType) { - // 鏈琹ist浠呭仛妯℃嫙锛屽疄闄呴」鐩腑瑕佹牴鎹叿浣撲笟鍔¢�昏緫鏉ユ煡璇㈡潈闄� - /*List<String> list = new ArrayList<>(); - list.add("101"); - list.add("user.add"); - list.add("user.update"); - list.add("user.get"); - // list.add("user.delete"); - list.add("art.*");*/ return permissionRoleService.getUserPermission(Integer.parseInt((String) loginId)); } @@ -43,11 +36,6 @@ */ @Override public List<String> getRoleList(Object loginId, String loginType) { - // 鏈琹ist浠呭仛妯℃嫙锛屽疄闄呴」鐩腑瑕佹牴鎹叿浣撲笟鍔¢�昏緫鏉ユ煡璇㈣鑹� - List<String> list = new ArrayList<String>(); - list.add("admin"); - list.add("super-admin"); - list.add("tao"); - return list; + return permissionRoleService.getUserRole(Integer.parseInt((String) loginId)); } } -- Gitblit v1.8.0