From 7477ef6ab4e6aa1189424c5bd3af6f12ae591e88 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 09 三月 2022 16:08:12 +0800
Subject: [PATCH] 普通用户登录fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 2 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java | 28 +++++++++++++++++++++++-----
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java | 2 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminDetailsServiceImpl.java | 4 ++--
4 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
index 7cce0e2..895f405 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
@@ -74,7 +74,7 @@
return ResponseUtil.error(ResponseStatusEnums.DISABLE_ACCOUNT.getCode(), ResponseStatusEnums.DISABLE_ACCOUNT.getMessage());
}
- Collection<GrantedAuthority> grantedAuthorities = roleService.mapToGrantedAuthorities(admin.getId());
+ Collection<GrantedAuthority> grantedAuthorities = roleService.mapToGrantedAuthorities(admin.getId(), true);
LoginUserInfo loginUserInfo = new LoginUserInfo();
loginUserInfo.setUserId(admin.getId());
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
index e6b43bb..bbe477b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
@@ -107,7 +107,7 @@
return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
}
- Collection<GrantedAuthority> grantedAuthorities = roleService.mapToGrantedAuthorities(client.getId());
+ Collection<GrantedAuthority> grantedAuthorities = roleService.mapToGrantedAuthorities(client.getId(), false);
LoginUserInfo loginUserInfo = new LoginUserInfo();
loginUserInfo.setUserId(client.getId());
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminDetailsServiceImpl.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminDetailsServiceImpl.java
index 85daeb2..9811d20 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminDetailsServiceImpl.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminDetailsServiceImpl.java
@@ -27,7 +27,7 @@
@Override
public UserDetails loadUserByUsername(String username) {
- log.info("loadUserByUsername == {}",username);
+ log.info("loadUserByUsername == {}", username);
Admin admin = adminService.findByUserName(username);
if (admin == null) {
throw new IllegalArgumentException("璐﹀彿涓嶅瓨鍦�");
@@ -39,7 +39,7 @@
private UserDetails createJwtUser(Admin admin) {
return new AdminJwtUser(
admin,
- roleService.mapToGrantedAuthorities(admin.getId())
+ roleService.mapToGrantedAuthorities(admin.getId(), true)
);
}
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java
index 2426ae0..d6581f0 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java
@@ -32,6 +32,7 @@
public class RoleService extends BaseServiceImpl<RoleMapper, Role> {
private final AdminRoleRelationService adminRoleRelationService;
+ private final ClientRoleRelationService clientRoleRelationService;
private final RoleMenuRelationService roleMenuRelationService;
private final MenuService menuService;
private final MenuMapper menuMapper;
@@ -40,10 +41,14 @@
/**
* 鑾峰彇鎸囧畾绠＄悊鍛樼殑spring security鏉冮檺璁よ瘉鍒楄〃
*/
- public Collection<GrantedAuthority> mapToGrantedAuthorities(Long adminId) {
-
- // 鑾峰彇绠＄悊鍛樼殑瑙掕壊id
- List<Role> roles = listByAdminId(adminId);
+ public Collection<GrantedAuthority> mapToGrantedAuthorities(Long adminId, boolean flag) {
+ List<Role> roles;
+ if (flag) {
+ // 鑾峰彇绠＄悊鍛樼殑瑙掕壊id
+ roles = listByAdminId(adminId);
+ } else {
+ roles = listByClientId(adminId);
+ }
if (CollectionUtil.isEmpty(roles)) {
throw new BusinessException("褰撳墠鐢ㄦ埛娌℃湁瑙掕壊");
@@ -76,6 +81,19 @@
// 鑾峰彇绠＄悊鍛樼殑瑙掕壊id
List<AdminRoleRelation> list = adminRoleRelationService.list(Wrappers.lambdaQuery(AdminRoleRelation.class).eq(AdminRoleRelation::getAdminId, adminId).select(AdminRoleRelation::getRoleId));
List<Long> roleIdList = list.stream().map(AdminRoleRelation::getRoleId).collect(Collectors.toList());
+ if (CollectionUtil.isEmpty(roleIdList)) {
+ return null;
+ }
+ return listByIds(roleIdList);
+ }
+
+ /**
+ * 鑾峰彇鏌愪釜鏅�氱敤鎴风殑瑙掕壊鍒楄〃
+ */
+ public List<Role> listByClientId(Long clientId) {
+ // 鑾峰彇鏅�氱敤鎴风殑瑙掕壊id
+ List<ClientRoleRelation> list = clientRoleRelationService.list(Wrappers.lambdaQuery(ClientRoleRelation.class).eq(ClientRoleRelation::getClientId, clientId).select(ClientRoleRelation::getRoleId));
+ List<Long> roleIdList = list.stream().map(ClientRoleRelation::getRoleId).collect(Collectors.toList());
if (CollectionUtil.isEmpty(roleIdList)) {
return null;
}
@@ -149,7 +167,7 @@
throw new BusinessException("鎵句笉鍒拌鑹�");
}
//瓒呯骇绠＄悊鍛樹笉鑳藉垹闄�
- if(RoleLevelStatus.SUPER.getCode().equals(role.getLevel())){
+ if (RoleLevelStatus.SUPER.getCode().equals(role.getLevel())) {
throw new BusinessException("褰撳墠瑙掕壊涓鸿秴绾х鐞嗗憳锛屾棤娉曞垹闄�");
}
--
Gitblit v1.9.3