From 4c831c9877f48a5738feffd741b65c30722f1f7d Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 04 一月 2022 15:27:20 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/security/SecurityUtils.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/SecurityUtils.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/SecurityUtils.java
index 178f53d..0a2c449 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/SecurityUtils.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/SecurityUtils.java
@@ -32,7 +32,7 @@
public class SecurityUtils {
/**
- * 鑾峰彇鐢ㄦ埛淇℃伅
+ * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛淇℃伅
*/
private static UserDetails getUserDetails() {
final Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
@@ -40,7 +40,7 @@
throw new BusinessException(ResponseStatusEnums.TOKEN_INVALID.getCode(), ResponseStatusEnums.TOKEN_INVALID.getMessage());
}
Integer administratorIdentity = getAdministratorIdentity();
- if (AdministratorEnums.ADMIN.getCode().equals(administratorIdentity) || AdministratorEnums.INSPECT_CUSTOMER.getCode().equals(administratorIdentity)) {
+ if (AdministratorEnums.ADMIN.getCode().equals(administratorIdentity)) {
UserDetails userDetails = (UserDetails) authentication.getPrincipal();
UserDetailsService userDetailsService = SpringContextHolder.getBean("adminDetailsService");
return userDetailsService.loadUserByUsername(userDetails.getUsername());
@@ -54,9 +54,9 @@
}
/**
- * 鑾峰彇绯荤粺鐢ㄦ埛鍚嶇О 鐧诲綍鍚�
+ * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛鐧诲綍鍚�
*
- * @return 绯荤粺鐢ㄦ埛鍚嶇О
+ * @return 褰撳墠鐧诲綍鐢ㄦ埛鐧诲綍鍚�
*/
public static String getUsername() {
final Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
@@ -81,9 +81,9 @@
}
/**
- * 鑾峰彇绯荤粺鐢ㄦ埛id
+ * 鑾峰彇褰撳墠鐧诲綍璐﹀彿鐨刬d
*
- * @return 绯荤粺鐢ㄦ埛id
+ * @return 褰撳墠鐧诲綍璐﹀彿鐨刬d
*/
public static Long getUserId() {
SecurityProperties properties = SpringContextHolder.getBean(SecurityProperties.class);
@@ -110,4 +110,16 @@
}
}
}
+
+ /**
+ * 鑾峰彇瀹㈡埛璐﹀彿鐨刬d 濡傛灉褰撳墠韬唤鏄繍钀ヤ汉鍛橈紝杩斿洖null
+ * @return
+ */
+ public static Long getClientId() {
+ Integer administratorIdentity = SecurityUtils.getAdministratorIdentity();
+ if (AdministratorEnums.CUSTOMER.getCode().equals(administratorIdentity)) {
+ return SecurityUtils.getUserId();
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3