From 30aa0c4fcab126d1940f599a8eed2bb0421dcb38 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sat, 11 Jul 2020 09:20:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=88=B7=E7=AB=AF?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E8=AE=A4=E8=AF=81=E4=BC=9A=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/auth/config/AuthServerConfig.java | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/config/AuthServerConfig.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/config/AuthServerConfig.java index 53bb2cf89..d1ee69e28 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/config/AuthServerConfig.java +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/config/AuthServerConfig.java @@ -11,13 +11,11 @@ import org.springframework.http.HttpMethod; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.oauth2.common.DefaultOAuth2AccessToken; -import org.springframework.security.oauth2.common.OAuth2AccessToken; import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter; import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer; import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer; -import org.springframework.security.oauth2.provider.OAuth2Authentication; import org.springframework.security.oauth2.provider.token.TokenEnhancer; import org.springframework.security.oauth2.provider.token.TokenStore; import org.springframework.security.oauth2.provider.token.store.redis.RedisTokenStore; @@ -118,22 +116,16 @@ public class AuthServerConfig extends AuthorizationServerConfigurerAdapter @Bean public TokenEnhancer tokenEnhancer() { - return new TokenEnhancer() - { - @Override - public OAuth2AccessToken enhance(OAuth2AccessToken accessToken, OAuth2Authentication authentication) + return (accessToken, authentication) -> { + if (authentication.getUserAuthentication() != null) { - if (accessToken instanceof DefaultOAuth2AccessToken) - { - DefaultOAuth2AccessToken token = (DefaultOAuth2AccessToken) accessToken; - LoginUser user = (LoginUser) authentication.getUserAuthentication().getPrincipal(); - Map additionalInformation = new LinkedHashMap(); - additionalInformation.put(SecurityConstants.DETAILS_USERNAME, authentication.getName()); - additionalInformation.put(SecurityConstants.DETAILS_USER_ID, user.getUserId()); - token.setAdditionalInformation(additionalInformation); - } - return accessToken; - }; + Map additionalInformation = new LinkedHashMap(); + LoginUser user = (LoginUser) authentication.getUserAuthentication().getPrincipal(); + additionalInformation.put(SecurityConstants.DETAILS_USER_ID, user.getUserId()); + additionalInformation.put(SecurityConstants.DETAILS_USERNAME, user.getUsername()); + ((DefaultOAuth2AccessToken) accessToken).setAdditionalInformation(additionalInformation); + } + return accessToken; }; } }