Merge branch 'develop' of https://github.com/taosdata/TDengine into develop

This commit is contained in:
slguan 2020-05-09 17:24:51 +08:00
commit 5f528d6403
2 changed files with 3 additions and 3 deletions

View File

@ -14,7 +14,7 @@ spring.datasource.druid.max-active=5
# max wait time for get connection, ms # max wait time for get connection, ms
spring.datasource.druid.max-wait=60000 spring.datasource.druid.max-wait=60000
spring.datasource.druid.validation-query=describe log.dn spring.datasource.druid.validation-query=select server_status();
spring.datasource.druid.validation-query-timeout=5000 spring.datasource.druid.validation-query-timeout=5000
spring.datasource.druid.test-on-borrow=false spring.datasource.druid.test-on-borrow=false
spring.datasource.druid.test-on-return=false spring.datasource.druid.test-on-return=false

View File

@ -10,7 +10,7 @@ spring.datasource.druid.max-active=5
# max wait time for get connection, ms # max wait time for get connection, ms
spring.datasource.druid.max-wait=60000 spring.datasource.druid.max-wait=60000
spring.datasource.druid.validation-query=describe log.dn spring.datasource.druid.validation-query=select server_status();
spring.datasource.druid.validation-query-timeout=5000 spring.datasource.druid.validation-query-timeout=5000
spring.datasource.druid.test-on-borrow=false spring.datasource.druid.test-on-borrow=false
spring.datasource.druid.test-on-return=false spring.datasource.druid.test-on-return=false