Merge remote-tracking branch 'origin/dev' into dev

luliqiang

2020-08-27 c49b95fc3576f9a5dad5bcaa6874157d5091f6e0

 kidgrow-jobs/kidgrow-jobs-admin/src/main/resources/application-test.properties

@@ -3,7 +3,7 @@
kidgrow.datasource.username=root
kidgrow.datasource.password=root

spring.datasource.url=jdbc:mysql://${kidgrow.datasource.ip}:3306/xxl_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
spring.datasource.url=jdbc:mysql://${kidgrow.datasource.ip}:3306/xxl_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
spring.datasource.username=${kidgrow.datasource.username}
spring.datasource.password=${kidgrow.datasource.password}