From 94ef0d856feb1802a9a672ee079308497578ae6b Mon Sep 17 00:00:00 2001
From: 648540858 <18010473990@163.com>
Date: 星期四, 05 八月 2021 16:14:06 +0800
Subject: [PATCH] 修复关闭接口文档失效
---
src/main/resources/application-dev.yml | 6 +--
src/main/resources/all-application.yml | 6 +--
pom.xml | 3 +
src/main/java/com/genersoft/iot/vmp/conf/Swagger3Config.java | 48 ++++++++++++++++++------
4 files changed, 43 insertions(+), 20 deletions(-)
diff --git a/pom.xml b/pom.xml
index a1ac15a..49fa3b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,6 +253,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
</plugin>
</plugins>
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/Swagger3Config.java b/src/main/java/com/genersoft/iot/vmp/conf/Swagger3Config.java
index 47d29a9..d62ee1e 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/Swagger3Config.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/Swagger3Config.java
@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.conf;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import springfox.documentation.builders.ApiInfoBuilder;
@@ -13,49 +14,70 @@
@Configuration
public class Swagger3Config {
+ @Value("${swagger-ui.enabled}")
+ private boolean enable;
+
@Bean
public Docket createRestApi() {
return new Docket(DocumentationType.OAS_30)
.apiInfo(apiInfo())
- .groupName("鍏ㄩ儴")
+ .groupName("1. 鍏ㄩ儴")
.select()
.apis(RequestHandlerSelectors.basePackage("com.genersoft.iot.vmp.vmanager"))
.paths(PathSelectors.any())
.build()
- .pathMapping("/");
+ .pathMapping("/")
+ .enable(enable);
}
@Bean
public Docket createRestGBApi() {
return new Docket(DocumentationType.OAS_30)
.apiInfo(apiInfo())
- .groupName("鍥芥爣")
+ .groupName("2. 鍥芥爣28181")
.select()
.apis(RequestHandlerSelectors.basePackage("com.genersoft.iot.vmp.vmanager.gb28181"))
.paths(PathSelectors.any())
.build()
- .pathMapping("/");
+ .pathMapping("/")
+ .enable(enable);
}
+
+ @Bean
+ public Docket createRestONVIFApi() {
+ return new Docket(DocumentationType.OAS_30)
+ .apiInfo(apiInfo())
+ .groupName("3. ONVIF")
+ .select()
+ .apis(RequestHandlerSelectors.basePackage("com.genersoft.iot.vmp.vmanager.onvif"))
+ .paths(PathSelectors.any())
+ .build()
+ .pathMapping("/")
+ .enable(enable);
+ }
+
@Bean
public Docket createRestStreamProxyApi() {
return new Docket(DocumentationType.OAS_30)
.apiInfo(apiInfo())
- .groupName("鎷夋祦杞彂")
+ .groupName("4. 鎷夋祦杞彂")
.select()
.apis(RequestHandlerSelectors.basePackage("com.genersoft.iot.vmp.vmanager.streamProxy"))
.paths(PathSelectors.any())
.build()
- .pathMapping("/");
+ .pathMapping("/")
+ .enable(enable);
}
@Bean
public Docket createRestStreamPushApi() {
return new Docket(DocumentationType.OAS_30)
.apiInfo(apiInfo())
- .groupName("鎺ㄦ祦绠＄悊")
+ .groupName("5. 鎺ㄦ祦绠＄悊")
.select()
.apis(RequestHandlerSelectors.basePackage("com.genersoft.iot.vmp.vmanager.streamPush"))
.paths(PathSelectors.any())
.build()
- .pathMapping("/");
+ .pathMapping("/")
+ .enable(enable);
}
@@ -63,23 +85,25 @@
public Docket createServerApi() {
return new Docket(DocumentationType.OAS_30)
.apiInfo(apiInfo())
- .groupName("鏈嶅姟绠＄悊")
+ .groupName("6. 鏈嶅姟绠＄悊")
.select()
.apis(RequestHandlerSelectors.basePackage("com.genersoft.iot.vmp.vmanager.server"))
.paths(PathSelectors.any())
.build()
- .pathMapping("/");
+ .pathMapping("/")
+ .enable(enable);
}
@Bean
public Docket createUserApi() {
return new Docket(DocumentationType.OAS_30)
.apiInfo(apiInfo())
- .groupName("鐢ㄦ埛绠＄悊")
+ .groupName("7. 鐢ㄦ埛绠＄悊")
.select()
.apis(RequestHandlerSelectors.basePackage("com.genersoft.iot.vmp.vmanager.user"))
.paths(PathSelectors.any())
.build()
- .pathMapping("/");
+ .pathMapping("/")
+ .enable(enable);
}
private ApiInfo apiInfo() {
diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index c4bd7ca..fdd81b1 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -152,7 +152,5 @@
record-push-live: true
# 鍦ㄧ嚎鏂囨。锛� swagger-ui锛堢敓浜х幆澧冨缓璁叧闂級
-springfox:
- documentation:
- swagger-ui:
- enabled: true
\ No newline at end of file
+swagger-ui:
+ enabled: true
\ No newline at end of file
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index dd2e0f7..f0cb8f8 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -84,7 +84,5 @@
record-push-live: true
# 鍦ㄧ嚎鏂囨。锛� swagger-ui锛堢敓浜х幆澧冨缓璁叧闂級
-springfox:
- documentation:
- swagger-ui:
- enabled: true
\ No newline at end of file
+swagger-ui:
+ enabled: true
\ No newline at end of file
--
Gitblit v1.8.0