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

@@ -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>

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>

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/
 

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>