Merge branches 'dev' and 'test' of http://git.estsh.com/i3-Andon/i3plus-andon into test

# Conflicts:
#	src/main/resources/application-dev.properties
版本合并  环境标识 test to docker

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

@@ -7,7 +7,7 @@ impp.console.ip=http://192.168.1.241:18010
 #服务注册中心(多注册中心逗号分隔)
 impp.cluster.regist.center=http://192.168.1.241:18000/eureka/
 #日志默认使用log4j2
-logging.config=classpath:log4j2-spring-prod.xml
+logging.config=classpath:log4j2-spring.xml
 
 ########平台相关参数##########
 #是否开启redis缓存