Commit f3c7ccd3 authored by lepdou's avatar lepdou

update

parent 4c071efb
...@@ -4,6 +4,8 @@ import com.ctrip.framework.apollo.portal.auth.CtripLogoutHandler; ...@@ -4,6 +4,8 @@ import com.ctrip.framework.apollo.portal.auth.CtripLogoutHandler;
import com.ctrip.framework.apollo.portal.auth.CtripUserInfoHolder; import com.ctrip.framework.apollo.portal.auth.CtripUserInfoHolder;
import com.ctrip.framework.apollo.portal.auth.DefaultLogoutHandler; import com.ctrip.framework.apollo.portal.auth.DefaultLogoutHandler;
import com.ctrip.framework.apollo.portal.auth.DefaultUserInfoHolder; import com.ctrip.framework.apollo.portal.auth.DefaultUserInfoHolder;
import com.ctrip.framework.apollo.portal.auth.LogoutHandler;
import com.ctrip.framework.apollo.portal.auth.UserInfoHolder;
import com.ctrip.framework.apollo.portal.repository.ServerConfigRepository; import com.ctrip.framework.apollo.portal.repository.ServerConfigRepository;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -145,15 +147,16 @@ public class AuthConfiguration { ...@@ -145,15 +147,16 @@ public class AuthConfiguration {
* 默认实现 * 默认实现
*/ */
@Configuration @Configuration
@ConditionalOnMissingBean(CtripUserInfoHolder.class)
static class DefaultAuthAutoConfiguration { static class DefaultAuthAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean(UserInfoHolder.class)
public DefaultUserInfoHolder notCtripUserInfoHolder(){ public DefaultUserInfoHolder notCtripUserInfoHolder(){
return new DefaultUserInfoHolder(); return new DefaultUserInfoHolder();
} }
@Bean @Bean
@ConditionalOnMissingBean(LogoutHandler.class)
public DefaultLogoutHandler logoutHandler(){ public DefaultLogoutHandler logoutHandler(){
return new DefaultLogoutHandler(); return new DefaultLogoutHandler();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment