From 439dceb9ba4b9f213b04f3b2fc9dba14e10ec347 Mon Sep 17 00:00:00 2001
From: pigxcloud <2270033969@qq.com>
Date: Wed, 22 May 2019 17:30:49 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=B7=BB=E5=8A=A0=E6=96=B0?=
 =?UTF-8?q?=E7=89=B9=E6=80=A7=E3=80=82=E6=97=A5=E5=BF=97=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=88=B0spring=20boot=20admin=20web=20consol?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../init/ApplicationLoggerInitializer.java    | 24 +++++++++++++++++++
 .../main/resources/META-INF/spring.factories  |  2 ++
 .../src/main/resources/logback-spring.xml     |  3 ++-
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/init/ApplicationLoggerInitializer.java

diff --git a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/init/ApplicationLoggerInitializer.java b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/init/ApplicationLoggerInitializer.java
new file mode 100644
index 000000000..66a8db320
--- /dev/null
+++ b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/init/ApplicationLoggerInitializer.java
@@ -0,0 +1,24 @@
+package com.pig4cloud.pigx.common.log.init;
+
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.env.ConfigurableEnvironment;
+
+/**
+ * @author lengleng
+ * @date 2019-05-22
+ * <p>
+ * 初始化日志路径
+ */
+public class ApplicationLoggerInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+	@Override
+	public void initialize(ConfigurableApplicationContext applicationContext) {
+		ConfigurableEnvironment environment = applicationContext.getEnvironment();
+
+		String appName = environment.getProperty("spring.application.name");
+
+		String logBase = environment.getProperty("LOGGING_PATH", "logs");
+		// spring boot admin 直接加载日志
+		System.setProperty("logging.file", String.format("%s/%s/debug.log", logBase, appName));
+	}
+}
diff --git a/pigx-common/pigx-common-log/src/main/resources/META-INF/spring.factories b/pigx-common/pigx-common-log/src/main/resources/META-INF/spring.factories
index 0fa28a4dd..b9931ece1 100644
--- a/pigx-common/pigx-common-log/src/main/resources/META-INF/spring.factories
+++ b/pigx-common/pigx-common-log/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,4 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
     com.pig4cloud.pigx.common.log.LogAutoConfiguration
+org.springframework.context.ApplicationContextInitializer=\
+    com.pig4cloud.pigx.common.log.init.ApplicationLoggerInitializer
\ No newline at end of file
diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/logback-spring.xml b/pigx-upms/pigx-upms-biz/src/main/resources/logback-spring.xml
index c382f2059..964ca8735 100644
--- a/pigx-upms/pigx-upms-biz/src/main/resources/logback-spring.xml
+++ b/pigx-upms/pigx-upms-biz/src/main/resources/logback-spring.xml
@@ -8,7 +8,7 @@
     2. 注意修改 <property name="${log-path}/log.path" value=""/> 的value模块
 -->
 <configuration debug="false" scan="false">
-	<property name="log.path" value="logs/pigx-upms"/>
+	<property name="log.path" value="logs/${project.artifactId}"/>
 	<!-- 彩色日志格式 -->
 	<property name="CONSOLE_LOG_PATTERN"
 			  value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
@@ -65,5 +65,6 @@
 	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
 	<root level="INFO">
 		<appender-ref ref="console"/>
+		<appender-ref ref="debug"/>
 	</root>
 </configuration>