From c30d6ea551146ced5bfb195306efdaf8c8e1d77f Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Wed, 1 Mar 2023 11:20:26 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/nl/aspect/LogAspect.java    |  4 +-
 .../src/main/resources/log/LKToMes.xml        | 62 +++++++++++++++++++
 .../src/main/resources/log/MesToErp.xml       | 61 ++++++++++++++++++
 .../src/main/resources/log/MesToLK.xml        | 61 ++++++++++++++++++
 .../src/main/resources/log/XrToMes.xml        | 60 ++++++++++++++++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 6 files changed, 247 insertions(+), 3 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/aspect/LogAspect.java b/mes/hd/nladmin-system/src/main/java/org/nl/aspect/LogAspect.java
index 03b97930..7d788d9a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/aspect/LogAspect.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/aspect/LogAspect.java
@@ -51,8 +51,8 @@ import java.util.Map;
 @Slf4j
 public class LogAspect {
 
-
-    @Pointcut("execution(* org.nl.wms.*.rest..*.*(..))")
+    //org.nl.ext.lk.rest
+    @Pointcut("execution(* org.nl.wms.*.rest..*.*(..)) || execution(* org.nl.ext.*.rest..*.*(..))")
     public void logPointCut() {
     }
 
diff --git a/mes/hd/nladmin-system/src/main/resources/log/LKToMes.xml b/mes/hd/nladmin-system/src/main/resources/log/LKToMes.xml
index fb7c8ffd..70a8ba6d 100644
--- a/mes/hd/nladmin-system/src/main/resources/log/LKToMes.xml
+++ b/mes/hd/nladmin-system/src/main/resources/log/LKToMes.xml
@@ -2,6 +2,67 @@
 <included>
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
     <property name="LOG_HOME" value="${logPath}"/>
+    <appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
+        <url>http://47.96.133.178:8200/_bulk</url>
+        <index>${esIndex}</index>
+        <type>whxr_log</type>
+        <loggerName>es-logger</loggerName> <!-- optional -->
+        <errorLoggerName>es-error-logger</errorLoggerName> <!-- optional -->
+        <connectTimeout>30000</connectTimeout> <!-- optional (in ms, default 30000) -->
+        <errorsToStderr>false</errorsToStderr> <!-- optional (default false) -->
+        <includeCallerData>false</includeCallerData> <!-- optional (default false) -->
+        <logsToStderr>false</logsToStderr> <!-- optional (default false) -->
+        <maxQueueSize>104857600</maxQueueSize> <!-- optional (default 104857600) -->
+        <maxRetries>3</maxRetries> <!-- optional (default 3) -->
+        <readTimeout>30000</readTimeout> <!-- optional (in ms, default 30000) -->
+        <sleepTime>250</sleepTime> <!-- optional (in ms, default 250) -->
+        <rawJsonMessage>false</rawJsonMessage> <!-- optional (default false) -->
+        <includeMdc>false</includeMdc> <!-- optional (default false) -->
+        <maxMessageSize>20000</maxMessageSize> <!-- optional (default -1 -->
+        <!--        <authentication class="com.internetitem.logback.elasticsearch.config.BasicAuthentication" /> &lt;!&ndash; optional &ndash;&gt;-->
+        <properties>
+            <property>
+                <name>system</name>
+                <value>mes</value>
+            </property>
+            <property>
+                <name>traceId</name>
+                <value>%X{traceId}</value>
+            </property>
+            <property>
+                <name>logLevel</name>
+                <value>%level</value>
+            </property>
+            <property>
+                <name>requestMethod</name>
+                <value>%X{requestMethod}</value>
+            </property>
+            <property>
+                <name>requestTime</name>
+                <value>%d{yyyy-MM-dd HH:mm:ss.SSS}</value>
+            </property>
+            <property>
+                <name>requestIp</name>
+                <value>%X{requestIp}</value>
+            </property>
+            <property>
+                <name>thread</name>
+                <value>%thread</value>
+            </property>
+            <property>
+                <name>logger</name>
+                <value>%logger</value>
+            </property>
+        </properties>
+        <headers>
+            <header>
+                <name>Content-Type</name>
+                <value>application/json</value>
+            </header>
+        </headers>
+    </appender>
+    <springProperty scope="context" name="esIndex" source="es.index"/>
+
     <!-- 按照每天生成日志文件 -->
     <appender name="FILE3" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
@@ -22,6 +83,7 @@
 
       <logger name="org.nl.ext.lk.service.impl.LkToWmsServiceImpl" level="info" additivity="false">
           <appender-ref ref="FILE3"/>
+          <appender-ref ref="esLogAppender"/>
       </logger>
 
     <!-- 打印sql -->
diff --git a/mes/hd/nladmin-system/src/main/resources/log/MesToErp.xml b/mes/hd/nladmin-system/src/main/resources/log/MesToErp.xml
index d58980d3..454ed15a 100644
--- a/mes/hd/nladmin-system/src/main/resources/log/MesToErp.xml
+++ b/mes/hd/nladmin-system/src/main/resources/log/MesToErp.xml
@@ -2,6 +2,66 @@
 <included>
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
     <property name="LOG_HOME" value="${logPath}"/>
+    <appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
+        <url>http://47.96.133.178:8200/_bulk</url>
+        <index>${esIndex}</index>
+        <type>whxr_log</type>
+        <loggerName>es-logger</loggerName> <!-- optional -->
+        <errorLoggerName>es-error-logger</errorLoggerName> <!-- optional -->
+        <connectTimeout>30000</connectTimeout> <!-- optional (in ms, default 30000) -->
+        <errorsToStderr>false</errorsToStderr> <!-- optional (default false) -->
+        <includeCallerData>false</includeCallerData> <!-- optional (default false) -->
+        <logsToStderr>false</logsToStderr> <!-- optional (default false) -->
+        <maxQueueSize>104857600</maxQueueSize> <!-- optional (default 104857600) -->
+        <maxRetries>3</maxRetries> <!-- optional (default 3) -->
+        <readTimeout>30000</readTimeout> <!-- optional (in ms, default 30000) -->
+        <sleepTime>250</sleepTime> <!-- optional (in ms, default 250) -->
+        <rawJsonMessage>false</rawJsonMessage> <!-- optional (default false) -->
+        <includeMdc>false</includeMdc> <!-- optional (default false) -->
+        <maxMessageSize>20000</maxMessageSize> <!-- optional (default -1 -->
+        <!--        <authentication class="com.internetitem.logback.elasticsearch.config.BasicAuthentication" /> &lt;!&ndash; optional &ndash;&gt;-->
+        <properties>
+            <property>
+                <name>system</name>
+                <value>mes</value>
+            </property>
+            <property>
+                <name>traceId</name>
+                <value>%X{traceId}</value>
+            </property>
+            <property>
+                <name>logLevel</name>
+                <value>%level</value>
+            </property>
+            <property>
+                <name>requestMethod</name>
+                <value>%X{requestMethod}</value>
+            </property>
+            <property>
+                <name>requestTime</name>
+                <value>%d{yyyy-MM-dd HH:mm:ss.SSS}</value>
+            </property>
+            <property>
+                <name>requestIp</name>
+                <value>%X{requestIp}</value>
+            </property>
+            <property>
+                <name>thread</name>
+                <value>%thread</value>
+            </property>
+            <property>
+                <name>logger</name>
+                <value>%logger</value>
+            </property>
+        </properties>
+        <headers>
+            <header>
+                <name>Content-Type</name>
+                <value>application/json</value>
+            </header>
+        </headers>
+    </appender>
+    <springProperty scope="context" name="esIndex" source="es.index"/>
     <!-- 按照每天生成日志文件 -->
     <appender name="FILE2" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
@@ -22,6 +82,7 @@
 
       <logger name="org.nl.wms.st.returns.service.impl.InAndOutRetrunServiceImpl" level="info" additivity="false">
           <appender-ref ref="FILE2"/>
+          <appender-ref ref="esLogAppender"/>
       </logger>
 
     <!-- 打印sql -->
diff --git a/mes/hd/nladmin-system/src/main/resources/log/MesToLK.xml b/mes/hd/nladmin-system/src/main/resources/log/MesToLK.xml
index 6d8c8a56..aee3a7be 100644
--- a/mes/hd/nladmin-system/src/main/resources/log/MesToLK.xml
+++ b/mes/hd/nladmin-system/src/main/resources/log/MesToLK.xml
@@ -2,6 +2,66 @@
 <included>
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
     <property name="LOG_HOME" value="${logPath}"/>
+    <appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
+        <url>http://47.96.133.178:8200/_bulk</url>
+        <index>${esIndex}</index>
+        <type>whxr_log</type>
+        <loggerName>es-logger</loggerName> <!-- optional -->
+        <errorLoggerName>es-error-logger</errorLoggerName> <!-- optional -->
+        <connectTimeout>30000</connectTimeout> <!-- optional (in ms, default 30000) -->
+        <errorsToStderr>false</errorsToStderr> <!-- optional (default false) -->
+        <includeCallerData>false</includeCallerData> <!-- optional (default false) -->
+        <logsToStderr>false</logsToStderr> <!-- optional (default false) -->
+        <maxQueueSize>104857600</maxQueueSize> <!-- optional (default 104857600) -->
+        <maxRetries>3</maxRetries> <!-- optional (default 3) -->
+        <readTimeout>30000</readTimeout> <!-- optional (in ms, default 30000) -->
+        <sleepTime>250</sleepTime> <!-- optional (in ms, default 250) -->
+        <rawJsonMessage>false</rawJsonMessage> <!-- optional (default false) -->
+        <includeMdc>false</includeMdc> <!-- optional (default false) -->
+        <maxMessageSize>20000</maxMessageSize> <!-- optional (default -1 -->
+        <!--        <authentication class="com.internetitem.logback.elasticsearch.config.BasicAuthentication" /> &lt;!&ndash; optional &ndash;&gt;-->
+        <properties>
+            <property>
+                <name>system</name>
+                <value>mes</value>
+            </property>
+            <property>
+                <name>traceId</name>
+                <value>%X{traceId}</value>
+            </property>
+            <property>
+                <name>logLevel</name>
+                <value>%level</value>
+            </property>
+            <property>
+                <name>requestMethod</name>
+                <value>%X{requestMethod}</value>
+            </property>
+            <property>
+                <name>requestTime</name>
+                <value>%d{yyyy-MM-dd HH:mm:ss.SSS}</value>
+            </property>
+            <property>
+                <name>requestIp</name>
+                <value>%X{requestIp}</value>
+            </property>
+            <property>
+                <name>thread</name>
+                <value>%thread</value>
+            </property>
+            <property>
+                <name>logger</name>
+                <value>%logger</value>
+            </property>
+        </properties>
+        <headers>
+            <header>
+                <name>Content-Type</name>
+                <value>application/json</value>
+            </header>
+        </headers>
+    </appender>
+    <springProperty scope="context" name="esIndex" source="es.index"/>
     <!-- 按照每天生成日志文件 -->
     <appender name="FILE4" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
@@ -22,6 +82,7 @@
 
       <logger name="org.nl.ext.lk.service.impl.WmsToLkServiceImpl" level="info" additivity="false">
           <appender-ref ref="FILE4"/>
+          <appender-ref ref="esLogAppender"/>
       </logger>
 
     <!-- 打印sql -->
diff --git a/mes/hd/nladmin-system/src/main/resources/log/XrToMes.xml b/mes/hd/nladmin-system/src/main/resources/log/XrToMes.xml
index 4b8bb79c..1706cc06 100644
--- a/mes/hd/nladmin-system/src/main/resources/log/XrToMes.xml
+++ b/mes/hd/nladmin-system/src/main/resources/log/XrToMes.xml
@@ -2,6 +2,66 @@
 <included>
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
     <property name="LOG_HOME" value="${logPath}"/>
+    <appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
+        <url>http://47.96.133.178:8200/_bulk</url>
+        <index>${esIndex}</index>
+        <type>whxr_log</type>
+        <loggerName>es-logger</loggerName> <!-- optional -->
+        <errorLoggerName>es-error-logger</errorLoggerName> <!-- optional -->
+        <connectTimeout>30000</connectTimeout> <!-- optional (in ms, default 30000) -->
+        <errorsToStderr>false</errorsToStderr> <!-- optional (default false) -->
+        <includeCallerData>false</includeCallerData> <!-- optional (default false) -->
+        <logsToStderr>false</logsToStderr> <!-- optional (default false) -->
+        <maxQueueSize>104857600</maxQueueSize> <!-- optional (default 104857600) -->
+        <maxRetries>3</maxRetries> <!-- optional (default 3) -->
+        <readTimeout>30000</readTimeout> <!-- optional (in ms, default 30000) -->
+        <sleepTime>250</sleepTime> <!-- optional (in ms, default 250) -->
+        <rawJsonMessage>false</rawJsonMessage> <!-- optional (default false) -->
+        <includeMdc>false</includeMdc> <!-- optional (default false) -->
+        <maxMessageSize>20000</maxMessageSize> <!-- optional (default -1 -->
+        <!--        <authentication class="com.internetitem.logback.elasticsearch.config.BasicAuthentication" /> &lt;!&ndash; optional &ndash;&gt;-->
+        <properties>
+            <property>
+                <name>system</name>
+                <value>mes</value>
+            </property>
+            <property>
+                <name>traceId</name>
+                <value>%X{traceId}</value>
+            </property>
+            <property>
+                <name>logLevel</name>
+                <value>%level</value>
+            </property>
+            <property>
+                <name>requestMethod</name>
+                <value>%X{requestMethod}</value>
+            </property>
+            <property>
+                <name>requestTime</name>
+                <value>%d{yyyy-MM-dd HH:mm:ss.SSS}</value>
+            </property>
+            <property>
+                <name>requestIp</name>
+                <value>%X{requestIp}</value>
+            </property>
+            <property>
+                <name>thread</name>
+                <value>%thread</value>
+            </property>
+            <property>
+                <name>logger</name>
+                <value>%logger</value>
+            </property>
+        </properties>
+        <headers>
+            <header>
+                <name>Content-Type</name>
+                <value>application/json</value>
+            </header>
+        </headers>
+    </appender>
+    <springProperty scope="context" name="esIndex" source="es.index"/>
     <!-- 按照每天生成日志文件 -->
     <appender name="FILE1" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
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 29b82eb0..e58b21e3 100644
--- a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
+++ b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
@@ -123,7 +123,7 @@ https://juejin.cn/post/6844903775631572999
             <appender-ref ref="esLogAppender"/>
             <appender-ref ref="CONSOLE"/>
         </root>
-        <logger name="es-logger" level="info" additivity="false">
+        <logger name="es-logger" level="warn" additivity="false">
             <appender-ref ref="esLogAppender"/>
             <appender-ref ref="CONSOLE"/>
         </logger>