From 95cf1da4395ab508075394912b4b81a8e0135f4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Tue, 12 May 2020 18:37:55 +0800
Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.#1194=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4pigx-common-bom=20=E4=BC=98=E5=85=88=E7=BA=A7?=
 =?UTF-8?q?,dependencyManagement=20=E6=9C=80=E9=AB=98=20=20#1195=20?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=20mysql=208.0.20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/Dockerfile                       |  2 +-
 pigx-common/pigx-common-bom/pom.xml | 23 +++++++++++++++++++----
 pom.xml                             | 24 ++++++++++--------------
 3 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/db/Dockerfile b/db/Dockerfile
index b286c6427..7a99ac1e5 100644
--- a/db/Dockerfile
+++ b/db/Dockerfile
@@ -1,4 +1,4 @@
-FROM mysql:8.0.19
+FROM mysql:8.0.20
 
 MAINTAINER lengleng(wangiegie@gmail.com)
 
diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml
index 6b4e8b043..2179e5f62 100644
--- a/pigx-common/pigx-common-bom/pom.xml
+++ b/pigx-common/pigx-common-bom/pom.xml
@@ -21,10 +21,12 @@
 		<mybatis-plus.version>3.3.1</mybatis-plus.version>
 		<dynamic-ds.version>3.0.0</dynamic-ds.version>
 		<druid.version>1.1.21</druid.version>
-		<mysql.connector.version>8.0.19</mysql.connector.version>
+		<mysql.connector.version>8.0.20</mysql.connector.version>
 		<swagger.core.version>1.5.22</swagger.core.version>
 		<mp.weixin.version>3.7.0</mp.weixin.version>
 		<ijpay.version>1.2.0</ijpay.version>
+		<groovy.version>3.0.3</groovy.version>
+		<security.oauth.version>2.3.6.RELEASE</security.oauth.version>
 		<fastjson.version>1.2.67</fastjson.version>
 		<aliyun.version>3.0.52.ALL</aliyun.version>
 	</properties>
@@ -118,6 +120,11 @@
 				<artifactId>mybatis-plus-boot-starter</artifactId>
 				<version>${mybatis-plus.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.baomidou</groupId>
+				<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+				<version>${dynamic-ds.version}</version>
+			</dependency>
 			<!-- druid 连接池 -->
 			<dependency>
 				<groupId>com.alibaba</groupId>
@@ -158,6 +165,7 @@
 				<artifactId>weixin-java-common</artifactId>
 				<version>${mp.weixin.version}</version>
 			</dependency>
+			<!--支付相关SDK-->
 			<dependency>
 				<groupId>com.github.javen205</groupId>
 				<artifactId>IJPay</artifactId>
@@ -168,10 +176,17 @@
 				<artifactId>alipay-sdk-java</artifactId>
 				<version>${aliyun.version}</version>
 			</dependency>
+			<!--定义groovy 版本-->
 			<dependency>
-				<groupId>com.baomidou</groupId>
-				<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-				<version>${dynamic-ds.version}</version>
+				<groupId>org.codehaus.groovy</groupId>
+				<artifactId>groovy</artifactId>
+				<version>${groovy.version}</version>
+			</dependency>
+			<!--稳定版本，替代spring security bom内置-->
+			<dependency>
+				<groupId>org.springframework.security.oauth</groupId>
+				<artifactId>spring-security-oauth2</artifactId>
+				<version>${security.oauth.version}</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
diff --git a/pom.xml b/pom.xml
index 956daadd9..1d0853834 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,6 @@
 		<ttl.version>2.11.4</ttl.version>
 		<minio.version>6.0.13</minio.version>
 		<xxl.job.version>2.2.0</xxl.job.version>
-		<security.oauth.version>2.3.6.RELEASE</security.oauth.version>
 		<activiti.version>5.22.0</activiti.version>
 		<docker.registry>172.17.0.111</docker.registry>
 		<docker.host>http://172.17.0.111:2375</docker.host>
@@ -111,6 +110,15 @@
 
 	<dependencyManagement>
 		<dependencies>
+			<!--pigx 公共版本定义-->
+			<dependency>
+				<groupId>com.pig4cloud</groupId>
+				<artifactId>pigx-common-bom</artifactId>
+				<version>${project.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<!--spring boot 公共版本定义-->
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-dependencies</artifactId>
@@ -118,6 +126,7 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<!--spring cloud 公共版本定义-->
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
@@ -125,13 +134,6 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>com.pig4cloud</groupId>
-				<artifactId>pigx-common-bom</artifactId>
-				<version>${project.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
 			<!--spring cloud alibaba-->
 			<dependency>
 				<groupId>com.alibaba.cloud</groupId>
@@ -140,12 +142,6 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<!--稳定版本，替代spring security bom内置-->
-			<dependency>
-				<groupId>org.springframework.security.oauth</groupId>
-				<artifactId>spring-security-oauth2</artifactId>
-				<version>${security.oauth.version}</version>
-			</dependency>
 			<!--web 模块-->
 			<dependency>
 				<groupId>org.springframework.boot</groupId>