From fbd5e1ca7ee86b82fa4ba72b8186e4390e36d4d5 Mon Sep 17 00:00:00 2001
From: ludj <ldj_willow@163.com>
Date: Mon, 25 Dec 2023 19:07:50 +0800
Subject: [PATCH] =?UTF-8?q?rev:=20=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE-CMD=E6=8E=A7=E5=88=B6=E5=8F=B0=E9=AB=98?=
 =?UTF-8?q?=E4=BA=AE=EF=BC=8C=E9=93=BE=E8=B7=AF=E8=BF=BD=E8=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes/hd/nladmin-system/pom.xml                 | 14 +++++
 .../src/main/resources/logback-spring.xml     | 62 ++++++++++---------
 2 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/mes/hd/nladmin-system/pom.xml b/mes/hd/nladmin-system/pom.xml
index 8294f83f..51be1f6a 100644
--- a/mes/hd/nladmin-system/pom.xml
+++ b/mes/hd/nladmin-system/pom.xml
@@ -30,6 +30,20 @@
     </properties>
 
     <dependencies>
+        <!--        日志链路追踪 https://tlog.yomahub.com/pages/f62a84/#%E5%90%8C%E6%AD%A5%E6%97%A5%E5%BF%97-->
+        <dependency>
+            <groupId>com.yomahub</groupId>
+            <artifactId>tlog-all-spring-boot-starter</artifactId>
+            <version>1.5.0</version>
+        </dependency>
+
+        <!--        https://onew.me/logback/2018/09/17/logback_win.html-->
+        <dependency>
+            <groupId>org.fusesource.jansi</groupId>
+            <artifactId>jansi</artifactId>
+            <version>1.9</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
diff --git a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
index 896ffa31..e046d72b 100644
--- a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
+++ b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
@@ -15,7 +15,10 @@ https://juejin.cn/post/6844903775631572999
               value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
     <springProperty scope="context" name="esIndex" source="es.index"/>
+    \ <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
     <property name="LOG_HOME" value="${logPath}"/>
+
+
     <!--引入默认的一些设置-->
 <!--    <include resource="log/AutoCreateInst.xml"/>-->
     <appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
@@ -79,13 +82,14 @@ https://juejin.cn/post/6844903775631572999
     </appender>
 
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
+        <!--        控制台高亮-->
+        <withJansi>true</withJansi>
+        <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
             <pattern>${log.pattern}</pattern>
         </encoder>
     </appender>
 
-    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
-    <property name="LOG_HOME" value="${logPath}"/>
+
     <!-- 按照每天生成日志文件 -->
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
@@ -105,7 +109,7 @@ https://juejin.cn/post/6844903775631572999
     </appender>
 
     <!--异步到文件-->
-    <appender name="asyncFileAppender" class="ch.qos.logback.classic.AsyncAppender">
+    <appender name="asyncFileAppender" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
         <discardingThreshold>0</discardingThreshold>
         <queueSize>500</queueSize>
         <appender-ref ref="FILE"/>
@@ -119,29 +123,29 @@ https://juejin.cn/post/6844903775631572999
             <appender-ref ref="CONSOLE"/>
         </root>
 
-        <logger name="jdbc.audit" level="ERROR" additivity="false">
+        <logger name="jdbc.audit" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="jdbc.resultset" level="ERROR" additivity="false">
+        <logger name="jdbc.resultset" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="es-logger" level="warn" additivity="false">
+        <logger name="es-logger" level="warn" additivity="true">
             <appender-ref ref="esLogAppender"/>
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="springfox.documentation" level="ERROR" additivity="false">
+        <logger name="springfox.documentation" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="jdbc.resultsettable" level="ERROR" additivity="false">
+        <logger name="jdbc.resultsettable" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="jdbc.sqlonly" level="ERROR" additivity="false">
+        <logger name="jdbc.sqlonly" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="jdbc.sqltiming" level="ERROR" additivity="false">
+        <logger name="jdbc.sqltiming" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="org.jinterop" level="ERROR" additivity="false">
+        <logger name="org.jinterop" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
     </springProfile>
@@ -151,29 +155,29 @@ https://juejin.cn/post/6844903775631572999
             <appender-ref ref="esLogAppender"/>
         </root>
 
-        <logger name="jdbc.audit" level="ERROR" additivity="false">
+        <logger name="jdbc.audit" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="jdbc.resultset" level="ERROR" additivity="false">
+        <logger name="jdbc.resultset" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="springfox.documentation" level="ERROR" additivity="false">
+        <logger name="springfox.documentation" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="jdbc.resultsettable" level="ERROR" additivity="false">
+        <logger name="jdbc.resultsettable" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="jdbc.sqlonly" level="ERROR" additivity="false">
+        <logger name="jdbc.sqlonly" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="jdbc.sqltiming" level="ERROR" additivity="false">
+        <logger name="jdbc.sqltiming" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="es-logger" level="warn" additivity="false">
+        <logger name="es-logger" level="warn" additivity="true">
             <appender-ref ref="esLogAppender"/>
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="org.jinterop" level="ERROR" additivity="false">
+        <logger name="org.jinterop" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
     </springProfile>
@@ -182,34 +186,34 @@ https://juejin.cn/post/6844903775631572999
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="esLogAppender"/>
         </root>
-        <logger name="es-logger" level="warn" additivity="false">
+        <logger name="es-logger" level="warn" additivity="true">
             <appender-ref ref="esLogAppender"/>
         </logger>
-        <logger name="jdbc.audit" level="ERROR" additivity="false">
+        <logger name="jdbc.audit" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
             <appender-ref ref="esLogAppender"/>
         </logger>
-        <logger name="jdbc.resultset" level="ERROR" additivity="false">
+        <logger name="jdbc.resultset" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
             <appender-ref ref="esLogAppender"/>
         </logger>
-        <logger name="springfox.documentation" level="ERROR" additivity="false">
+        <logger name="springfox.documentation" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
             <appender-ref ref="esLogAppender"/>
         </logger>
-        <logger name="jdbc.resultsettable" level="ERROR" additivity="false">
+        <logger name="jdbc.resultsettable" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
             <appender-ref ref="esLogAppender"/>
         </logger>
-        <logger name="jdbc.sqlonly" level="ERROR" additivity="false">
+        <logger name="jdbc.sqlonly" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
             \<appender-ref ref="esLogAppender"/>
         </logger>
-        <logger name="jdbc.sqltiming" level="ERROR" additivity="false">
+        <logger name="jdbc.sqltiming" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
             <appender-ref ref="esLogAppender"/>
         </logger>
-        <logger name="org.jinterop" level="ERROR" additivity="false">
+        <logger name="org.jinterop" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
             \<appender-ref ref="esLogAppender"/>
         </logger>
@@ -217,7 +221,7 @@ https://juejin.cn/post/6844903775631572999
     <!--测试环境:打印控制台-->
     <springProfile name="test">
         <!-- 打印sql -->
-        <logger name="org.nl.start.Init" level="info" additivity="false">
+        <logger name="org.nl.start.Init" level="info" additivity="true">
             <appender-ref ref="FILE"/>
         </logger>
         <root level="info">