From b382c5ae0096b46b5cdbc486274655318f087bf4 Mon Sep 17 00:00:00 2001
From: "wei.peng" <pengwei940613@163.com>
Date: Sat, 8 Dec 2018 01:12:47 +0800
Subject: [PATCH] Merge branches 'dev' and 'test' 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-prod.properties
#	modules/i3plus-core-apiservice/src/main/resources/application-test.properties
#	pom.xml
---
 modules/i3plus-core-api/pom.xml                                       | 2 +-
 modules/i3plus-core-apiservice/pom.xml                                | 2 +-
 .../src/main/resources/application-prod.properties                    | 4 ++--
 pom.xml                                                               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/i3plus-core-api/pom.xml b/modules/i3plus-core-api/pom.xml
index cbfbca2..155a733 100644
--- a/modules/i3plus-core-api/pom.xml
+++ b/modules/i3plus-core-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-core</artifactId>
         <groupId>i3plus.core</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml
index 50107af..b25c5d2 100644
--- a/modules/i3plus-core-apiservice/pom.xml
+++ b/modules/i3plus-core-apiservice/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-core</artifactId>
         <groupId>i3plus.core</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
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 586923c..5e6ea83 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=8100
 #本机ip
 impp.server.ip=192.168.1.56
 #console控制台服务（zipkin追踪全路径）
-impp.console.ip=http://cs.estsh.com
+impp.console.ip=http://cst.estsh.com
 
 ################ 功能配置1 ################
 #若无法连接注册中心，是否需要一直检测加入
 impp.cluster.fetch=true
 #服务注册中心
-impp.cluster.regist.center=http://reg.estsh.com/eureka/
+impp.cluster.regist.center=http://regt.estsh.com/eureka/
 #多注册中心
 #impp.cluster.regist.center=http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/
 
diff --git a/pom.xml b/pom.xml
index 0a79893..b2b1556 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>i3plus.core</groupId>
     <artifactId>i3plus-core</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-core-api</module>
         <module>modules/i3plus-core-apiservice</module>