diff --git a/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/BrowserSecurityConfig.java b/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/BrowserSecurityConfig.java index 04388ba..a2b1961 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/BrowserSecurityConfig.java +++ b/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/BrowserSecurityConfig.java @@ -18,6 +18,7 @@ import org.springframework.security.web.authentication.AuthenticationSuccessHand import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.security.web.authentication.rememberme.JdbcTokenRepositoryImpl; import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository; +import org.springframework.social.security.SpringSocialConfigurer; import javax.annotation.Resource; import javax.sql.DataSource; @@ -78,6 +79,9 @@ public class BrowserSecurityConfig extends WebSecurityConfigurerAdapter { @Autowired private SmsCodeAuthenticationSecurityConfig smsCodeAuthenticationSecurityConfig; + @Autowired + private SpringSocialConfigurer springSocialConfigurer; + /** * 自定义身份认证配置 * @@ -133,7 +137,10 @@ public class BrowserSecurityConfig extends WebSecurityConfigurerAdapter { //暂时关闭掉跨站请求攻击防护 .csrf().disable() //应用短信验证码登录的逻辑 - .apply(smsCodeAuthenticationSecurityConfig); + .apply(smsCodeAuthenticationSecurityConfig) + .and() + //应用springSocial的配置,在接收到特殊的请求的时候进行社交登录.例如 /auth/qq 其中/auth是默认的前缀,qq是providerId + .apply(springSocialConfigurer); } @@ -149,7 +156,6 @@ public class BrowserSecurityConfig extends WebSecurityConfigurerAdapter { /** * 用于记住我功能 - * * @return */ @Bean diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/SocialConfig.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/SocialConfig.java index 437ba6b..b5e1075 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/SocialConfig.java +++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/social/SocialConfig.java @@ -2,6 +2,7 @@ package com.micro.fast.security.core.social; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.crypto.encrypt.Encryptors; import org.springframework.social.config.annotation.EnableSocial; @@ -9,6 +10,7 @@ import org.springframework.social.config.annotation.SocialConfigurerAdapter; import org.springframework.social.connect.ConnectionFactoryLocator; import org.springframework.social.connect.UsersConnectionRepository; import org.springframework.social.connect.jdbc.JdbcUsersConnectionRepository; +import org.springframework.social.security.SpringSocialConfigurer; import javax.sql.DataSource; @@ -39,4 +41,8 @@ public class SocialConfig extends SocialConfigurerAdapter{ jdbcUsersConnectionRepository.setTablePrefix("upms_"); return jdbcUsersConnectionRepository; } + @Bean + public SpringSocialConfigurer springSocialConfigurer(){ + return new SpringSocialConfigurer(); + } }