From 8062b42641a1d5816e39378e4a3758c0eb13e844 Mon Sep 17 00:00:00 2001 From: OPGame <1242479791@qq.com> Date: Wed, 7 Aug 2019 17:26:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=8E=88=E6=9D=83=E7=9A=84provider?= =?UTF-8?q?=EF=BC=8C=E7=BB=9F=E4=B8=80=E5=88=B0security=E7=9A=84=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shop/api/security/WebSecurityConfig.java | 85 ------------------- .../security/config}/WebSecurityConfig.java | 20 +++-- 2 files changed, 12 insertions(+), 93 deletions(-) delete mode 100644 yami-shop-api/src/main/java/com/yami/shop/api/security/WebSecurityConfig.java rename {yami-shop-admin/src/main/java/com/yami/shop/admin/security => yami-shop-security/src/main/java/com/yami/shop/security/config}/WebSecurityConfig.java (81%) diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/security/WebSecurityConfig.java b/yami-shop-api/src/main/java/com/yami/shop/api/security/WebSecurityConfig.java deleted file mode 100644 index 7e5b3b8..0000000 --- a/yami-shop-api/src/main/java/com/yami/shop/api/security/WebSecurityConfig.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. - * - * https://www.gz-yami.com/ - * - * 未经允许，不可做商业用途！ - * - * 版权所有，侵权必究！ - */ - -package com.yami.shop.api.security; - - -import cn.binarywang.wx.miniapp.api.WxMaService; -import com.yami.shop.security.filter.LoginAuthenticationFilter; -import com.yami.shop.security.handler.LoginAuthFailedHandler; -import com.yami.shop.security.handler.LoginAuthSuccessHandler; -import com.yami.shop.security.provider.MiniAppAuthenticationProvider; -import com.yami.shop.security.service.YamiUserDetailsService; -import lombok.SneakyThrows; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.annotation.Order; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.crypto.factory.PasswordEncoderFactories; -import org.springframework.security.crypto.password.PasswordEncoder; - -/** - */ -@Configuration -@Order(90) -public class WebSecurityConfig extends WebSecurityConfigurerAdapter { - - /** - * 自动注入UserDetailsService - */ - @Autowired - private YamiUserDetailsService yamiUserDetailsService; - @Autowired - private LoginAuthSuccessHandler loginAuthSuccessHandler; - @Autowired - private LoginAuthFailedHandler loginAuthFailedHandler; - @Autowired - private WxMaService wxService; - @Autowired - private MiniAppAuthenticationProvider miniAppAuthenticationProvider; - - @Override - @Bean - @SneakyThrows - public AuthenticationManager authenticationManagerBean() { - return super.authenticationManagerBean(); - } - - /** - * 用户验证 - * @param auth - */ - @Override - public void configure(AuthenticationManagerBuilder auth) { - auth.authenticationProvider(miniAppAuthenticationProvider); - } - - @Bean - public PasswordEncoder passwordEncoder(){ - return PasswordEncoderFactories.createDelegatingPasswordEncoder(); - } - - @Bean - public LoginAuthenticationFilter loginAuthenticationFilter() { - LoginAuthenticationFilter filter = new LoginAuthenticationFilter(); - try { - filter.setAuthenticationManager(this.authenticationManagerBean()); - } catch (Exception e) { - e.printStackTrace(); - } - filter.setAuthenticationSuccessHandler(loginAuthSuccessHandler); - filter.setAuthenticationFailureHandler(loginAuthFailedHandler); - return filter; - } - -} diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/security/WebSecurityConfig.java b/yami-shop-security/src/main/java/com/yami/shop/security/config/WebSecurityConfig.java similarity index 81% rename from yami-shop-admin/src/main/java/com/yami/shop/admin/security/WebSecurityConfig.java rename to yami-shop-security/src/main/java/com/yami/shop/security/config/WebSecurityConfig.java index ccbc372..1eb7ea8 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/security/WebSecurityConfig.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/config/WebSecurityConfig.java @@ -8,14 +8,15 @@ * 版权所有，侵权必究！ */ -package com.yami.shop.admin.security; +package com.yami.shop.security.config; import com.yami.shop.security.filter.LoginAuthenticationFilter; import com.yami.shop.security.handler.LoginAuthFailedHandler; import com.yami.shop.security.handler.LoginAuthSuccessHandler; import com.yami.shop.security.provider.AdminAuthenticationProvider; -import com.yami.shop.security.service.YamiUserDetailsService; +import com.yami.shop.security.provider.MiniAppAuthenticationProvider; +import lombok.AllArgsConstructor; import lombok.SneakyThrows; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -30,14 +31,16 @@ import org.springframework.security.crypto.password.PasswordEncoder; @Configuration @Order(90) +@AllArgsConstructor public class WebSecurityConfig extends WebSecurityConfigurerAdapter { - @Autowired - private LoginAuthSuccessHandler loginAuthSuccessHandler; - @Autowired - private LoginAuthFailedHandler loginAuthFailedHandler; - @Autowired - private AdminAuthenticationProvider adminAuthenticationProvider; + private final LoginAuthSuccessHandler loginAuthSuccessHandler; + + private final LoginAuthFailedHandler loginAuthFailedHandler; + + private final AdminAuthenticationProvider adminAuthenticationProvider; + + private final MiniAppAuthenticationProvider miniAppAuthenticationProvider; @Override @Bean @@ -53,6 +56,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { @Override public void configure(AuthenticationManagerBuilder auth) { auth.authenticationProvider(adminAuthenticationProvider); + auth.authenticationProvider(miniAppAuthenticationProvider); } @Bean