Przeglądaj źródła

1.1.0 更新swagger

xiaofei 1 rok temu
rodzic
commit
98b13aef8e

+ 5 - 24
pom.xml

@@ -77,19 +77,9 @@
                 <version>${qmth.boot.version}</version>
                 <version>${qmth.boot.version}</version>
             </dependency>
             </dependency>
             <dependency>
             <dependency>
-                <groupId>io.springfox</groupId>
-                <artifactId>springfox-swagger-ui</artifactId>
-                <version>${swagger2.version}</version>
-            </dependency>
-            <!--            <dependency>-->
-            <!--                <groupId>com.github.xiaoymin</groupId>-->
-            <!--                <artifactId>swagger-bootstrap-ui</artifactId>-->
-            <!--                <version>${swagger2-bootstrap.version}</version>-->
-            <!--            </dependency>-->
-            <dependency>
-                <groupId>io.springfox</groupId>
-                <artifactId>springfox-swagger2</artifactId>
-                <version>${swagger2.version}</version>
+                <groupId>com.github.xiaoymin</groupId>
+                <artifactId>knife4j-spring-boot-starter</artifactId>
+                <version>3.0.3</version>
             </dependency>
             </dependency>
             <dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <groupId>org.apache.commons</groupId>
@@ -259,17 +249,8 @@
             <artifactId>core-solar</artifactId>
             <artifactId>core-solar</artifactId>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-        </dependency>
-        <!--            <dependency>-->
-        <!--                <groupId>com.github.xiaoymin</groupId>-->
-        <!--                <artifactId>swagger-bootstrap-ui</artifactId>-->
-        <!--                <version>${swagger2-bootstrap.version}</version>-->
-        <!--            </dependency>-->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <groupId>org.apache.commons</groupId>

+ 2 - 2
src/main/java/com/qmth/eds/core/config/MapApiReader.java

@@ -1,10 +1,9 @@
 package com.qmth.eds.core.config;
 package com.qmth.eds.core.config;
 
 
 import com.fasterxml.classmate.TypeResolver;
 import com.fasterxml.classmate.TypeResolver;
-import com.google.common.base.Optional;
-import com.qmth.eds.common.contant.SystemConstant;
 import com.qmth.eds.common.annotation.ApiJsonObject;
 import com.qmth.eds.common.annotation.ApiJsonObject;
 import com.qmth.eds.common.annotation.ApiJsonProperty;
 import com.qmth.eds.common.annotation.ApiJsonProperty;
+import com.qmth.eds.common.contant.SystemConstant;
 import org.apache.ibatis.javassist.*;
 import org.apache.ibatis.javassist.*;
 import org.apache.ibatis.javassist.bytecode.AnnotationsAttribute;
 import org.apache.ibatis.javassist.bytecode.AnnotationsAttribute;
 import org.apache.ibatis.javassist.bytecode.ConstPool;
 import org.apache.ibatis.javassist.bytecode.ConstPool;
@@ -23,6 +22,7 @@ import springfox.documentation.spi.service.ParameterBuilderPlugin;
 import springfox.documentation.spi.service.contexts.ParameterContext;
 import springfox.documentation.spi.service.contexts.ParameterContext;
 
 
 import java.util.Map;
 import java.util.Map;
+import java.util.Optional;
 
 
 /**
 /**
  * @Description: swagger2 map参数说明插件
  * @Description: swagger2 map参数说明插件

+ 3 - 4
src/main/java/com/qmth/eds/core/config/SwaggerConfig.java

@@ -1,6 +1,5 @@
 package com.qmth.eds.core.config;
 package com.qmth.eds.core.config;
 
 
-import com.google.common.base.Predicates;
 import com.qmth.eds.common.contant.SystemConstant;
 import com.qmth.eds.common.contant.SystemConstant;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Configuration;
@@ -12,7 +11,7 @@ import springfox.documentation.service.ApiInfo;
 import springfox.documentation.service.Parameter;
 import springfox.documentation.service.Parameter;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
+import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
@@ -25,7 +24,7 @@ import java.util.List;
  * @Date: 2019/9/21
  * @Date: 2019/9/21
  */
  */
 @Configuration
 @Configuration
-@EnableSwagger2
+@EnableSwagger2WebMvc
 public class SwaggerConfig {
 public class SwaggerConfig {
 
 
     @Bean
     @Bean
@@ -57,7 +56,7 @@ public class SwaggerConfig {
 //                .apis(RequestHandlerSelectors.any())
 //                .apis(RequestHandlerSelectors.any())
                 .paths(PathSelectors.any())
                 .paths(PathSelectors.any())
                 // 不显示错误的接口地址
                 // 不显示错误的接口地址
-                .paths(Predicates.not(PathSelectors.regex("/error.*")))// 错误路径不监控
+                .paths(PathSelectors.any())// 错误路径不监控
                 .build()
                 .build()
                 .globalOperationParameters(pars)
                 .globalOperationParameters(pars)
                 .apiInfo(apiInfo());
                 .apiInfo(apiInfo());