Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
程序猿小郑
microservices-platform
提交
bbae7da2
microservices-platform
项目概览
程序猿小郑
/
microservices-platform
与 Fork 源项目一致
Fork自
zlt2000 / microservices-platform
通知
4
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
microservices-platform
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
bbae7da2
编写于
7月 21, 2020
作者:
zlt2000
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #I1OEEN
上级
b1fc258a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
26 deletion
+18
-26
zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/store/AuthJwtTokenStore.java
...va/com/central/oauth2/common/store/AuthJwtTokenStore.java
+6
-0
zlt-uaa/src/main/java/com/central/oauth/config/AuthorizationServerConfig.java
...a/com/central/oauth/config/AuthorizationServerConfig.java
+0
-20
zlt-uaa/src/main/java/com/central/oauth/config/TokenGranterConfig.java
...ain/java/com/central/oauth/config/TokenGranterConfig.java
+12
-6
未找到文件。
zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/store/AuthJwtTokenStore.java
浏览文件 @
bbae7da2
...
...
@@ -5,6 +5,7 @@ import com.central.oauth2.common.converter.CustomUserAuthenticationConverter;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
;
import
org.springframework.cloud.bootstrap.encrypt.KeyProperties
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.core.annotation.Order
;
import
org.springframework.security.oauth2.common.DefaultOAuth2AccessToken
;
import
org.springframework.security.oauth2.provider.token.DefaultAccessTokenConverter
;
import
org.springframework.security.oauth2.provider.token.TokenEnhancer
;
...
...
@@ -23,6 +24,9 @@ import java.util.Map;
*
* @author zlt
* @date 2018/7/24 16:21
* <p>
* Blog: https://zlt2000.gitee.io
* Github: https://github.com/zlt2000
*/
@ConditionalOnProperty
(
prefix
=
"zlt.oauth2.token.store"
,
name
=
"type"
,
havingValue
=
"authJwt"
)
public
class
AuthJwtTokenStore
{
...
...
@@ -41,6 +45,7 @@ public class AuthJwtTokenStore {
}
@Bean
@Order
(
2
)
public
JwtAccessTokenConverter
jwtAccessTokenConverter
()
{
final
JwtAccessTokenConverter
converter
=
new
JwtAccessTokenConverter
();
KeyPair
keyPair
=
new
KeyStoreKeyFactory
...
...
@@ -59,6 +64,7 @@ public class AuthJwtTokenStore {
* @return TokenEnhancer
*/
@Bean
@Order
(
1
)
public
TokenEnhancer
tokenEnhancer
()
{
return
(
accessToken
,
authentication
)
->
{
final
Map
<
String
,
Object
>
additionalInfo
=
new
HashMap
<>(
1
);
...
...
zlt-uaa/src/main/java/com/central/oauth/config/AuthorizationServerConfig.java
浏览文件 @
bbae7da2
...
...
@@ -14,13 +14,9 @@ import org.springframework.security.oauth2.config.annotation.web.configurers.Aut
import
org.springframework.security.oauth2.provider.TokenGranter
;
import
org.springframework.security.oauth2.provider.code.RandomValueAuthorizationCodeServices
;
import
org.springframework.security.oauth2.provider.error.WebResponseExceptionTranslator
;
import
org.springframework.security.oauth2.provider.token.TokenEnhancer
;
import
org.springframework.security.oauth2.provider.token.TokenEnhancerChain
;
import
org.springframework.security.oauth2.provider.token.TokenStore
;
import
org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter
;
import
javax.annotation.Resource
;
import
java.util.Arrays
;
/**
* OAuth2 授权服务器配置
...
...
@@ -47,12 +43,6 @@ public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdap
@Autowired
private
TokenStore
tokenStore
;
@Autowired
(
required
=
false
)
private
JwtAccessTokenConverter
jwtAccessTokenConverter
;
@Autowired
(
required
=
false
)
private
TokenEnhancer
tokenEnhancer
;
@Autowired
private
WebResponseExceptionTranslator
webResponseExceptionTranslator
;
...
...
@@ -71,16 +61,6 @@ public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdap
*/
@Override
public
void
configure
(
AuthorizationServerEndpointsConfigurer
endpoints
)
{
if
(
jwtAccessTokenConverter
!=
null
)
{
if
(
tokenEnhancer
!=
null
)
{
TokenEnhancerChain
tokenEnhancerChain
=
new
TokenEnhancerChain
();
tokenEnhancerChain
.
setTokenEnhancers
(
Arrays
.
asList
(
tokenEnhancer
,
jwtAccessTokenConverter
));
endpoints
.
tokenEnhancer
(
tokenEnhancerChain
);
}
else
{
endpoints
.
accessTokenConverter
(
jwtAccessTokenConverter
);
}
}
endpoints
.
tokenStore
(
tokenStore
)
.
authenticationManager
(
authenticationManager
)
.
userDetailsService
(
userDetailsService
)
...
...
zlt-uaa/src/main/java/com/central/oauth/config/TokenGranterConfig.java
浏览文件 @
bbae7da2
...
...
@@ -22,10 +22,7 @@ import org.springframework.security.oauth2.provider.implicit.ImplicitTokenGrante
import
org.springframework.security.oauth2.provider.password.ResourceOwnerPasswordTokenGranter
;
import
org.springframework.security.oauth2.provider.refresh.RefreshTokenGranter
;
import
org.springframework.security.oauth2.provider.request.DefaultOAuth2RequestFactory
;
import
org.springframework.security.oauth2.provider.token.AuthorizationServerTokenServices
;
import
org.springframework.security.oauth2.provider.token.DefaultTokenServices
;
import
org.springframework.security.oauth2.provider.token.TokenEnhancer
;
import
org.springframework.security.oauth2.provider.token.TokenStore
;
import
org.springframework.security.oauth2.provider.token.*
;
import
org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationProvider
;
import
java.util.ArrayList
;
...
...
@@ -56,7 +53,7 @@ public class TokenGranterConfig {
private
TokenStore
tokenStore
;
@Autowired
(
required
=
false
)
private
TokenEnhancer
tokenEnhancer
;
private
List
<
TokenEnhancer
>
tokenEnhancer
;
@Autowired
private
IValidateCodeService
validateCodeService
;
...
...
@@ -157,11 +154,20 @@ public class TokenGranterConfig {
tokenServices
.
setSupportRefreshToken
(
true
);
tokenServices
.
setReuseRefreshToken
(
reuseRefreshToken
);
tokenServices
.
setClientDetailsService
(
clientDetailsService
);
tokenServices
.
setTokenEnhancer
(
tokenEnhancer
);
tokenServices
.
setTokenEnhancer
(
tokenEnhancer
()
);
addUserDetailsService
(
tokenServices
,
this
.
userDetailsService
);
return
tokenServices
;
}
private
TokenEnhancer
tokenEnhancer
()
{
if
(
tokenEnhancer
!=
null
)
{
TokenEnhancerChain
tokenEnhancerChain
=
new
TokenEnhancerChain
();
tokenEnhancerChain
.
setTokenEnhancers
(
tokenEnhancer
);
return
tokenEnhancerChain
;
}
return
null
;
}
private
void
addUserDetailsService
(
DefaultTokenServices
tokenServices
,
UserDetailsService
userDetailsService
)
{
if
(
userDetailsService
!=
null
)
{
PreAuthenticatedAuthenticationProvider
provider
=
new
PreAuthenticatedAuthenticationProvider
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录