From 1cd1c38372a5652b59866f28953179476cf84567 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 18 一月 2022 10:40:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
sandu-common/src/main/java/com/sandu/common/security/config/SecurityConfig.java | 28 ++++++----------------------
1 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/sandu-common/src/main/java/com/sandu/common/security/config/SecurityConfig.java b/sandu-common/src/main/java/com/sandu/common/security/config/SecurityConfig.java
index a62f6d1..7079516 100644
--- a/sandu-common/src/main/java/com/sandu/common/security/config/SecurityConfig.java
+++ b/sandu-common/src/main/java/com/sandu/common/security/config/SecurityConfig.java
@@ -1,16 +1,11 @@
-/**
- * Copyright (C) 2018-2020
- * All rights reserved, Designed By www.yixiang.co
- * 娉ㄦ剰锛�
- * 鏈蒋浠朵负www.yixiang.co寮�鍙戠爺鍒�
- */
package com.sandu.common.security.config;
import com.sandu.common.security.JwtAccessDeniedHandler;
import com.sandu.common.security.JwtAuthenticationEntryPoint;
import com.sandu.common.security.TokenFilter;
import com.sandu.common.security.annotation.AnonymousAccess;
-import com.sandu.common.security.jwt.JwtTokenProvider;
+import com.sandu.common.security.token.TokenProvider;
+import lombok.AllArgsConstructor;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -41,25 +36,15 @@
@Configuration
@EnableGlobalMethodSecurity(prePostEnabled = true)
@EnableWebSecurity
+@AllArgsConstructor
public class SecurityConfig extends WebSecurityConfigurerAdapter {
- private final JwtTokenProvider tokenProvider;
+ private final TokenProvider tokenProvider;
private final CorsFilter corsFilter;
+ private final SecurityProperties properties;
private final JwtAuthenticationEntryPoint authenticationErrorHandler;
private final JwtAccessDeniedHandler jwtAccessDeniedHandler;
private final ApplicationContext applicationContext;
-
- public SecurityConfig(JwtTokenProvider tokenProvider, CorsFilter corsFilter,
- JwtAuthenticationEntryPoint authenticationErrorHandler,
- JwtAccessDeniedHandler jwtAccessDeniedHandler,
- ApplicationContext applicationContext) {
- this.tokenProvider = tokenProvider;
- this.corsFilter = corsFilter;
- this.authenticationErrorHandler = authenticationErrorHandler;
- this.jwtAccessDeniedHandler = jwtAccessDeniedHandler;
- this.applicationContext = applicationContext;
- }
-
@Bean
GrantedAuthorityDefaults grantedAuthorityDefaults() {
@@ -143,7 +128,6 @@
@Bean
public TokenFilter jwtAuthenticationTokenFilter() {
- TokenFilter customFilter = new TokenFilter(tokenProvider);
- return customFilter;
+ return new TokenFilter(tokenProvider, properties);
}
}
--
Gitblit v1.9.3