From acf6b1167e1c30d9e1ff5712480d99d07914c175 Mon Sep 17 00:00:00 2001
From: b2baccline <23131013+b2baccline@users.noreply.github.com>
Date: Fri, 10 Jul 2020 20:24:37 +0800
Subject: [PATCH] =?UTF-8?q?:arrow=5Fup:=09swagger-annotation=20=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=201.5.21=20&=20=E5=85=A8=E5=B1=80=20swagger=20?=
 =?UTF-8?q?=E4=BE=9D=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-admin/ballcat-admin-core/pom.xml      |  2 -
 ballcat-dependencies/pom.xml                  | 36 +++++++++++++++++-
 .../pom.xml                                   | 38 ++++++++++++-------
 3 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/ballcat-admin/ballcat-admin-core/pom.xml b/ballcat-admin/ballcat-admin-core/pom.xml
index 48833946..e5b5bab2 100644
--- a/ballcat-admin/ballcat-admin-core/pom.xml
+++ b/ballcat-admin/ballcat-admin-core/pom.xml
@@ -38,12 +38,10 @@
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-spring-ui</artifactId>
-            <version>1.9.6</version>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.9.2</version>
         </dependency>
         <!--mybatis plus-->
         <dependency>
diff --git a/ballcat-dependencies/pom.xml b/ballcat-dependencies/pom.xml
index ff73c908..1e191014 100644
--- a/ballcat-dependencies/pom.xml
+++ b/ballcat-dependencies/pom.xml
@@ -42,10 +42,13 @@
 		<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
 		<spring-javaformat-checkstyle.version>0.0.22</spring-javaformat-checkstyle.version>
 
+		<springfox.version>2.9.2</springfox.version>
+		<swagger.version>1.5.21</swagger.version>
+		<knife4j.version>1.9.6</knife4j.version>
+
 		<hutool.version>5.2.5</hutool.version>
 		<mybatis-plus.version>3.3.2</mybatis-plus.version>
 		<dynamic-datasource.version>3.1.1</dynamic-datasource.version>
-		<swagger.core.version>1.5.2</swagger.core.version>
 		<xxl-job.version>2.2.0</xxl-job.version>
 		<spring-boot-admin.version>2.2.3</spring-boot-admin.version>
 		<oss.aliyun.version>3.8.0</oss.aliyun.version>
@@ -140,8 +143,37 @@
 			<dependency>
 				<groupId>io.swagger</groupId>
 				<artifactId>swagger-annotations</artifactId>
-				<version>${swagger.core.version}</version>
+				<version>${swagger.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>io.swagger</groupId>
+				<artifactId>swagger-models</artifactId>
+				<version>${swagger.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>io.springfox</groupId>
+				<artifactId>springfox-swagger2</artifactId>
+				<version>${springfox.version}</version>
+			</dependency>
+			<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>
+				<version>${springfox.version}</version>
+			</dependency>
+			<!-- swagger 增强版 ui -->
+			<dependency>
+				<groupId>com.github.xiaoymin</groupId>
+				<artifactId>knife4j-spring-ui</artifactId>
+				<version>${knife4j.version}</version>
+			</dependency>
+
+
 			<!--xxl-job-->
 			<dependency>
 				<groupId>com.xuxueli</groupId>
diff --git a/ballcat-starters/ballcat-spring-boot-starter-swagger/pom.xml b/ballcat-starters/ballcat-spring-boot-starter-swagger/pom.xml
index dc595010..04e7c6f1 100644
--- a/ballcat-starters/ballcat-spring-boot-starter-swagger/pom.xml
+++ b/ballcat-starters/ballcat-spring-boot-starter-swagger/pom.xml
@@ -15,19 +15,26 @@
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.swagger</groupId>
-                    <artifactId>swagger-models</artifactId>
-                </exclusion>
-            </exclusions>
-            <version>2.9.2</version>
-        </dependency>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.5.21</version>
-        </dependency>
+			<exclusions>
+				<exclusion>
+					<artifactId>swagger-models</artifactId>
+					<groupId>io.swagger</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>swagger-annotations</artifactId>
+					<groupId>io.swagger</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<artifactId>swagger-models</artifactId>
+			<groupId>io.swagger</groupId>
+		</dependency>
+		<dependency>
+			<artifactId>swagger-annotations</artifactId>
+			<groupId>io.swagger</groupId>
+		</dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
@@ -37,6 +44,11 @@
 			<artifactId>javax.servlet-api</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<artifactId>hutool-all</artifactId>
+		</dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>