From 9695725e76ee1e009abdcc7e687eb4466d403601 Mon Sep 17 00:00:00 2001
From: ludj <ldj_willow@163.com>
Date: Mon, 25 Dec 2023 17:08:57 +0800
Subject: [PATCH] =?UTF-8?q?rev:=20=E6=97=A5=E5=BF=97=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lms/nladmin-system/pom.xml                    |  7 ++
 .../wms/sch/manage/AutoQueryDeviceStatus.java |  3 -
 .../src/main/resources/log/AcsToLms.xml       |  2 +-
 .../src/main/resources/log/LmsToAcs.xml       |  2 +-
 .../src/main/resources/log/LmsToMes.xml       |  2 +-
 .../src/main/resources/log/LmsToSap.xml       |  2 +-
 .../src/main/resources/log/MesToLms.xml       |  2 +-
 .../src/main/resources/log/SapToLms.xml       |  2 +-
 .../src/main/resources/logback-spring.xml     | 76 ++++++++++---------
 9 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/lms/nladmin-system/pom.xml b/lms/nladmin-system/pom.xml
index 48d21902a..e6afda030 100644
--- a/lms/nladmin-system/pom.xml
+++ b/lms/nladmin-system/pom.xml
@@ -31,6 +31,13 @@
     </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>
+
         <!-- elasticsearch-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryDeviceStatus.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryDeviceStatus.java
index d50aa4cb1..fb5368bea 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryDeviceStatus.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryDeviceStatus.java
@@ -8,7 +8,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.modules.common.utils.RedisUtils;
 import org.nl.modules.wql.WQL;
