From 3caba5d77a4e2ec3b2de67a65fdd818f87562f7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Sun, 6 Oct 2019 20:51:26 +0800
Subject: [PATCH] =?UTF-8?q?:wrench:=20=E4=BF=AE=E6=94=B9swagger-bootstap-u?=
 =?UTF-8?q?i=20=E4=B8=BA=20knife4j?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pigx-common/pigx-common-swagger/pom.xml |  7 ++++++-
 pigx-gateway/pom.xml                    |  4 ++--
 pom.xml                                 | 13 +++----------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/pigx-common/pigx-common-swagger/pom.xml b/pigx-common/pigx-common-swagger/pom.xml
index d7b37f9ed..0eea82b0f 100644
--- a/pigx-common/pigx-common-swagger/pom.xml
+++ b/pigx-common/pigx-common-swagger/pom.xml
@@ -40,6 +40,11 @@
 			<artifactId>springfox-swagger2</artifactId>
 			<version>${swagger.fox.version}</version>
 		</dependency>
-
+		<!--knife4j是为Java MVC框架集成Swagger生成Api文档的增强-->
+		<dependency>
+			<groupId>com.github.xiaoymin</groupId>
+			<artifactId>knife4j-micro-spring-boot-starter</artifactId>
+			<version>${knife4j.version}</version>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml
index 9a95a209d..135c8a82c 100644
--- a/pigx-gateway/pom.xml
+++ b/pigx-gateway/pom.xml
@@ -86,8 +86,8 @@
 		</dependency>
 		<dependency>
 			<groupId>com.github.xiaoymin</groupId>
-			<artifactId>swagger-bootstrap-ui</artifactId>
-			<version>${swagger-bootstrap-ui.version}</version>
+			<artifactId>knife4j-spring-boot-starter</artifactId>
+			<version>${knife4j.version}</version>
 		</dependency>
 	</dependencies>
 
diff --git a/pom.xml b/pom.xml
index abaaaf8fc..a9525fa21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
 	</developers>
 
 	<properties>
-		<spring-boot.version>2.1.8.RELEASE</spring-boot.version>
+		<spring-boot.version>2.1.9.RELEASE</spring-boot.version>
 		<spring-cloud.version>Greenwich.SR3</spring-cloud.version>
 		<spring-cloud-alibaba.version>2.1.0.RELEASE</spring-cloud-alibaba.version>
 		<spring-platform.version>Cairo-SR8</spring-platform.version>
@@ -51,17 +51,16 @@
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<spring-boot-admin.version>2.1.6</spring-boot-admin.version>
-		<hutool.version>4.6.3</hutool.version>
+		<hutool.version>4.6.8</hutool.version>
 		<kaptcha.version>0.0.9</kaptcha.version>
 		<swagger.fox.version>2.9.2</swagger.fox.version>
-		<swagger-bootstrap-ui.version>1.9.6</swagger-bootstrap-ui.version>
+		<knife4j.version>1.9.6</knife4j.version>
 		<curator.version>2.10.0</curator.version>
 		<velocity.version>1.7</velocity.version>
 		<lcn.version>4.1.0</lcn.version>
 		<jasypt.version>2.1.1</jasypt.version>
 		<ttl.version>2.10.2</ttl.version>
 		<minio.version>6.0.8</minio.version>
-		<fastjson.version>1.2.58</fastjson.version>
 		<elastic-job-lite.version>2.1.5</elastic-job-lite.version>
 		<xxl.job.version>2.1.0</xxl.job.version>
 		<security.oauth.version>2.3.6.RELEASE</security.oauth.version>
@@ -180,12 +179,6 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
-			<!--https://gitee.wang/pig/pigx/issues/586-->
-			<dependency>
-				<groupId>com.alibaba</groupId>
-				<artifactId>fastjson</artifactId>
-				<version>${fastjson.version}</version>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>