From 5e2fe6ce6e80dea99f6eda304dba6fafbb30ad63 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 09 九月 2022 11:34:13 +0800
Subject: [PATCH] 灯杆解绑fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/security/PermissionConfig.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/PermissionConfig.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/PermissionConfig.java
index 0b6fe9e..9e37e48 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/PermissionConfig.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/PermissionConfig.java
@@ -1,5 +1,7 @@
package com.sandu.ximon.admin.security;
+import com.sandu.common.security.LoginUserInfo;
+import com.sandu.ximon.dao.enums.AdministratorEnums;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.stereotype.Service;
@@ -12,13 +14,21 @@
* @date 2021/8/27 18:28
* 鏉冮檺鎺у埗
*/
-@Service(value = "p")
+@Service(value = "el")
public class PermissionConfig {
public Boolean check(String... permissions) {
-
+ LoginUserInfo loginUserInfo = SecurityUtils.getUserDetails();
+ if (loginUserInfo == null || loginUserInfo.getPermission() == null) {
+ return false;
+ }
+// // 瀹㈡埛娌℃湁鏉冮檺绠＄悊
+// if(AdministratorEnums.CUSTOMER.getCode().equals(loginUserInfo.getAdministratorType())){
+// return true;
+// }
+ String[] split = loginUserInfo.getPermission().split(",");
// 鑾峰彇褰撳墠鐢ㄦ埛鐨勬墍鏈夋潈闄�
- List<String> elPermissions = SecurityUtils.getUserDetails().getAuthorities().stream().map(GrantedAuthority::getAuthority).collect(Collectors.toList());
+ List<String> elPermissions = Arrays.stream(split).collect(Collectors.toList());
// 鍒ゆ柇褰撳墠鐢ㄦ埛鐨勬墍鏈夋潈闄愭槸鍚﹀寘鍚帴鍙ｄ笂瀹氫箟鐨勬潈闄�
return elPermissions.contains("admin") || Arrays.stream(permissions).anyMatch(elPermissions::contains);
}
--
Gitblit v1.9.3