Переглянути джерело

fix: 修复swagger2 ->swagger3报错

Marko 4 роки тому
батько
коміт
6c3ef45cf0

+ 0 - 2
abi-cloud-qr-platform-common/src/main/java/com/abi/task/common/tablestore/TableStorePlusUtils.java

@@ -10,10 +10,8 @@ import com.abi.task.common.utils.TableStoreUtils;
 import com.alicloud.openservices.tablestore.model.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import sun.security.provider.certpath.SunCertPathBuilderException;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;

+ 4 - 5
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/config/SwaggerConfiguration.java

@@ -28,24 +28,22 @@ import java.util.Set;
 
 /**
  * @Description:
- * @author: lenm.peng @Date: 2020/12/7 17:41
+ * @author: lenm.peng
+ * @Date: 2020/12/7 17:41
  */
 @EnableOpenApi
 @Configuration
 public class SwaggerConfiguration implements WebMvcConfigurer {
-    private static final Logger LOG = LoggerFactory.getLogger(SwaggerConfiguration.class);
+    private static final Logger logger = LoggerFactory.getLogger(SwaggerConfiguration.class);
 
     @Bean
     public Docket createRestApi() {
         return new Docket(DocumentationType.OAS_30)
                 .pathMapping("/")
-
                 // 定义是否开启swagger,false为关闭,可以通过变量控制
                 .enable(true)
-
                 // 将api的元信息设置为包含在json ResourceListing响应中。
                 .apiInfo(apiInfo())
-
                 // 选择哪些接口作为swagger的doc发布
                 .select()
                 .apis(RequestHandlerSelectors.any())
@@ -83,6 +81,7 @@ public class SwaggerConfiguration implements WebMvcConfigurer {
      */
     private List<SecurityScheme> securitySchemes() {
         ApiKey apiKey = new ApiKey("BASE_TOKEN", "token", In.HEADER.toValue());
+
         return Collections.singletonList(apiKey);
     }
 

+ 21 - 21
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/config/WebMvcConfig.java

@@ -1,46 +1,46 @@
-package com.abi.qms.platform.infrastructure.config;
+package com.abi.qms.config;
+
 
 import com.abi.qms.platform.infrastructure.interceptor.CorsInterceptor;
-import com.abi.qms.platform.infrastructure.interceptor.IwepTokenInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 
+/**
+ * @author lenovo
+ */
 @Configuration
-public class WebMvcConfig implements WebMvcConfigurer {
+public class WebMvcConfig extends WebMvcConfigurationSupport {
 
     @Autowired
-    CorsInterceptor corsInterceptor;
+    private CorsInterceptor corsInterceptor;
 
     @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(getTokenInterceptor())
-                .excludePathPatterns("/swagger-resources/**", "/webjars/**", "/v2/**", "/swagger-ui.html/**");
-    }
-
-    @Bean
-    public IwepTokenInterceptor getTokenInterceptor(){
-        return new IwepTokenInterceptor();
+    protected void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/swagger-ui/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/");
+        super.addResourceHandlers(registry);
     }
 
     @Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        registry.addResourceHandler("swagger-ui.html")
-                .addResourceLocations("classpath:/META-INF/resources/");
-        registry.addResourceHandler("/webjars/**")
-                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+    protected void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(corsInterceptor)
+                .addPathPatterns("/**")
+                .excludePathPatterns("/swagger**/**")
+                .excludePathPatterns("/webjars/**")
+                .excludePathPatterns("/v3/**")
+                .excludePathPatterns("/doc.html");
+        super.addInterceptors(registry);
     }
-
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
                 .allowedOrigins("*")
                 .allowCredentials(true)
-                .allowedMethods("GET","POST", "DELETE", "PUT")
+                .allowedMethods("GET", "POST", "DELETE", "PUT", "PATCH")
                 .allowedHeaders("*")
                 .maxAge(3600 * 24);
     }