rengb 3 лет назад
Родитель
Сommit
90796d3e1a

+ 1 - 1
security-center/src/main/java/com/lantone/security/facade/UserManagementFacade.java

@@ -122,7 +122,7 @@ public class UserManagementFacade {
         List<String> roleIdNames = roleFacade.list(roleQueryWrapper).stream().map(i -> i.getId() + "_" + i.getName()).collect(Collectors.toList());
 
         BeanUtils.copyProperties(user, userDTO);
-        userDTO.setStatus(user.getStatus());
+        userDTO.setUserName(user.getUsername());
         userDTO.setRoles(roleIdNames);
         return userDTO;
     }

+ 6 - 1
user-auth/src/main/java/com/lantone/userauth/component/JwtTokenEnhancer.java

@@ -1,6 +1,7 @@
 package com.lantone.userauth.component;
 
 import com.lantone.userauth.domain.SecurityUser;
+import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.oauth2.common.DefaultOAuth2AccessToken;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 import org.springframework.security.oauth2.provider.OAuth2Authentication;
@@ -9,6 +10,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description: JWT内容增强器
@@ -24,7 +26,10 @@ public class JwtTokenEnhancer implements TokenEnhancer {
         Map<String, Object> info = new HashMap<>();
         //把用户ID设置到JWT中
         info.put("id", securityUser.getId());
-        info.put("client_id", securityUser.getClientId());
+        info.put("status", securityUser.getStatus());
+        if (securityUser.getAuthorities() != null) {
+            info.put("roles", securityUser.getAuthorities().stream().map(i -> ((GrantedAuthority) i).getAuthority()).collect(Collectors.toList()));
+        }
         ((DefaultOAuth2AccessToken) accessToken).setAdditionalInformation(info);
         return accessToken;
     }