From 3663d63458a0fa3e7bdd47c643cd62a4842f5e9c Mon Sep 17 00:00:00 2001
From: acgist <289547414@qq.com>
Date: Sun, 20 Nov 2022 08:06:31 +0800
Subject: [PATCH] [+] springdoc

---
 README.md                                        |  4 ++++
 pom.xml                                          | 16 ++++++++--------
 ...tion.java => SpringDocAutoConfiguration.java} |  4 ++--
 ....boot.autoconfigure.AutoConfiguration.imports |  2 +-
 4 files changed, 15 insertions(+), 11 deletions(-)
 rename taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/{OpenApiAutoConfiguration.java => SpringDocAutoConfiguration.java} (97%)

diff --git a/README.md b/README.md
index 2693412..c46d057 100644
--- a/README.md
+++ b/README.md
@@ -71,3 +71,7 @@ MCU/SFU声音视频控制在服务端实现，如果没有终端订阅并且没
 
 终端推流到服务端，由服务端分流没有混音。
 
+## TODO
+
+springdoc升级正式版本
+springboot升级正式版本
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2835e20..3e66dcc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 		<ffmpeg.version>5.1.2</ffmpeg.version>
 		<lombok.version>1.18.24</lombok.version>
 		<kurento.version>6.18.0</kurento.version>
-		<springdoc.version>1.6.12</springdoc.version>
+		<springdoc.version>2.0.0-RC1</springdoc.version>
 		<mapstruct.version>1.5.3.Final</mapstruct.version>
 		<collections4.version>4.4</collections4.version>
 		<jitsi.ice4j.version>3.0-59-g71e244d</jitsi.ice4j.version>
@@ -72,11 +72,6 @@
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-collections4</artifactId>
 		</dependency>
-		<!-- 接口文档 -->
-		<dependency>
-			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-ui</artifactId>
-		</dependency>
 		<!-- Jackson -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
@@ -86,6 +81,11 @@
 			<groupId>com.fasterxml.jackson.datatype</groupId>
 			<artifactId>jackson-datatype-jsr310</artifactId>
 		</dependency>
+		<!-- 接口文档 -->
+		<dependency>
+			<groupId>org.springdoc</groupId>
+			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+		</dependency>
 		<!-- AOP -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -377,7 +377,7 @@
 				<dependencies>
 					<dependency>
 						<groupId>org.springdoc</groupId>
-						<artifactId>springdoc-openapi-ui</artifactId>
+						<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
 						<version>${springdoc.version}</version>
 					</dependency>
 				</dependencies>
@@ -408,7 +408,7 @@
 				<dependencies>
 					<dependency>
 						<groupId>org.springdoc</groupId>
-						<artifactId>springdoc-openapi-ui</artifactId>
+						<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
 						<version>${springdoc.version}</version>
 						<scope>provided</scope>
 					</dependency>
diff --git a/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/OpenApiAutoConfiguration.java b/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/SpringDocAutoConfiguration.java
similarity index 97%
rename from taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/OpenApiAutoConfiguration.java
rename to taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/SpringDocAutoConfiguration.java
index 82d623d..8cc80ce 100644
--- a/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/OpenApiAutoConfiguration.java
+++ b/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/SpringDocAutoConfiguration.java
@@ -2,7 +2,7 @@ package com.acgist.taoyao.boot.config;
 
 import java.util.List;
 
-import org.springdoc.core.GroupedOpenApi;
+import org.springdoc.core.models.GroupedOpenApi;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -27,7 +27,7 @@ import io.swagger.v3.oas.models.security.SecurityScheme;
 @Profile("dev")
 @Configuration
 @ConditionalOnClass(OpenAPI.class)
-public class OpenApiAutoConfiguration {
+public class SpringDocAutoConfiguration {
 
 	@Value("${server.port:8888}")
 	private Integer port;
diff --git a/taoyao-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/taoyao-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index ba5c725..57dc20f 100644
--- a/taoyao-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/taoyao-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,3 +1,3 @@
 com.acgist.taoyao.boot.config.BootAutoConfiguration
-com.acgist.taoyao.boot.config.OpenApiAutoConfiguration
+com.acgist.taoyao.boot.config.SpringDocAutoConfiguration
 com.acgist.taoyao.boot.config.WebMvcConfigurerAutoConfiguration