更新

wcs/hd/nladmin-system/src/main/resources/config/application-dev.yml

@@ -9,9 +9,9 @@ spring:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
       url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hl_acs_one}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-#      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.225}:${DB_PORT:3306}/${DB_NAME:hl_acs_one}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
+#      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hl_acs_one}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
       username: ${DB_USER:root}
-#      password: ${DB_PWD:123456}
+      #password: ${DB_PWD:123456}
       #password: ${DB_PWD:Root.123456}
       password: ${DB_PWD:password}
       # 初始连接数
@@ -57,11 +57,6 @@ spring:
         wall:
           config:
             multi-statement-alagvslow: true
-  data:
-    mongodb:
-      host: 127.0.0.1
-      port: 27017
-      database: nlacs
   redis:
     #数据库索引
     database: ${REDIS_DB:10}
@@ -164,3 +159,6 @@ jetcache:
       uri:
         - redis://127.0.0.1:6379
 
+loki:
+  url: http://localhost:3100/loki/api/v1
+  systemName: acs

wcs/hd/nladmin-system/src/main/resources/config/application-prod.yml

@@ -164,3 +164,6 @@ jetcache:
       uri:
         - redis://192.168.46.225:6379
 
+loki:
+  url: http://localhost:3100/loki/api/v1
+  systemName: acs

wcs/hd/nladmin-system/src/main/resources/config/application.yml

@@ -2,7 +2,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: prod
+    active: dev
   jackson:
     time-zone: GMT+8
   data:

wcs/hd/nladmin-system/src/main/resources/log/AcsToErp.xml

@@ -1,14 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <included>
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <appender name="acs_to_erp" class="org.nl.modules.log.MongoDBAppenderBase">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>info</level>
-        </filter>
+    <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="acs_to_erp"/>
+    <logger name="org.nl.acs.ext.erp.service.impl.AcsToErpServiceImpl" level="info" additivity="false">
+        <appender-ref ref="lokiAppender" />
     </logger>
 </included>

wcs/hd/nladmin-system/src/main/resources/log/AcsToWms.xml

@@ -1,14 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <included>
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <appender name="acs_to_wms" class="org.nl.modules.log.MongoDBAppenderBase">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>info</level>
-        </filter>
+    <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_wms</pattern>
+            </label>
+            <message>
+                <pattern>${log.pattern}</pattern>
+            </message>
+            <sortByTime>true</sortByTime>
+        </format>
     </appender>
 
     <!-- 打印sql -->
     <logger name="org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl" level="info" additivity="false">
-        <appender-ref ref="acs_to_wms"/>
+        <appender-ref ref="lokiAppender" />
     </logger>
 </included>

wcs/hd/nladmin-system/src/main/resources/log/AgvFeedbackServiceImpl.xml

@@ -1,13 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <included>
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <appender name="agv_feedback_servlet" class="org.nl.modules.log.MongoDBAppenderBase">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>info</level>
-        </filter>
+    <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="agv_feedback_servlet"/>
+        <appender-ref ref="lokiAppender" />
     </logger>
 </included>

wcs/hd/nladmin-system/src/main/resources/log/AgvLeaveServlet.xml

@@ -1,15 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <included>
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <appender name="agv_leave_servlet" class="org.nl.modules.log.MongoDBAppenderBase">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>info</level>
-        </filter>
+    <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="agv_leave_servlet"/>
+        <appender-ref ref="lokiAppender" />
     </logger>
 
 </included>

wcs/hd/nladmin-system/src/main/resources/log/AutoCreateInst.xml

@@ -1,13 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <included>
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <appender name="auto_create_inst" class="org.nl.modules.log.MongoDBAppenderBase">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>info</level>
-        </filter>
+    <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=auto_create_inst</pattern>
+            </label>
+            <message>
+                <pattern>${log.pattern}</pattern>
+            </message>
+            <sortByTime>true</sortByTime>
+        </format>
     </appender>
     <!-- 打印sql -->
-    <logger name="org.nl.modules.quartz.task1.AutoCreateInst" level="info" additivity="false">
-        <appender-ref ref="auto_create_inst"/>
+    <logger name="org.nl.modules.quartz.task.AutoCreateInst" level="info" additivity="false">
+        <appender-ref ref="lokiAppender" />
     </logger>
 </included>

wcs/hd/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml

@@ -1,14 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <included>
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <appender name="ndc_socket_connection_autorun" class="org.nl.modules.log.MongoDBAppenderBase">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>info</level>
-        </filter>
+    <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=ndc_socket_connection_autorun</pattern>
+            </label>
+            <message>
+                <pattern>${log.pattern}</pattern>
+            </message>
+            <sortByTime>true</sortByTime>
+        </format>
     </appender>
 
     <!-- 打印sql -->
     <logger name="org.nl.start.auto.run.NDCSocketConnectionAutoRun" level="info" additivity="false">
-        <appender-ref ref="ndc_socket_connection_autorun"/>
+        <appender-ref ref="lokiAppender" />
     </logger>
 </included>

