From 725cfb8ec675a47358ec76e3e146f788cad41a88 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Fri, 21 Jun 2019 18:25:59 +0800
Subject: [PATCH] Merge branches 'dev' and 'test' of
 http://git.estsh.com/i3-Andon/i3plus-andon into test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Conflicts:
#	src/main/resources/application-dev.properties
版本合并  环境标识 test to docker
---
 .../src/main/resources/application-prod.properties                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 450f9f9..cc10db9 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
+++ b/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缓存