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

tests/examples/JDBC/springbootdemo/readme.md

@@ -14,7 +14,7 @@ spring.datasource.druid.max-active=5
 # max wait time for get connection, ms
 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.test-on-borrow=false
 spring.datasource.druid.test-on-return=false

tests/examples/JDBC/springbootdemo/src/main/resources/application.properties

@@ -10,7 +10,7 @@ spring.datasource.druid.max-active=5
 # max wait time for get connection, ms
 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.test-on-borrow=false
 spring.datasource.druid.test-on-return=false
@@ -23,4 +23,4 @@ spring.datasource.druid.max-evictable-idle-time-millis=900000
 #mybatis
 mybatis.mapper-locations=classpath:mapper/*.xml
 
-logging.level.com.taosdata.jdbc.springbootdemo.dao=debug
\ No newline at end of file
+logging.level.com.taosdata.jdbc.springbootdemo.dao=debug