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

This commit is contained in:
zhouxiunai
2018-12-20 18:03:26 +08:00
+26 -24
View File
@@ -6,36 +6,38 @@ spring:
username: cdairport username: cdairport
password: 123456 password: 123456
url: jdbc:mysql://130.120.3.158:3306/cdairport?useSSL=false&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&autoReconnect=true url: jdbc:mysql://130.120.3.158:3306/cdairport?useSSL=false&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&autoReconnect=true
max-active: 30 tomcat:
test-on-borrow: true max-active: 30
validation-query: SELECT 1 test-on-borrow: true
initial-size: 10 validation-query: SELECT 1
min-idle: 1 initial-size: 10
max-wait: 60000 min-idle: 1
time-between-eviction-runs-millis: 60000 max-wait: 60000
min-evictable-idle-time-millis: 300000 time-between-eviction-runs-millis: 60000
test-while-idle: true min-evictable-idle-time-millis: 300000
test-on-return: false test-while-idle: true
pool-prepared-statements: false test-on-return: true
max-pool-prepared-statement-per-connection-size: 20 pool-prepared-statements: false
max-pool-prepared-statement-per-connection-size: 20
secondary: secondary:
username: ommsxc username: ommsxc
password: ommsxc password: ommsxc
#url: jdbc:oracle:thin:@130.120.3.236:1521/xe #url: jdbc:oracle:thin:@130.120.3.236:1521/xe
url: jdbc:oracle:thin:@130.120.2.105:1521/orcl url: jdbc:oracle:thin:@130.120.2.105:1521/orcl
driver: oracle.jdbc.driver.OracleDriver driver: oracle.jdbc.driver.OracleDriver
max-active: 30 tomcat:
test-on-borrow: true max-active: 30
validation-query: SELECT 1 test-on-borrow: true
initial-size: 10 validation-query: SELECT 1
min-idle: 1 initial-size: 10
max-wait: 60000 min-idle: 1
time-between-eviction-runs-millis: 60000 max-wait: 60000
min-evictable-idle-time-millis: 300000 time-between-eviction-runs-millis: 60000
test-while-idle: true min-evictable-idle-time-millis: 300000
test-on-return: false test-while-idle: true
pool-prepared-statements: false test-on-return: true
max-pool-prepared-statement-per-connection-size: 20 pool-prepared-statements: false
max-pool-prepared-statement-per-connection-size: 20
sysApi: sysApi:
host: 130.120.3.231 host: 130.120.3.231
port: 93 port: 93