From 4a62296a221b9afad15f87f58532c4966603df8f Mon Sep 17 00:00:00 2001
From: fanghongchao <601470458@qq.com>
Date: Thu, 20 Dec 2018 16:51:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=96=AD=E5=BC=80?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-dev.yml | 50 +++++++++++++-------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 1dd4145..52c2301 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -6,36 +6,38 @@ spring:
       username: cdairport
       password: 123456
       url: jdbc:mysql://130.120.3.158:3306/cdairport?useSSL=false&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&autoReconnect=true
-      max-active: 30
-      test-on-borrow: true
-      validation-query: SELECT 1
-      initial-size: 10
-      min-idle: 1
-      max-wait: 60000
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 300000
-      test-while-idle: true
-      test-on-return: false
-      pool-prepared-statements: false
-      max-pool-prepared-statement-per-connection-size: 20
+      tomcat:
+        max-active: 30
+        test-on-borrow: true
+        validation-query: SELECT 1
+        initial-size: 10
+        min-idle: 1
+        max-wait: 60000
+        time-between-eviction-runs-millis: 60000
+        min-evictable-idle-time-millis: 300000
+        test-while-idle: true
+        test-on-return: false
+        pool-prepared-statements: false
+        max-pool-prepared-statement-per-connection-size: 20
     secondary:
       username: ommsxc
       password: ommsxc
       #url: jdbc:oracle:thin:@130.120.3.236:1521/xe
       url: jdbc:oracle:thin:@130.120.2.105:1521/orcl
       driver: oracle.jdbc.driver.OracleDriver
-      max-active: 30
-      test-on-borrow: true
-      validation-query: SELECT 1
-      initial-size: 10
-      min-idle: 1
-      max-wait: 60000
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 300000
-      test-while-idle: true
-      test-on-return: false
-      pool-prepared-statements: false
-      max-pool-prepared-statement-per-connection-size: 20
+      tomcat:
+        max-active: 30
+        test-on-borrow: true
+        validation-query: SELECT 1
+        initial-size: 10
+        min-idle: 1
+        max-wait: 60000
+        time-between-eviction-runs-millis: 60000
+        min-evictable-idle-time-millis: 300000
+        test-while-idle: true
+        test-on-return: false
+        pool-prepared-statements: false
+        max-pool-prepared-statement-per-connection-size: 20
 sysApi:
   host: 130.120.3.231
   port: 93

From 67b4b89edfe3e34fb8d9d3e2fd765f56c68e3004 Mon Sep 17 00:00:00 2001
From: fanghongchao <601470458@qq.com>
Date: Thu, 20 Dec 2018 17:28:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=96=AD=E5=BC=80=20?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=88=9B=E5=BB=BA=E6=96=B0=E7=9A=84=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-dev.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 52c2301..5f902e2 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -16,7 +16,7 @@ spring:
         time-between-eviction-runs-millis: 60000
         min-evictable-idle-time-millis: 300000
         test-while-idle: true
-        test-on-return: false
+        test-on-return: true
         pool-prepared-statements: false
         max-pool-prepared-statement-per-connection-size: 20
     secondary:
@@ -35,7 +35,7 @@ spring:
         time-between-eviction-runs-millis: 60000
         min-evictable-idle-time-millis: 300000
         test-while-idle: true
-        test-on-return: false
+        test-on-return: true
         pool-prepared-statements: false
         max-pool-prepared-statement-per-connection-size: 20
 sysApi: