Merge branch 'master' of git@git.int.it2000.com.cn:airport-chengdu/admin-api.git

src/main/resources/application-dev.yml

@@ -6,6 +6,7 @@ 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
+      tomcat:
         max-active: 30
         test-on-borrow: true
         validation-query: SELECT 1
@@ -15,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:
@@ -24,6 +25,7 @@ spring:
       #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
+      tomcat:
         max-active: 30
         test-on-borrow: true
         validation-query: SELECT 1
@@ -33,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: