From d9e7a740cf9206576be4a86401c6a2971eb7bb6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Tue, 29 Oct 2019 10:17:16 +0800
Subject: [PATCH] :arrow_up: Upgrading dependencies. hutool 5.0.3 druid 1.1.20

---
 pigx-common/pigx-common-bom/pom.xml            | 2 +-
 pigx-register/src/main/resources/bootstrap.yml | 4 ++--
 pom.xml                                        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml
index b5e3307bd..9ab45b5cd 100644
--- a/pigx-common/pigx-common-bom/pom.xml
+++ b/pigx-common/pigx-common-bom/pom.xml
@@ -18,7 +18,7 @@
 	<properties>
 		<pigx.version>3.5.0</pigx.version>
 		<mybatis-plus.version>3.1.0</mybatis-plus.version>
-		<druid.version>1.1.18</druid.version>
+		<druid.version>1.1.20</druid.version>
 		<mysql.connector.version>8.0.16</mysql.connector.version>
 		<swagger.core.version>1.5.22</swagger.core.version>
 		<mp.weixin.version>3.3.0</mp.weixin.version>
diff --git a/pigx-register/src/main/resources/bootstrap.yml b/pigx-register/src/main/resources/bootstrap.yml
index c6243dc6c..0eec1b8f0 100755
--- a/pigx-register/src/main/resources/bootstrap.yml
+++ b/pigx-register/src/main/resources/bootstrap.yml
@@ -10,8 +10,8 @@ nacos:
 
 db:
   num: 1
-  user: root
-  password: root
+  user: ${MYSQL-USER:root}
+  password: ${MYSQL-PWD:root}
   url:
     0: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
 
diff --git a/pom.xml b/pom.xml
index b048e6a6d..91da11990 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
 		<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.10</hutool.version>
+		<hutool.version>5.0.3</hutool.version>
 		<kaptcha.version>0.0.9</kaptcha.version>
 		<swagger.fox.version>2.9.2</swagger.fox.version>
 		<knife4j.version>1.9.6</knife4j.version>