Merge branch 'master' into registry-nacos

This commit is contained in:
tanghc
2019-07-18 17:44:12 +08:00
31 changed files with 197 additions and 71 deletions

View File

@@ -25,7 +25,7 @@
<dependency>
<groupId>com.gitee.sop</groupId>
<artifactId>sop-registry-api</artifactId>
<version>1.12.3-SNAPSHOT</version>
<version>1.12.4-SNAPSHOT</version>
</dependency>
<dependency>

View File

@@ -12,7 +12,7 @@ nacos.url=127.0.0.1:8848
# ------- 需要改的配置end -------
# 注册中心地址,根据实际情况改,这里只是参数,并不会去注册
# eureka注册中心地址,这里只是参数,并不会去注册
registry.eureka-server-addr=${eureka.url}
# nacos服务器地址
registry.nacos-server-addr=${nacos.url}