Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-03-09 ac9062273a48330cd77e7cddfd2061b523f3e4c1

 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() {
@@ -122,6 +107,8 @@
                .antMatchers("/webjars/**").permitAll()
                .antMatchers("/*/api-docs").permitAll()
                .antMatchers("/v2/api-docs-ext").permitAll()
                .antMatchers("/serv/vnnox/screenshot").permitAll()
                .antMatchers("/serv/vnnox/progress").permitAll()
                //.antMatchers("/api/wxmp/**").permitAll()

                // 文件
@@ -143,7 +130,6 @@

    @Bean
    public TokenFilter jwtAuthenticationTokenFilter() {
        TokenFilter customFilter = new TokenFilter(tokenProvider);
        return customFilter;
        return new TokenFilter(tokenProvider, properties);
    }
}