From 819b912639006801b80492f6e143a7785cd78c96 Mon Sep 17 00:00:00 2001
From: "Yangkai.Shen" <237497819@qq.com>
Date: Mon, 4 Nov 2019 17:11:29 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=94=AF=E6=8C=81=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8F=B0=E5=BD=A9=E8=89=B2=E6=97=A5=E5=BF=97=20[ISSUE?=
 =?UTF-8?q?#66](https://github.com/xkcoding/spring-boot-demo/issues/66)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/logback-spring.xml            | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/spring-boot-demo-logback/src/main/resources/logback-spring.xml b/spring-boot-demo-logback/src/main/resources/logback-spring.xml
index 2c43a56..5b24b88 100644
--- a/spring-boot-demo-logback/src/main/resources/logback-spring.xml
+++ b/spring-boot-demo-logback/src/main/resources/logback-spring.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-	<include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+  <property name="FILE_ERROR_PATTERN"
+            value="${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %file:%line: %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+  <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
 	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
 			<level>INFO</level>
 		</filter>
 		<encoder>
-			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
 			<charset>UTF-8</charset>
 		</encoder>
 	</appender>
@@ -40,7 +42,7 @@
 		<!--<maxFileSize>1KB</maxFileSize>-->
 		<!--</triggeringPolicy>-->
 		<encoder>
-			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+			<pattern>${FILE_LOG_PATTERN}</pattern>
 			<charset>UTF-8</charset> <!-- 此处设置字符集 -->
 		</encoder>
 	</appender>
@@ -64,7 +66,7 @@
 			</timeBasedFileNamingAndTriggeringPolicy>
 		</rollingPolicy>
 		<encoder>
-			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+			<pattern>${FILE_ERROR_PATTERN}</pattern>
 			<charset>UTF-8</charset> <!-- 此处设置字符集 -->
 		</encoder>
 	</appender>
@@ -74,4 +76,4 @@
 		<appender-ref ref="FILE_INFO"/>
 		<appender-ref ref="FILE_ERROR"/>
 	</root>
-</configuration>
\ No newline at end of file
+</configuration>