From e3745f007871cd3e35fa4c5b6afd35ad59fe14ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E4=BF=8A=E6=9D=B0?=
 <9463626+zhou-junjiezjj@user.noreply.gitee.com>
Date: Sun, 23 Apr 2023 17:22:10 +0800
Subject: [PATCH] no message

---
 .../src/main/resources/log/AcsToErp.xml       | 29 -----------------
 .../resources/log/AgvFeedbackServiceImpl.xml  | 28 ----------------
 .../main/resources/log/AgvLeaveServlet.xml    | 30 -----------------
 .../resources/log/MagicAgvServiceImpl.xml     | 32 +++++++++++++++++++
 .../main/resources/log/QueryAgvTaskStatus.xml | 10 +++---
 5 files changed, 37 insertions(+), 92 deletions(-)
 delete mode 100644 acs/hd/nladmin-system/src/main/resources/log/AcsToErp.xml
 delete mode 100644 acs/hd/nladmin-system/src/main/resources/log/AgvFeedbackServiceImpl.xml
 delete mode 100644 acs/hd/nladmin-system/src/main/resources/log/AgvLeaveServlet.xml
 create mode 100644 acs/hd/nladmin-system/src/main/resources/log/MagicAgvServiceImpl.xml

diff --git a/acs/hd/nladmin-system/src/main/resources/log/AcsToErp.xml b/acs/hd/nladmin-system/src/main/resources/log/AcsToErp.xml
deleted file mode 100644
index eec04a5..0000000
--- a/acs/hd/nladmin-system/src/main/resources/log/AcsToErp.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<included>
-    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <property name="log.pattern"
-              value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>
-    <springProperty scope="context" name="lokiUrl" source="loki.url"/>
-    <property name="LOKI_URL" value="${lokiUrl}"/>
-    <!--添加loki-->
-    <appender name="lokiAppender" class="com.github.loki4j.logback.Loki4jAppender">
-        <batchTimeoutMs>1000</batchTimeoutMs>
-        <http class="com.github.loki4j.logback.ApacheHttpSender">
-            <url>${LOKI_URL}</url>
-        </http>
-        <format>
-            <label>
-                <pattern>logType=acs_to_erp</pattern>
-            </label>
-            <message>
-                <pattern>${log.pattern}</pattern>
-            </message>
-            <sortByTime>true</sortByTime>
-        </format>
-    </appender>
-
-    <!-- 打印sql -->
-    <logger name="org.nl.acs.ext.erp.service.impl.AcsToErpServiceImpl" level="info" additivity="false">
-        <appender-ref ref="lokiAppender" />
-    </logger>
-</included>
diff --git a/acs/hd/nladmin-system/src/main/resources/log/AgvFeedbackServiceImpl.xml b/acs/hd/nladmin-system/src/main/resources/log/AgvFeedbackServiceImpl.xml
deleted file mode 100644
index ecb6f2b..0000000
--- a/acs/hd/nladmin-system/src/main/resources/log/AgvFeedbackServiceImpl.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<included>
-    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <property name="log.pattern"
-              value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>
-    <springProperty scope="context" name="lokiUrl" source="loki.url"/>
-    <property name="LOKI_URL" value="${lokiUrl}"/>
-    <!--添加loki-->
-    <appender name="lokiAppender" class="com.github.loki4j.logback.Loki4jAppender">
-        <batchTimeoutMs>1000</batchTimeoutMs>
-        <http class="com.github.loki4j.logback.ApacheHttpSender">
-            <url>${LOKI_URL}</url>
-        </http>
-        <format>
-            <label>
-                <pattern>logType=agv_feedback_servlet</pattern>
-            </label>
-            <message>
-                <pattern>${log.pattern}</pattern>
-            </message>
-            <sortByTime>true</sortByTime>
-        </format>
-    </appender>
-    <!-- 打印sql -->
-    <logger name="org.nl.acs.agv.server.impl.AgvServiceImpl" level="info" additivity="false">
-        <appender-ref ref="lokiAppender" />
-    </logger>
-</included>
diff --git a/acs/hd/nladmin-system/src/main/resources/log/AgvLeaveServlet.xml b/acs/hd/nladmin-system/src/main/resources/log/AgvLeaveServlet.xml
deleted file mode 100644
index 702bdbf..0000000
--- a/acs/hd/nladmin-system/src/main/resources/log/AgvLeaveServlet.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<included>
-    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <property name="log.pattern"
-              value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>
-    <springProperty scope="context" name="lokiUrl" source="loki.url"/>
-    <property name="LOKI_URL" value="${lokiUrl}"/>
-    <!--添加loki-->
-    <appender name="lokiAppender" class="com.github.loki4j.logback.Loki4jAppender">
-        <batchTimeoutMs>1000</batchTimeoutMs>
-        <http class="com.github.loki4j.logback.ApacheHttpSender">
-            <url>${LOKI_URL}</url>
-        </http>
-        <format>
-            <label>
-                <pattern>logType=agv_leave_servlet</pattern>
-            </label>
-            <message>
-                <pattern>${log.pattern}</pattern>
-            </message>
-            <sortByTime>true</sortByTime>
-        </format>
-    </appender>
-
-    <!-- 打印sql -->
-    <logger name="org.nl.acs.device_driver.electric_fence.ItemProtocol" level="info" additivity="false">
-        <appender-ref ref="lokiAppender" />
-    </logger>
-
-</included>
diff --git a/acs/hd/nladmin-system/src/main/resources/log/MagicAgvServiceImpl.xml b/acs/hd/nladmin-system/src/main/resources/log/MagicAgvServiceImpl.xml
new file mode 100644
index 0000000..2c9d0a5
--- /dev/null
+++ b/acs/hd/nladmin-system/src/main/resources/log/MagicAgvServiceImpl.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
+    <property name="LOG_HOME" value="${logPath}"/>
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILEAgvServiceImpl" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/查询agv状态/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+            <!--单个日志最大容量 至少10MB才能看得出来-->
+            <maxFileSize>200MB</maxFileSize>
+            <!--所有日志最多占多大容量-->
+            <totalSizeCap>2GB</totalSizeCap>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+
+    </appender>
+
+    <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
+          <appender-ref ref="FILE3"/>
+      </logger>-->
+
+    <!-- 打印sql -->
+    <logger name="org.nl.acs.ext.wms.service.impl.AgvServiceImpl" level="info" additivity="false">
+        <appender-ref ref="FILEAgvServiceImpl"/>
+    </logger>
+</included>
diff --git a/acs/hd/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml b/acs/hd/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml
index 8ea9b07..690ae29 100644
--- a/acs/hd/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml
+++ b/acs/hd/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml
@@ -3,14 +3,14 @@
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
     <property name="LOG_HOME" value="${logPath}"/>
     <!-- 按照每天生成日志文件 -->
-    <appender name="FILEMagicAgvServiceImpl" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <appender name="FILEACSTOWMS" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/查询AGV设备状态/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <FileNamePattern>${LOG_HOME}/ACS请求WMS/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>100MB</maxFileSize>
+            <maxFileSize>50MB</maxFileSize>
             <!--所有日志最多占多大容量-->
             <totalSizeCap>2GB</totalSizeCap>
         </rollingPolicy>
@@ -26,7 +26,7 @@
       </logger>-->
 
     <!-- 打印sql -->
-    <logger name="org.nl.acs.ext.wms.service.impl.MagicAgvServiceImpl" level="info" additivity="false">
-        <appender-ref ref="FILEMagicAgvServiceImpl"/>
+    <logger name="org.nl.acs.agv.server.impl.AgvServiceImpl" level="info" additivity="false">
+        <appender-ref ref="FILEACSTOWMS"/>
     </logger>
 </included>