From 879683a64622ce8d02ec742cabd48520e884d000 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Sat, 8 Dec 2018 01:15:34 +0800 Subject: [PATCH] Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core into test # Conflicts: # modules/i3plus-core-api/pom.xml # modules/i3plus-core-apiservice/pom.xml # modules/i3plus-core-apiservice/src/main/resources/application-test.properties # pom.xml --- .../src/main/resources/application-prod.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties index a455346..214ecea 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties @@ -3,13 +3,13 @@ server.port=1100 #本机ip impp.server.ip=192.168.1.56 #console控制台服务（zipkin追踪全路径） -impp.console.ip=http://cst.estsh.com +impp.console.ip=http://cs.estsh.com ################ 功能配置1 ################ #若无法连接注册中心，是否需要一直检测加入 impp.cluster.fetch=true #服务注册中心 -impp.cluster.regist.center=http://regt.estsh.com/eureka/ +impp.cluster.regist.center=http://reg.estsh.com/eureka/ #多注册中心 #impp.cluster.regist.center=http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/