From e3f02b4cf8c8cf0bae8023021ec207404e16ef98 Mon Sep 17 00:00:00 2001
From: gtl <2949451835@qq.com>
Date: Mon, 20 May 2024 22:41:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E9=93=BE=E8=B7=AF?=
 =?UTF-8?q?=E8=BF=BD=E8=B8=AA=E7=9A=84=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-auth/pom.xml                            |  6 ++++
 ruoyi-auth/src/main/resources/bootstrap.yml   |  4 +++
 ruoyi-auth/src/main/resources/logback.xml     | 31 ++++++++++++++++++-
 .../ruoyi/file/config/ResourcesConfig.java    |  1 -
 ruoyi-modules/ruoyi-system/pom.xml            |  6 ++++
 .../src/main/resources/bootstrap.yml          |  1 +
 .../src/main/resources/logback.xml            | 31 ++++++++++++++++++-
 7 files changed, 77 insertions(+), 3 deletions(-)

diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml
index 7e74408..ee7086f 100644
--- a/ruoyi-auth/pom.xml
+++ b/ruoyi-auth/pom.xml
@@ -64,6 +64,12 @@
             <artifactId>spring-cloud-starter-zipkin</artifactId>
             <version>2.2.8.RELEASE</version>
         </dependency>
+
+        <dependency>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+            <version>5.2</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml
index c607bab..4f55968 100644
--- a/ruoyi-auth/src/main/resources/bootstrap.yml
+++ b/ruoyi-auth/src/main/resources/bootstrap.yml
@@ -33,3 +33,7 @@ spring:
   sleuth:
     sampler:
       probability: 1.0
+logging:
+  level:
+    com.ruoyi.auth: DEBUG
+  config: classpath:logback.xml
diff --git a/ruoyi-auth/src/main/resources/logback.xml b/ruoyi-auth/src/main/resources/logback.xml
index 4c01154..8d5b6de 100644
--- a/ruoyi-auth/src/main/resources/logback.xml
+++ b/ruoyi-auth/src/main/resources/logback.xml
@@ -56,7 +56,35 @@
             <onMismatch>DENY</onMismatch>
         </filter>
     </appender>
-
+    <!-- Logstash -->
+    <!-- 为logstash输出的JSON格式的Appender -->
+    <appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <destination>192.168.44.128:5044</destination>
+        <!-- 日志输出编码 -->
+        <encoder
+                class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+            <providers>
+                <timestamp>
+                    <timeZone>UTC</timeZone>
+                </timestamp>
+                <pattern>
+                    <pattern>
+                        {
+                        "severity": "%level",
+                        "service": "${springAppName:-}",
+                        "trace": "%X{X-B3-TraceId:-}",
+                        "span": "%X{X-B3-SpanId:-}",
+                        "exportable": "%X{X-Span-Export:-}",
+                        "pid": "${PID:-}",
+                        "thread": "%thread",
+                        "class": "%logger{40}",
+                        "rest": "%message"
+                        }
+                    </pattern>
+                </pattern>
+            </providers>
+        </encoder>
+    </appender>
     <!-- 系统模块日志级别控制  -->
     <logger name="com.ruoyi" level="info"/>
     <!-- Spring日志级别控制  -->
@@ -64,6 +92,7 @@
 
     <root level="info">
         <appender-ref ref="console"/>
+        <appender-ref ref="logstash" />
     </root>
 
     <!--系统操作日志-->
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java
index 12736e5..ac79764 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java
@@ -5,7 +5,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
 import java.io.File;
 
 /**
diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml
index 3b640d4..253985e 100644
--- a/ruoyi-modules/ruoyi-system/pom.xml
+++ b/ruoyi-modules/ruoyi-system/pom.xml
@@ -90,6 +90,12 @@
             <artifactId>spring-cloud-starter-zipkin</artifactId>
             <version>2.2.8.RELEASE</version>
         </dependency>
+
+        <dependency>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+            <version>5.2</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
index 1723722..dfb1bdb 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -36,3 +36,4 @@ spring:
 logging:
   level:
     com.ruoyi.system.mapper: DEBUG
+  config: classpath:logback.xml
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml
index c16cb09..4e4151c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml
@@ -56,7 +56,35 @@
             <onMismatch>DENY</onMismatch>
         </filter>
     </appender>
-
+    <!-- Logstash -->
+    <!-- 为logstash输出的JSON格式的Appender -->
+    <appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <destination>192.168.44.128:5044</destination>
+        <!-- 日志输出编码 -->
+        <encoder
+                class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+            <providers>
+                <timestamp>
+                    <timeZone>UTC</timeZone>
+                </timestamp>
+                <pattern>
+                    <pattern>
+                        {
+                        "severity": "%level",
+                        "service": "${springAppName:-}",
+                        "trace": "%X{X-B3-TraceId:-}",
+                        "span": "%X{X-B3-SpanId:-}",
+                        "exportable": "%X{X-Span-Export:-}",
+                        "pid": "${PID:-}",
+                        "thread": "%thread",
+                        "class": "%logger{40}",
+                        "rest": "%message"
+                        }
+                    </pattern>
+                </pattern>
+            </providers>
+        </encoder>
+    </appender>
     <!-- 系统模块日志级别控制  -->
     <logger name="com.ruoyi" level="info"/>
     <!-- Spring日志级别控制  -->
@@ -64,6 +92,7 @@
 
     <root level="info">
         <appender-ref ref="console"/>
+        <appender-ref ref="logstash" />
     </root>
 
     <!--系统操作日志-->