更新日志

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

@@ -14,9 +14,11 @@ https://juejin.cn/post/6844903775631572999
     <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"/>
+    <property name="LOKI_URL" value="${lokiUrl}"/>
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
     <property name="LOG_HOME" value="${logPath}"/>
     <!--引入默认的一些设置-->
-    <!--引入默认的一些设置-->
     <include resource="log/AutoCreateInst.xml"/>
     <include resource="log/QueryAgvTaskStatus.xml"/>
     <include resource="log/AgvFeedbackServiceImpl.xml"/>
@@ -26,53 +28,15 @@ https://juejin.cn/post/6844903775631572999
     <include resource="log/WmsToAcs.xml"/>
     <include resource="log/QueryXZAgvTaskStatus.xml"/>
     <include resource="log/NDCSocketConnectionAutoRun.xml"/>
-    <include resource="log/QueryMagicAgvDeviceStatus.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.MongoDBAppender">
-        <host>192.168.81.251</host>
-        <port>27017</port>
-      <!--   <username>admin</username>
-         <password>123456</password>-->
-         <dbName>acs_log</dbName>
-        <collectionName>default</collectionName>
-        <source>${CONTEXT_NAME}</source>
-        <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">
@@ -98,15 +62,35 @@ 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>root=root,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="off">
+        <root level="info">
             <appender-ref ref="CONSOLE"/>
-            <appender-ref ref="MONGO"/>
+            <appender-ref ref="lokiAppender" />
         </root>
 
+        <logger name="org.nl.acs.log.service.impl.DeviceExecuteLogServiceImpl" level="info" additivity="false">
+            <appender-ref ref="lokiAppender" />
+        </logger>
+
         <logger name="jdbc.audit" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
         </logger>
@@ -116,9 +100,6 @@ 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>
@@ -137,6 +118,7 @@ https://juejin.cn/post/6844903775631572999
         </logger>
         <root level="info">
             <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="lokiAppender" />
         </root>
     </springProfile>
 
@@ -144,7 +126,7 @@ https://juejin.cn/post/6844903775631572999
     <springProfile name="prod">
         <root level="off">
             <appender-ref ref="asyncFileAppender"/>
+            <appender-ref ref="lokiAppender" />
         </root>
     </springProfile>
-
 </configuration>