wcs/hd/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml

@@ -1,12 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <included>
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <appender name="agv_task_status" class="org.nl.modules.log.MongoDBAppenderBase">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>info</level>
-        </filter>
+    <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_task_status</pattern>
+            </label>
+            <message>
+                <pattern>${log.pattern}</pattern>
+            </message>
+            <sortByTime>true</sortByTime>
+        </format>
     </appender>
     <logger name="org.nl.modules.quartz.task.QueryMagicAgvTaskStatus" level="info" additivity="false">
-        <appender-ref ref="agv_task_status"/>
+        <appender-ref ref="lokiAppender" />
     </logger>
 </included>

wcs/hd/nladmin-system/src/main/resources/log/QueryXZAgvTaskStatus.xml

@@ -1,12 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <included>
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <appender name="xz_agv_task_status" class="org.nl.modules.log.MongoDBAppenderBase">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>info</level>
-        </filter>
+    <springProperty scope="context" name="lokiUrl" source="loki.url"/>
+    <property name="LOKI_URL" value="${lokiUrl}"/>
+    <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)"/>
+
+    <!--添加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=xz_agv_task_status</pattern>
+            </label>
+            <message>
+                <pattern>${log.pattern}</pattern>
+            </message>
+            <sortByTime>true</sortByTime>
+        </format>
     </appender>
-    <logger name="org.nl.modules.quartz.task1.QueryXZAgvTaskStatus" level="info" additivity="false">
-        <appender-ref ref="xz_agv_task_status"/>
+    <logger name="org.nl.modules.quartz.task.QueryXZAgvTaskStatus" level="info" additivity="false">
+        <appender-ref ref="lokiAppender" />
     </logger>
 </included>

wcs/hd/nladmin-system/src/main/resources/log/WmsToAcs.xml

@@ -1,16 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<included>
-    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <appender name="wms_to_acs" class="org.nl.modules.log.MongoDBAppenderBase">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>info</level>
-        </filter>
-    </appender>
-    <!-- 打印sql -->
-    <logger name="org.nl.acs.ext.wms.service.impl.WmsToAcsServiceImpl" level="info" additivity="false">
-        <appender-ref ref="wms_to_acs"/>
-    </logger>
-    <!--<logger name="org.nl.acs.device_driver.electric_fence.ItemProtocol" level="info" additivity="false">
-        <appender-ref ref="wms_to_acs"/>
-    </logger>-->
-</included>
+<!--<?xml version="1.0" encoding="UTF-8"?>-->
+<!--<included>-->
+<!--    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>-->
+<!--    <springProperty scope="context" name="lokiUrl" source="loki.url"/>-->
+<!--    <property name="LOKI_URL" value="${lokiUrl}"/>-->
+<!--    <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)"/>-->
+
+<!--    &lt;!&ndash;添加loki&ndash;&gt;-->
+<!--    <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=wms_to_acs</pattern>-->
+<!--            </label>-->
+<!--            <message>-->
+<!--                <pattern>${log.pattern}</pattern>-->
+<!--            </message>-->
+<!--            <sortByTime>true</sortByTime>-->
+<!--        </format>-->
+<!--    </appender>-->
+
+<!--    &lt;!&ndash; 打印sql &ndash;&gt;-->
+<!--    <logger name="org.nl.acs.ext.wms.service.impl.WmsToAcsServiceImpl" level="info" additivity="false">-->
+<!--        <appender-ref ref="lokiAppender" />-->
+<!--    </logger>-->
+<!--</included>-->

wcs/hd/nladmin-system/src/main/resources/logback-spring.xml

@@ -10,61 +10,35 @@ https://juejin.cn/post/6844903775631572999
 
 <configuration scan="true" scanPeriod="30 seconds" debug="false">
     <contextName>nlAdmin</contextName>
-    <property name="log.charset" value="utf-8"/>
+    <property name="log.charset" value="GBK"/>
     <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="logPath" source="logging.file.path" defaultValue="logs"/>
+    <springProperty scope="context" name="lokiUrl" source="loki.url"/>
+    <springProperty scope="context" name="systemName" source="loki.systemName"/>
+    <property name="LOKI_URL" value="${lokiUrl}"/>
+    <property name="SYSTEM_NAME" value="${systemName}"/>
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
     <property name="LOG_HOME" value="${logPath}"/>
     <!--引入默认的一些设置-->
