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

modules/i3plus-core-apiservice/src/main/resources/application-prod.properties

@@ -1,5 +1,5 @@
 #项目端口
-server.port=8100
+server.port=1100
 #本机ip
 impp.server.ip=192.168.1.56
 #console控制台服务（zipkin追踪全路径）
@@ -79,7 +79,7 @@ spring.zipkin.base-url=${impp.console.ip}
 spring.sleuth.sampler.probability=1.0
 
 ################ 日志据源 ################
-spring.data.mongodb.database=mongoDBSource
+spring.data.mongodb.database=prodMongoDBSource
 spring.data.mongodb.uri=192.168.1.55:27017
 spring.data.mongodb.username=sa
 spring.data.mongodb.password=i3plus
@@ -101,22 +101,22 @@ spring.data.mongodb.port=27017
 ##主数据源，读写
 #impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource
 impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver
-impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
-impp.write.datasource.username=i3_dev_core
-impp.write.datasource.password=i3_core_pass
+impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3309/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
+impp.write.datasource.username=impp_i3_core_user
+impp.write.datasource.password=impp_i3_core_pwd
 
 ##辅数据源，只读
 #impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource
 impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver
-impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
-impp.read.datasource.username=i3_dev_core
-impp.read.datasource.password=i3_core_pass
+impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3309/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
+impp.read.datasource.username=impp_i3_core_user
+impp.read.datasource.password=impp_i3_core_pwd
 
 ##############定时任务持久化##############
 impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver
-impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8
-impp.schedule.datasource.username=i3_dev_schedule
-impp.schedule.datasource.password=i3_schedule_pass
+impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3309/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8
+impp.schedule.datasource.username=impp_i3_schedule_user
+impp.schedule.datasource.password=impp_i3_schedule_pwd
 impp.schedule.datasource.max-connections=20
 #定时任务在服务启动后多少秒执行
 impp.schedule.start.after-second=20

modules/i3plus-core-apiservice/src/main/resources/application-test.properties

@@ -1,5 +1,22 @@
 #项目端口
 server.port=58100
+#本机ip
+impp.server.ip=192.168.1.56
+#console控制台服务（zipkin追踪全路径）
+impp.console.ip=http://cst.estsh.com
+
+################ 功能配置1 ################
+#若无法连接注册中心，是否需要一直检测加入
+impp.cluster.fetch=true
+#服务注册中心
+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/
+
+################ 功能配置2 ################
+#是否允许前端跨域提交impp.web.cross.hosts
+impp.web.cross = true
+
 ################ 授权过滤配置 ################
 #用户登陆路径
 filter.shiro.user.loginuri = /login