|
@@ -29,12 +29,10 @@ import java.util.Map;
|
|
public class ShiroConfig {
|
|
public class ShiroConfig {
|
|
private final JwtContext jwtContext;
|
|
private final JwtContext jwtContext;
|
|
private final DaqProperties properties;
|
|
private final DaqProperties properties;
|
|
- private final AuthBridgeService authBridgeService;
|
|
|
|
|
|
|
|
- public ShiroConfig(DaqProperties properties, JwtContext jwtContext, AuthBridgeService authBridgeService) {
|
|
|
|
|
|
+ public ShiroConfig(DaqProperties properties, JwtContext jwtContext) {
|
|
this.jwtContext = jwtContext;
|
|
this.jwtContext = jwtContext;
|
|
this.properties = properties;
|
|
this.properties = properties;
|
|
- this.authBridgeService = authBridgeService;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -56,10 +54,10 @@ public class ShiroConfig {
|
|
return new ShiroLoginAuthAdapter(this.properties);
|
|
return new ShiroLoginAuthAdapter(this.properties);
|
|
}
|
|
}
|
|
|
|
|
|
-// @Bean
|
|
|
|
-// public AuthBridgeService authBridgeService() {
|
|
|
|
-// return new AuthBridgeService(this.authAdapter());
|
|
|
|
-// }
|
|
|
|
|
|
+ @Bean
|
|
|
|
+ public AuthBridgeService authBridgeService() {
|
|
|
|
+ return new AuthBridgeService(this.authAdapter());
|
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
/**
|
|
* 创建cookie对象
|
|
* 创建cookie对象
|
|
@@ -102,7 +100,7 @@ public class ShiroConfig {
|
|
*/
|
|
*/
|
|
@Bean(name = "shiroDbRealm")
|
|
@Bean(name = "shiroDbRealm")
|
|
public ShiroDbRealm shiroDbRealm() {
|
|
public ShiroDbRealm shiroDbRealm() {
|
|
- return new ShiroDbRealmImpl(this.authBridgeService, this.credentialsMatcher());
|
|
|
|
|
|
+ return new ShiroDbRealmImpl(this.authBridgeService(), this.credentialsMatcher());
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|