-import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.wms.ext.acs.service.WmsToAcsService;
 import org.nl.wms.sch.tasks.URLEnum;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +24,6 @@ public class AutoQueryDeviceStatus {
     private final WmsToAcsService wmsToAcsService;
 
     public void run() {
-        WQLObject ivtTab = WQLObject.getWQLObject("st_ivt_hotpointivt");
         for (URLEnum url : URLEnum.values()) {
             try {
                 String product_area = url.getProduct_area();
@@ -59,7 +57,6 @@ public class AutoQueryDeviceStatus {
                     map.put("last_time", last_time);
                     redisUtils.hset(device_code, "temperature", row.getString("temperature"));
                     redisUtils.hset(device_code, "last_time", last_time);
-                    //ivtTab.update(map,"point_code = '"+device_code+"'");
                 }
             } catch (Exception e) {
                 log.info(e.getMessage());
diff --git a/lms/nladmin-system/src/main/resources/log/AcsToLms.xml b/lms/nladmin-system/src/main/resources/log/AcsToLms.xml
index 6e4710a44..93946707b 100644
--- a/lms/nladmin-system/src/main/resources/log/AcsToLms.xml
+++ b/lms/nladmin-system/src/main/resources/log/AcsToLms.xml
@@ -81,7 +81,7 @@
         </encoder>
     </appender>
 
-      <logger name="org.nl.wms.ext.acs.service.impl.AcsToWmsServiceImpl" level="info" additivity="false">
+      <logger name="org.nl.wms.ext.acs.service.impl.AcsToWmsServiceImpl" level="info" additivity="true">
           <appender-ref ref="FILE5"/>
           <appender-ref ref="esLogAppender"/>
       </logger>
diff --git a/lms/nladmin-system/src/main/resources/log/LmsToAcs.xml b/lms/nladmin-system/src/main/resources/log/LmsToAcs.xml
index 56d13faeb..96ccf3733 100644
--- a/lms/nladmin-system/src/main/resources/log/LmsToAcs.xml
+++ b/lms/nladmin-system/src/main/resources/log/LmsToAcs.xml
@@ -81,7 +81,7 @@
         </encoder>
     </appender>
 
-      <logger name="org.nl.wms.sch.AcsUtil" level="info" additivity="false">
+      <logger name="org.nl.wms.sch.AcsUtil" level="info" additivity="true">
           <appender-ref ref="FILE6"/>
           <appender-ref ref="esLogAppender"/>
       </logger>
diff --git a/lms/nladmin-system/src/main/resources/log/LmsToMes.xml b/lms/nladmin-system/src/main/resources/log/LmsToMes.xml
index a908c19f7..bbf8e9fd3 100644
--- a/lms/nladmin-system/src/main/resources/log/LmsToMes.xml
+++ b/lms/nladmin-system/src/main/resources/log/LmsToMes.xml
@@ -81,7 +81,7 @@
     </appender>
     <springProperty scope="context" name="esIndex" source="es.index"/>
 
-    <logger name="org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl" level="info" additivity="false">
+    <logger name="org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl" level="info" additivity="true">
           <appender-ref ref="FILE4"/>
           <appender-ref ref="esLogAppender"/>
       </logger>
diff --git a/lms/nladmin-system/src/main/resources/log/LmsToSap.xml b/lms/nladmin-system/src/main/resources/log/LmsToSap.xml
index 4cfdc5e19..a21b51a7d 100644
--- a/lms/nladmin-system/src/main/resources/log/LmsToSap.xml
+++ b/lms/nladmin-system/src/main/resources/log/LmsToSap.xml
@@ -81,7 +81,7 @@
         </encoder>
     </appender>
 
-      <logger name="org.nl.wms.ext.sap.service.impl.LmsToSapServiceImpl" level="info" additivity="false">
+      <logger name="org.nl.wms.ext.sap.service.impl.LmsToSapServiceImpl" level="info" additivity="true">
           <appender-ref ref="FILE2"/>
           <appender-ref ref="esLogAppender"/>
       </logger>
diff --git a/lms/nladmin-system/src/main/resources/log/MesToLms.xml b/lms/nladmin-system/src/main/resources/log/MesToLms.xml
index c8481e37a..2ee047f21 100644
--- a/lms/nladmin-system/src/main/resources/log/MesToLms.xml
+++ b/lms/nladmin-system/src/main/resources/log/MesToLms.xml
@@ -81,7 +81,7 @@
         </encoder>
     </appender>
 
-      <logger name="org.nl.wms.ext.mes.service.impl.MesToLmsServiceImpl" level="info" additivity="false">
+      <logger name="org.nl.wms.ext.mes.service.impl.MesToLmsServiceImpl" level="info" additivity="true">
           <appender-ref ref="FILE3"/>
           <appender-ref ref="esLogAppender"/>
       </logger>
diff --git a/lms/nladmin-system/src/main/resources/log/SapToLms.xml b/lms/nladmin-system/src/main/resources/log/SapToLms.xml
index 338c21a2c..8ad39d38a 100644
--- a/lms/nladmin-system/src/main/resources/log/SapToLms.xml
+++ b/lms/nladmin-system/src/main/resources/log/SapToLms.xml
@@ -81,7 +81,7 @@
         </encoder>
     </appender>
 
-      <logger name="org.nl.wms.ext.sap.service.impl.SapToLmsServiceImpl" level="info" additivity="false">
+      <logger name="org.nl.wms.ext.sap.service.impl.SapToLmsServiceImpl" level="info" additivity="true">
           <appender-ref ref="FILE1"/>
           <appender-ref ref="esLogAppender"/>
       </logger>
diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml
index 036d43bf5..e34bb3bd2 100644
--- a/lms/nladmin-system/src/main/resources/logback-spring.xml
+++ b/lms/nladmin-system/src/main/resources/logback-spring.xml
@@ -15,7 +15,10 @@ https://juejin.cn/post/6844903775631572999
               value="%black(%contextName-) %X{traceId} %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/LmsToMes.xml"/>
     <include resource="log/LmsToSap.xml"/>
@@ -27,14 +30,13 @@ https://juejin.cn/post/6844903775631572999
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <!--        控制台高亮-->
         <withJansi>true</withJansi>
-        <encoder>
+        <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
             <pattern>${log.pattern}</pattern>
-            <!--            <charset>${log.charset}</charset>-->
+            <!-- <charset>${log.charset}</charset>-->
         </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">
@@ -129,14 +131,14 @@ https://juejin.cn/post/6844903775631572999
             <!--所有日志最多占多大容量-->
             <totalSizeCap>20GB</totalSizeCap>
         </rollingPolicy>
-        <encoder>
+        <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
             <pattern>${log.pattern}</pattern>
             <charset>${log.charset}</charset>
         </encoder>
     </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"/>
@@ -149,44 +151,44 @@ https://juejin.cn/post/6844903775631572999
 <!--            <appender-ref ref="asyncFileAppender"/>-->
             <appender-ref ref="esLogAppender"/>
         </root>
-        <logger name="org.springframework" level="ERROR" additivity="false">
+        <logger name="org.springframework" 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.apache" level="ERROR" additivity="false">
+        <logger name="org.apache" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="org.hibernate" level="ERROR" additivity="false">
+        <logger name="org.hibernate" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="io.netty" level="ERROR" additivity="false">
+        <logger name="io.netty" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="jdbc" level="ERROR" additivity="false">
+        <logger name="jdbc" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="io.lettuce" level="ERROR" additivity="false">
+        <logger name="io.lettuce" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="com.fasterxml" level="ERROR" additivity="false">
+        <logger name="com.fasterxml" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="org.quartz" level="ERROR" additivity="false">
+        <logger name="org.quartz" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="com.google" level="ERROR" additivity="false">
+        <logger name="com.google" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="springfox" level="ERROR" additivity="false">
+        <logger name="springfox" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="log4jdbc" level="ERROR" additivity="false">
+        <logger name="log4jdbc" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="nl.basjes" level="ERROR" additivity="false">
+        <logger name="nl.basjes" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
     </springProfile>
@@ -199,44 +201,44 @@ https://juejin.cn/post/6844903775631572999
             <appender-ref ref="ERROR"/>
             <appender-ref ref="esLogAppender"/>
         </root>
-        <logger name="org.springframework" level="ERROR" additivity="false">
+        <logger name="org.springframework" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </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.apache" level="ERROR" additivity="false">
+        <logger name="org.apache" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="org.hibernate" level="ERROR" additivity="false">
+        <logger name="org.hibernate" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="io.netty" level="ERROR" additivity="false">
+        <logger name="io.netty" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="jdbc" level="ERROR" additivity="false">
+        <logger name="jdbc" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="io.lettuce" level="ERROR" additivity="false">
+        <logger name="io.lettuce" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="com.fasterxml" level="ERROR" additivity="false">
+        <logger name="com.fasterxml" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="org.quartz" level="ERROR" additivity="false">
+        <logger name="org.quartz" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="com.google" level="ERROR" additivity="false">
+        <logger name="com.google" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="springfox" level="ERROR" additivity="false">
+        <logger name="springfox" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="log4jdbc" level="ERROR" additivity="false">
+        <logger name="log4jdbc" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="nl.basjes" level="ERROR" additivity="false">
+        <logger name="nl.basjes" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
     </springProfile>
@@ -247,19 +249,19 @@ https://juejin.cn/post/6844903775631572999
         <root level="info">
             <appender-ref ref="asyncFileAppender"/>
         </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>
     </springProfile>