-    <include resource="log/AutoCreateInst.xml"/>
-    <include resource="log/QueryAgvTaskStatus.xml"/>
-    <include resource="log/AgvFeedbackServiceImpl.xml"/>
-    <include resource="log/AgvLeaveServlet.xml"/>
-    <include resource="log/AcsToErp.xml"/>
-    <include resource="log/AcsToWms.xml"/>
-    <include resource="log/WmsToAcs.xml"/>
-    <include resource="log/QueryXZAgvTaskStatus.xml"/>
-    <include resource="log/NDCSocketConnectionAutoRun.xml"/>
-    <include resource="log/QueryMagicAgvDeviceStatus.xml"/>
+    <!--  <include resource="log/AutoCreateInst.xml"/>
+      <include resource="log/QueryAgvTaskStatus.xml"/>
+      <include resource="log/AgvFeedbackServiceImpl.xml"/>
+      <include resource="log/AgvLeaveServlet.xml"/>
+      <include resource="log/AcsToErp.xml"/>
+      <include resource="log/AcsToWms.xml"/>
+      <include resource="log/WmsToAcs.xml"/>
+      <include resource="log/QueryXZAgvTaskStatus.xml"/>
+      <include resource="log/NDCSocketConnectionAutoRun.xml"/>-->
+    <!--    <include resource="log/QueryMagicAgvDeviceStatus.xml"/>-->
 
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>${log.pattern}</pattern>
             <charset>${log.charset}</charset>
         </encoder>
-
-        <!--    转为JSON    https://www.zoleet.com/details/328.html-->
-       <!-- <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
-            <providers>
-                <pattern>
-                    <pattern>
-                        {
-                        "appName": "logistics-core",
-                        "time": "%date{yyyy-MM-dd HH:mm:ss.SSS}",
-                        "level": "%level",
-                        "pid": "${PID:-}",
-                        "thread": "%thread",
-                        "class": "%logger",
-                        "method": "%method",
-                        "line": "%line",
-                        "message": "%message",
-                        "statck_trace": "%xEx"
-                        }
-                    </pattern>
-                </pattern>
-            </providers>
-        </encoder>-->
     </appender>
 
-    <appender name="MONGO" class="org.nl.modules.log.MongoDBAppenderBase">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>info</level>
-        </filter>
-    </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">
@@ -90,16 +64,46 @@ https://juejin.cn/post/6844903775631572999
         <appender-ref ref="FILE"/>
     </appender>
 
+    <!--添加loki-->
+    <appender name="lokiAppender" class="com.github.loki4j.logback.Loki4jAppender">
+        <batchTimeoutMs>1000</batchTimeoutMs>
+        <http class="com.github.loki4j.logback.ApacheHttpSender">
+            <url>${LOKI_URL}/push</url>
+        </http>
+        <format>
+            <label>
+                <pattern>system=${SYSTEM_NAME},level=%level,logType=%X{log_file_type:-logType},device=%X{device_code_log:-device}</pattern>
+            </label>
+            <message>
+                <pattern>${log.pattern}</pattern>
+            </message>
+            <sortByTime>true</sortByTime>
+        </format>
+    </appender>
 
 
     <!--开发环境:打印控制台-->
     <springProfile name="dev">
         <root level="info">
             <appender-ref ref="CONSOLE"/>
-            <appender-ref ref="MONGO"/>
+            <appender-ref ref="lokiAppender" />
         </root>
+        <!--logmanage -->
+        <logger name="org.nl.acs.log.service.impl.DeviceExecuteLogServiceImpl" level="info" additivity="false">
+            <appender-ref ref="lokiAppender" />
+        </logger>
+        <logger name="jdbc.resultsettable" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="lokiAppender" />
+        </logger>
+        <logger name="org.openscada.opc.lib.da.Server" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="lokiAppender" />
+        </logger>
+        <!--logmanage -->
 
-        <logger name="jdbc.audit" level="off" additivity="false">
+
+        <logger name="jdbc.audit" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
         </logger>
         <logger name="jdbc.resultset" level="ERROR" additivity="false">
@@ -108,16 +112,13 @@ https://juejin.cn/post/6844903775631572999
         <logger name="springfox.documentation" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="jdbc.resultsettable" level="ERROR" additivity="false">
-            <appender-ref ref="CONSOLE"/>
-        </logger>
         <logger name="jdbc.sqlonly" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
         </logger>
         <logger name="jdbc.sqltiming" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="org.jinterop" level="off" additivity="false">
+        <logger name="org.jinterop" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
         </logger>
     </springProfile>
@@ -129,14 +130,48 @@ https://juejin.cn/post/6844903775631572999
         </logger>
         <root level="info">
             <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="lokiAppender" />
         </root>
     </springProfile>
 
     <!--生产环境:打印控制台和输出到文件-->
     <springProfile name="prod">
-        <root level="off">
-            <appender-ref ref="asyncFileAppender"/>
+        <root level="info">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="lokiAppender" />
         </root>
-    </springProfile>
+        <!--logmanage -->
+        <logger name="org.nl.acs.log.service.impl.DeviceExecuteLogServiceImpl" level="info" additivity="false">
+            <appender-ref ref="lokiAppender" />
+        </logger>
+        <logger name="jdbc.resultsettable" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="lokiAppender" />
+        </logger>
+        <logger name="org.openscada.opc.lib.da.Server" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="lokiAppender" />
+        </logger>
+        <!--logmanage -->
 
+
+        <logger name="jdbc.audit" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="jdbc.resultset" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="springfox.documentation" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="jdbc.sqlonly" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="jdbc.sqltiming" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="org.jinterop" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+    </springProfile>
 </configuration>