From 94bd886a95613687756f282adda58b86bbafafe5 Mon Sep 17 00:00:00 2001
From: TanYibin <5491541@qq.com>
Date: Tue, 13 Jun 2023 12:35:46 +0800
Subject: [PATCH] 解决自定义拦截器不生效问题

---
 huaheng-wms-core/src/main/java/org/jeecg/utils/config/InterceptorAdapterConfig.java | 20 --------------------
 huaheng-wms-core/src/main/java/org/jeecg/utils/config/Swagger3Config.java           | 25 ++++++++++++++++---------
 2 files changed, 16 insertions(+), 29 deletions(-)
 delete mode 100644 huaheng-wms-core/src/main/java/org/jeecg/utils/config/InterceptorAdapterConfig.java

diff --git a/huaheng-wms-core/src/main/java/org/jeecg/utils/config/InterceptorAdapterConfig.java b/huaheng-wms-core/src/main/java/org/jeecg/utils/config/InterceptorAdapterConfig.java
deleted file mode 100644
index 3b8be4c..0000000
--- a/huaheng-wms-core/src/main/java/org/jeecg/utils/config/InterceptorAdapterConfig.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.jeecg.utils.config;
-
-import org.jeecg.utils.interceptor.AccessLimitInterceptor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
-
-@Configuration
-public class InterceptorAdapterConfig extends WebMvcConfigurationSupport {
-    @Autowired
-    private AccessLimitInterceptor accessLimitInterceptor;
-
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        // 注册自己的拦截器并设置拦截的请求路径
-        registry.addInterceptor(accessLimitInterceptor).addPathPatterns("/**");
-        super.addInterceptors(registry);
-    }
-}
\ No newline at end of file
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/utils/config/Swagger3Config.java b/huaheng-wms-core/src/main/java/org/jeecg/utils/config/Swagger3Config.java
index abfe18c..9210a1b 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/utils/config/Swagger3Config.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/utils/config/Swagger3Config.java
@@ -4,11 +4,15 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import javax.annotation.Resource;
+
 import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.utils.interceptor.AccessLimitInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
@@ -34,6 +38,15 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @Import(BeanValidatorPluginsConfiguration.class)
 public class Swagger3Config implements WebMvcConfigurer {
 
+    @Resource
+    private AccessLimitInterceptor accessLimitInterceptor;
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        // 注册自己的拦截器并设置拦截的请求路径
+        registry.addInterceptor(accessLimitInterceptor).addPathPatterns("/**").excludePathPatterns("/static/**");
+    }
+
     /**
      * 显示swagger-ui.html文档展示页,还必须注入swagger资源:
      * @param registry
@@ -51,16 +64,10 @@ public class Swagger3Config implements WebMvcConfigurer {
      */
     @Bean(value = "defaultApi2")
     public Docket defaultApi2() {
-        return new Docket(DocumentationType.SWAGGER_2)
-            .apiInfo(apiInfo())
-            .select()
-            .apis(RequestHandlerSelectors.basePackage("org.jeecg.modules.wms.api"))// 此包路径下的类,才生成接口文档   
+        return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).select().apis(RequestHandlerSelectors.basePackage("org.jeecg.modules.wms.api"))// 此包路径下的类,才生成接口文档
             .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class))// 加了ApiOperation注解的类,才生成接口文档
-            .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
-            .paths(PathSelectors.any())
-            .build()
-            .securitySchemes(Collections.singletonList(securityScheme()))
-            .securityContexts(securityContexts());
+            .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)).paths(PathSelectors.any()).build()
+            .securitySchemes(Collections.singletonList(securityScheme())).securityContexts(securityContexts());
         // .globalOperationParameters(setHeaderToken());
     }
 
--
libgit2 0.22.2