upgraded security architecture

pom.xml

@@ -25,7 +25,7 @@
         </dependency>
         <!--common 安全包-->
         <dependency>
-            <groupId>com.gct.common.core</groupId>
+            <groupId>com.gct.common.security</groupId>
             <artifactId>common-security</artifactId>
         </dependency>
         <dependency>
@@ -165,7 +165,7 @@
                 <version>${com-gct-common-core.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.gct.common.core</groupId>
+                <groupId>com.gct.common.security</groupId>
                 <artifactId>common-security</artifactId>
                 <version>${com-gct-common-security.version}</version>
             </dependency>
@@ -198,9 +198,9 @@
     <properties>
         <java.version>1.8</java.version>
         <jdk.version>8</jdk.version>
-        <com-gct-common-core.version>1.0-SNAPSHOT</com-gct-common-core.version>
-        <com-gct-common-security.version>1.0-SNAPSHOT</com-gct-common-security.version>
-        <com-gct-common-util.version>1.0-SNAPSHOT</com-gct-common-util.version>
+        <com-gct-common-core.version>2.0-SNAPSHOT</com-gct-common-core.version>
+        <com-gct-common-security.version>2.0-SNAPSHOT</com-gct-common-security.version>
+        <com-gct-common-util.version>2.0-SNAPSHOT</com-gct-common-util.version>
         <commons-io.version>2.8.0</commons-io.version>
         <org.apache.thrift.version>0.13.0</org.apache.thrift.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>

src/main/java/com/gct/aoid/ProductionCalApplication.java

@@ -1,5 +1,6 @@
 package com.gct.aoid;
 
+import com.gct.common.security.annotation.EnableGCTServiceSecurity;
 import com.spring4all.swagger.EnableSwagger2Doc;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
@@ -20,6 +21,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableDiscoveryClient//开启服务注册
 //@EnableScheduling//开启定时任务
 @ImportAutoConfiguration({RibbonAutoConfiguration.class, FeignRibbonClientAutoConfiguration.class, FeignAutoConfiguration.class})
+@EnableGCTServiceSecurity
 @EnableTransactionManagement
 public class ProductionCalApplication {
 

src/main/java/com/gct/aoid/config/WebSecurityConfig.java

@@ -1,53 +0,0 @@
-package com.gct.aoid.config;
-
-
-import com.gct.common.security.core.CustomAccessDeniedHandler;
-import com.gct.common.security.core.JwtAuthenticationFilter;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-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.web.access.AccessDeniedHandler;
-import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
-
-/**
- * Spring Security配置
- * @author: NewMeanning
- * @create: 2020-12-25 11:36
- */
-@Configuration
-@EnableWebSecurity	// 开启Spring Security
-@EnableGlobalMethodSecurity(prePostEnabled = true)	// 开启权限注解，如：@PreAuthorize注解
-public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
-
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http
-                .csrf().disable()
-                .authorizeRequests()
-                .antMatchers("/swagger-ui.html").permitAll()
-                .antMatchers("/swagger-resources/**").permitAll()
-                .antMatchers("/v2/api-docs").permitAll()
-                // 服务监控
-                .antMatchers("/actuator/**").permitAll()
-                // 其他所有请求需要身份认证
-                .anyRequest().authenticated()
-                .and().exceptionHandling().accessDeniedHandler(accessDeniedHandler())
-                .and()
-                //禁用session
-                .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-                .and()
-                //添加自定义过滤器
-                .addFilterAt(new JwtAuthenticationFilter(super.authenticationManager()), BasicAuthenticationFilter.class);
-    }
-
-    @Bean
-    public AccessDeniedHandler accessDeniedHandler() {
-        return new CustomAccessDeniedHandler();
-    }
-
-}