From b531004a3cbd33d7bb9f5b7dce06ddd4f5e7ec9a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 18 十一月 2022 11:57:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xm-20221107' into xm-20221107
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminDetailsServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
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)
);
}
}
--
Gitblit v1.9.3