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

@@ -19,6 +19,7 @@ registry.nacos-server-addr=${nacos.url}
# 使用eurekaeureka使用nacos填nacos
registry.name=nacos
# zookeeper配置
spring.cloud.zookeeper.connect-string=${zookeeper.url}
# 测试环境