From 852b4c56c728c5a789e05934036af20dadfd8c45 Mon Sep 17 00:00:00 2001
From: "jack.jia" <jack.jia@estsh.com>
Date: Tue, 4 Aug 2020 20:58:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=BF=9E=E6=8E=A5=E6=B1=A0?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-dev.properties   | 21 ++++++++++-----------
 .../main/resources/application-docker.properties    | 21 ++++++++++-----------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
index fda1e21..af74f42 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
@@ -45,17 +45,16 @@ impp.mq.queue.sweb.notice=true
 spring.datasource.validationQuery=SELECT 1
 
 ################ \u6570\u636E\u6C60\u8BBE\u7F6E ################
-spring.datasource.maximum-pool-size=10
-spring.datasource.max-active=5
-spring.datasource.max-idle=5
-spring.datasource.min-idle=1
-spring.datasource.initial-size=1
-spring.datasource.max-wait=10000
-spring.datasource.validation-query=SELECT 1
-spring.datasource.test-on-borrow=false
-spring.datasource.test-while-idle=true
-spring.datasource.time-between-eviction-runs-millis=300000
-
+## \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF0C\u9ED8\u8BA4\u662F10
+spring.datasource.hikari.maximum-pool-size=100
+## \u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5\u6570\u91CF
+spring.datasource.hikari.minimum-idle=10
+## \u7A7A\u95F2\u8FDE\u63A5\u5B58\u6D3B\u6700\u5927\u65F6\u95F4\uFF0C\u9ED8\u8BA4600000\uFF0810\u5206\u949F\uFF09
+spring.datasource.hikari.idle-timeout=600000
+## \u6B64\u5C5E\u6027\u63A7\u5236\u6C60\u4E2D\u8FDE\u63A5\u7684\u6700\u957F\u751F\u547D\u5468\u671F\uFF0C\u503C0\u8868\u793A\u65E0\u9650\u751F\u547D\u5468\u671F\uFF0C\u9ED8\u8BA41800000\u537330\u5206\u949F
+spring.datasource.hikari.max-lifetime=1800000
+## \u6570\u636E\u5E93\u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4,\u9ED8\u8BA430\u79D2\uFF0C\u537330000
+spring.datasource.hikari.connection-timeout=30000
 ##\u4E3B\u6570\u636E\u6E90\uFF0C\u8BFB\u5199
 #impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource
 impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver
diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties b/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties
index ab6bd48..d341e85 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties
@@ -46,17 +46,16 @@ impp.mq.queue.sweb.notice=true
 spring.datasource.validationQuery=SELECT 1
 
 ################ \u6570\u636E\u6C60\u8BBE\u7F6E ################
-spring.datasource.maximum-pool-size=10
-spring.datasource.max-active=5
-spring.datasource.max-idle=5
-spring.datasource.min-idle=1
-spring.datasource.initial-size=1
-spring.datasource.max-wait=10000
-spring.datasource.validation-query=SELECT 1
-spring.datasource.test-on-borrow=false
-spring.datasource.test-while-idle=true
-spring.datasource.time-between-eviction-runs-millis=300000
-
+## \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF0C\u9ED8\u8BA4\u662F10
+spring.datasource.hikari.maximum-pool-size=100
+## \u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5\u6570\u91CF
+spring.datasource.hikari.minimum-idle=10
+## \u7A7A\u95F2\u8FDE\u63A5\u5B58\u6D3B\u6700\u5927\u65F6\u95F4\uFF0C\u9ED8\u8BA4600000\uFF0810\u5206\u949F\uFF09
+spring.datasource.hikari.idle-timeout=600000
+## \u6B64\u5C5E\u6027\u63A7\u5236\u6C60\u4E2D\u8FDE\u63A5\u7684\u6700\u957F\u751F\u547D\u5468\u671F\uFF0C\u503C0\u8868\u793A\u65E0\u9650\u751F\u547D\u5468\u671F\uFF0C\u9ED8\u8BA41800000\u537330\u5206\u949F
+spring.datasource.hikari.max-lifetime=1800000
+## \u6570\u636E\u5E93\u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4,\u9ED8\u8BA430\u79D2\uFF0C\u537330000
+spring.datasource.hikari.connection-timeout=30000
 ##\u4E3B\u6570\u636E\u6E90\uFF0C\u8BFB\u5199
 #impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource
 impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver