From ce50a1fd2efaad7babea6f97b82a5e86ccf6b62e Mon Sep 17 00:00:00 2001
From: zhaowenyuan <zhaowenyuan@163.com>
Date: Wed, 8 May 2024 10:26:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/logback-nacos.xml      |  3 +--
 .../src/main/resources/logback-nacos.xml      |  3 +--
 .../src/main/resources/logback-nacos.xml      | 23 +++++++++++++------
 .../src/main/resources/logback-nacos.xml      |  3 +--
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/chushang-modules/chushang-module-auth/auth-service/src/main/resources/logback-nacos.xml b/chushang-modules/chushang-module-auth/auth-service/src/main/resources/logback-nacos.xml
index 82ea381..74bb510 100644
--- a/chushang-modules/chushang-module-auth/auth-service/src/main/resources/logback-nacos.xml
+++ b/chushang-modules/chushang-module-auth/auth-service/src/main/resources/logback-nacos.xml
@@ -14,8 +14,7 @@
 	<property name="log.path" value="logs/${spring.application.name}"/>
 
 	<!-- 彩色日志格式 -->
-	<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([%X{traceId}]) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+	<property name="CONSOLE_LOG_PATTERN" value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} TRACE[%X{trace:-}/%X{span:-}] [%clr(%5p) %clr(${PID:- } %clr(%15.15t){faint}] %clr(---){faint}){magenta} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wEx"/>
 	<!-- 彩色日志依赖的渲染类 -->
 	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
 	<conversionRule conversionWord="wex"
diff --git a/chushang-modules/chushang-module-gateway/src/main/resources/logback-nacos.xml b/chushang-modules/chushang-module-gateway/src/main/resources/logback-nacos.xml
index 82ea381..74bb510 100644
--- a/chushang-modules/chushang-module-gateway/src/main/resources/logback-nacos.xml
+++ b/chushang-modules/chushang-module-gateway/src/main/resources/logback-nacos.xml
@@ -14,8 +14,7 @@
 	<property name="log.path" value="logs/${spring.application.name}"/>
 
 	<!-- 彩色日志格式 -->
-	<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([%X{traceId}]) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+	<property name="CONSOLE_LOG_PATTERN" value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} TRACE[%X{trace:-}/%X{span:-}] [%clr(%5p) %clr(${PID:- } %clr(%15.15t){faint}] %clr(---){faint}){magenta} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wEx"/>
 	<!-- 彩色日志依赖的渲染类 -->
 	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
 	<conversionRule conversionWord="wex"
diff --git a/chushang-modules/chushang-module-oss/oss-service/src/main/resources/logback-nacos.xml b/chushang-modules/chushang-module-oss/oss-service/src/main/resources/logback-nacos.xml
index ac72426..74bb510 100644
--- a/chushang-modules/chushang-module-oss/oss-service/src/main/resources/logback-nacos.xml
+++ b/chushang-modules/chushang-module-oss/oss-service/src/main/resources/logback-nacos.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+
 <configuration debug="false" scan="false">
 	<include resource="org/springframework/boot/logging/logback/defaults.xml"/>
 	<springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
@@ -11,15 +13,23 @@
 	<property name="log.redis.auth" value="${plumelog.redis.auth}" />
 	<property name="log.path" value="logs/${spring.application.name}"/>
 
+	<!-- 彩色日志格式 -->
+	<property name="CONSOLE_LOG_PATTERN" value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} TRACE[%X{trace:-}/%X{span:-}] [%clr(%5p) %clr(${PID:- } %clr(%15.15t){faint}] %clr(---){faint}){magenta} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wEx"/>
+	<!-- 彩色日志依赖的渲染类 -->
+	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+	<conversionRule conversionWord="wex"
+					converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+	<conversionRule conversionWord="wEx"
+					converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+
 	<!-- Console log output -->
 	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder>
-			<pattern>%boldCyan(%d{yyyy-MM-dd HH:mm:ss.SSS}) TRACE[%X{trace:-}/%X{span:-}] [%highlight(%-5p)][%cyan(%t)][%magenta(%c{50})-%boldMagenta(%M)][%cn] - %msg%n</pattern>
+			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
 			<!-- 设置字符集 -->
 			<charset>UTF-8</charset>
 		</encoder>
 	</appender>
-
 	<!-- Log file info output -->
 	<appender name="info" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${log.path}/info.log</file>
@@ -29,7 +39,7 @@
 			<maxFileSize>500MB</maxFileSize>
 		</rollingPolicy>
 		<encoder>
-			<pattern> TRACE[%X{trace:-}/%X{span:-}] %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
 		</encoder>
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
 			<level>info</level>
@@ -44,7 +54,7 @@
 			<maxFileSize>500MB</maxFileSize>
 		</rollingPolicy>
 		<encoder>
-			<pattern>TRACE[%X{trace:-}/%X{span:-}] %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
 		</encoder>
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
 			<level>debug</level>
@@ -59,7 +69,7 @@
 			<maxFileSize>500MB</maxFileSize>
 		</rollingPolicy>
 		<encoder>
-			<pattern> TRACE[%X{trace:-}/%X{span:-}] %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
 		</encoder>
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
 			<level>error</level>
@@ -67,8 +77,7 @@
 	</appender>
 
 	<!--nacos 心跳 INFO 屏蔽-->
-	<logger name="com.alibaba.nacos" level="OFF">
-		<appender-ref ref="error"/>
+	<logger name="com.alibaba.cloud.nacos" level="info">
 	</logger>
 
 	<!-- 使用kafka启用下面配置 -->
diff --git a/chushang-modules/chushang-module-system/system-service/src/main/resources/logback-nacos.xml b/chushang-modules/chushang-module-system/system-service/src/main/resources/logback-nacos.xml
index 82ea381..74bb510 100644
--- a/chushang-modules/chushang-module-system/system-service/src/main/resources/logback-nacos.xml
+++ b/chushang-modules/chushang-module-system/system-service/src/main/resources/logback-nacos.xml
@@ -14,8 +14,7 @@
 	<property name="log.path" value="logs/${spring.application.name}"/>
 
 	<!-- 彩色日志格式 -->
-	<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([%X{traceId}]) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+	<property name="CONSOLE_LOG_PATTERN" value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} TRACE[%X{trace:-}/%X{span:-}] [%clr(%5p) %clr(${PID:- } %clr(%15.15t){faint}] %clr(---){faint}){magenta} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wEx"/>
 	<!-- 彩色日志依赖的渲染类 -->
 	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
 	<conversionRule conversionWord="wex"