From 37e34832eef478c240232b179597f7d671759d59 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 11 七月 2022 09:01:50 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/security/WebSecurityConfig.java | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/security/WebSecurityConfig.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/security/WebSecurityConfig.java
index 10a7a72..9d0e1fa 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/security/WebSecurityConfig.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/security/WebSecurityConfig.java
@@ -1,6 +1,5 @@
package com.gkhy.safePlatform.config.security;
-import com.gkhy.safePlatform.account.rpc.apimodel.NameService;
import com.gkhy.safePlatform.config.security.customzie.CustomizeAccessDeniedHandler;
import com.gkhy.safePlatform.config.security.customzie.CustomizeAuthenticationEntryPoint;
import org.apache.dubbo.config.annotation.DubboReference;
@@ -14,6 +13,7 @@
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
@@ -30,12 +30,8 @@
@Resource
private CustomizeAuthenticationEntryPoint authenticationEntryPoint;
-// @Resource
-// private TokenAuthenticationFilter tokenAuthenticationFilter;
-
- @DubboReference(check = false)
- private NameService nameService;
-
+ @Resource
+ private TokenAuthenticationFilter tokenAuthenticationFilter;
@@ -48,15 +44,13 @@
// 关闭session
http.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS);
// 登录json放行
- http.authorizeRequests().anyRequest().permitAll();
+ http.authorizeRequests().antMatchers("/auth/login").permitAll();
// 关闭
http.headers().cacheControl();
// jwt过滤器
-// http.addFilterBefore(tokenAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
- // 没有登录,没有权限 => 自定义返回
- http.exceptionHandling().authenticationEntryPoint(authenticationEntryPoint).accessDeniedHandler(accessDeniedHandler);
+ http.addFilterBefore(tokenAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
// 请求认证访问
-// http.authorizeRequests().anyRequest().authenticated();
+ http.authorizeRequests().anyRequest().authenticated();
// 允许跨域访问
http.cors();
@@ -80,8 +74,7 @@
@Bean
@Qualifier("myUserDetailService")
protected UserDetailsService userDetailsService(){
-// return username -> nameService.getUserDetailsByUsername(username);
- return null;
+ return (username)-> (UserDetails) new Object();
}
--
Gitblit v1.9.2