Merge branch 'master' into registry-nacos

# Conflicts:
#	sop-gateway/src/main/resources/application-dev.properties
This commit is contained in:
tanghc
2019-07-19 10:14:32 +08:00
2 changed files with 2 additions and 0 deletions

View File

@@ -26,6 +26,7 @@ spring.cloud.zookeeper.connect-string=${zookeeper.url}
spring.cloud.zookeeper.baseSleepTimeMs=3000
spring.cloud.zookeeper.maxRetries=3
# 数据库配置
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
spring.datasource.url=jdbc:mysql://localhost:3306/sop?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
spring.datasource.username=${mysql.username}