From 9b4c0dc23fb759608b2d2da6c844dae2a5627d07 Mon Sep 17 00:00:00 2001
From: b2baccline <23131013+b2baccline@users.noreply.github.com>
Date: Fri, 10 Dec 2021 19:31:59 +0800
Subject: [PATCH] =?UTF-8?q?:wrench:=20springdoc-openapi=20=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ballcat-common/ballcat-common-model/pom.xml |  9 ++-
 ballcat-dependencies/pom.xml                | 62 ++++++++++++++++++++-
 ballcat-log/ballcat-log-model/pom.xml       | 10 ++--
 3 files changed, 68 insertions(+), 13 deletions(-)

diff --git a/ballcat-common/ballcat-common-model/pom.xml b/ballcat-common/ballcat-common-model/pom.xml
index 6f4ba44d..6bc34b29 100644
--- a/ballcat-common/ballcat-common-model/pom.xml
+++ b/ballcat-common/ballcat-common-model/pom.xml
@@ -20,6 +20,10 @@
 			<groupId>io.swagger.core.v3</groupId>
 			<artifactId>swagger-annotations</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springdoc</groupId>
+			<artifactId>springdoc-openapi-common</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>javax.validation</groupId>
 			<artifactId>validation-api</artifactId>
@@ -32,11 +36,6 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-annotation</artifactId>
         </dependency>
-		<dependency>
-			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-common</artifactId>
-			<version>1.5.13</version>
-		</dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/ballcat-dependencies/pom.xml b/ballcat-dependencies/pom.xml
index ee024704..3e35a5fe 100644
--- a/ballcat-dependencies/pom.xml
+++ b/ballcat-dependencies/pom.xml
@@ -47,6 +47,7 @@
 		<springfox.version>3.0.0</springfox.version>
 		<swagger.version>1.5.21</swagger.version>
 		<io.swagger.v3.version>2.1.11</io.swagger.v3.version>
+		<springdoc-openapi.verison>1.5.13</springdoc-openapi.verison>
 		<knife4j.version>2.0.9</knife4j.version>
 		<kafka.version>2.5.0</kafka.version>
 		<hutool.version>5.7.16</hutool.version>
@@ -368,7 +369,7 @@
 				<version>${revision}</version>
 			</dependency>
 
-			<!--swagger注解-->
+			<!--swagger v3-->
 			<dependency>
 				<groupId>io.swagger.core.v3</groupId>
 				<artifactId>swagger-annotations</artifactId>
@@ -379,6 +380,7 @@
 				<artifactId>swagger-models</artifactId>
 				<version>${io.swagger.v3.version}</version>
 			</dependency>
+			<!--swagger v2-->
 			<dependency>
 				<groupId>io.swagger</groupId>
 				<artifactId>swagger-annotations</artifactId>
@@ -389,12 +391,68 @@
 				<artifactId>swagger-models</artifactId>
 				<version>${swagger.version}</version>
 			</dependency>
+			<!-- SpringDoc -->
+			<dependency>
+				<groupId>org.springdoc</groupId>
+				<artifactId>springdoc-openapi-common</artifactId>
+				<version>${springdoc-openapi.verison}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springdoc</groupId>
+				<artifactId>springdoc-openapi-webmvc-core</artifactId>
+				<version>${springdoc-openapi.verison}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springdoc</groupId>
+				<artifactId>springdoc-openapi-webflux-core</artifactId>
+				<version>${springdoc-openapi.verison}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springdoc</groupId>
+				<artifactId>springdoc-openapi-kotlin</artifactId>
+				<version>${springdoc-openapi.verison}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springdoc</groupId>
+				<artifactId>springdoc-openapi-hateoas</artifactId>
+				<version>${springdoc-openapi.verison}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springdoc</groupId>
+				<artifactId>springdoc-openapi-data-rest</artifactId>
+				<version>${springdoc-openapi.verison}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springdoc</groupId>
+				<artifactId>springdoc-openapi-security</artifactId>
+				<version>${springdoc-openapi.verison}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springdoc</groupId>
+				<artifactId>springdoc-openapi-groovy</artifactId>
+				<version>${springdoc-openapi.verison}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springdoc</groupId>
+				<artifactId>springdoc-openapi-ui</artifactId>
+				<version>${springdoc-openapi.verison}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springdoc</groupId>
+				<artifactId>springdoc-openapi-webflux-ui</artifactId>
+				<version>${springdoc-openapi.verison}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springdoc</groupId>
+				<artifactId>springdoc-openapi-javadoc</artifactId>
+				<version>${springdoc-openapi.verison}</version>
+			</dependency>
+			<!-- SpringFox -->
 			<dependency>
 				<groupId>io.springfox</groupId>
 				<artifactId>springfox-swagger2</artifactId>
 				<version>${springfox.version}</version>
 			</dependency>
-			<!-- springfox swagger ui -->
 			<dependency>
 				<groupId>io.springfox</groupId>
 				<artifactId>springfox-swagger-ui</artifactId>
diff --git a/ballcat-log/ballcat-log-model/pom.xml b/ballcat-log/ballcat-log-model/pom.xml
index 64950657..8d1b14ca 100644
--- a/ballcat-log/ballcat-log-model/pom.xml
+++ b/ballcat-log/ballcat-log-model/pom.xml
@@ -20,6 +20,10 @@
 			<groupId>io.swagger.core.v3</groupId>
 			<artifactId>swagger-annotations</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springdoc</groupId>
+			<artifactId>springdoc-openapi-common</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
@@ -28,11 +32,5 @@
 			<groupId>cn.hutool</groupId>
 			<artifactId>hutool-core</artifactId>
 		</dependency>
-        <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-common</artifactId>
-            <version>1.5.13</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 </project>
\ No newline at end of file