From 4ce596aa9c2d74e58cb0789e30162a27fbd8701d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 18 一月 2023 20:44:22 +0800
Subject: [PATCH] !277 项目结构重构 Merge pull request !277 from MichelleChung/5.X
---
ruoyi-admin/src/main/resources/logback.xml | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml
index 4d6b910..40fa33b 100644
--- a/ruoyi-admin/src/main/resources/logback.xml
+++ b/ruoyi-admin/src/main/resources/logback.xml
@@ -7,7 +7,7 @@
<!-- 鎺у埗鍙拌緭鍑� -->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
- <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
+ <encoder>
<pattern>${console.log.pattern}</pattern>
<charset>utf-8</charset>
</encoder>
@@ -22,7 +22,7 @@
<!-- 鏃ュ織鏈�澶� 1澶� -->
<maxHistory>1</maxHistory>
</rollingPolicy>
- <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
+ <encoder>
<pattern>${log.pattern}</pattern>
<charset>utf-8</charset>
</encoder>
@@ -42,7 +42,7 @@
<!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
<maxHistory>60</maxHistory>
</rollingPolicy>
- <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
+ <encoder>
<pattern>${log.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -64,7 +64,7 @@
<!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
<maxHistory>60</maxHistory>
</rollingPolicy>
- <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
+ <encoder>
<pattern>${log.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -78,7 +78,7 @@
</appender>
<!-- info寮傛杈撳嚭 -->
- <appender name="async_info" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
+ <appender name="async_info" class="ch.qos.logback.classic.AsyncAppender">
<!-- 涓嶄涪澶辨棩蹇�.榛樿鐨�,濡傛灉闃熷垪鐨�80%宸叉弧,鍒欎細涓㈠純TRACT銆丏EBUG銆両NFO绾у埆鐨勬棩蹇� -->
<discardingThreshold>0</discardingThreshold>
<!-- 鏇存敼榛樿鐨勯槦鍒楃殑娣卞害,璇ュ�间細褰卞搷鎬ц兘.榛樿鍊间负256 -->
@@ -88,7 +88,7 @@
</appender>
<!-- error寮傛杈撳嚭 -->
- <appender name="async_error" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
+ <appender name="async_error" class="ch.qos.logback.classic.AsyncAppender">
<!-- 涓嶄涪澶辨棩蹇�.榛樿鐨�,濡傛灉闃熷垪鐨�80%宸叉弧,鍒欎細涓㈠純TRACT銆丏EBUG銆両NFO绾у埆鐨勬棩蹇� -->
<discardingThreshold>0</discardingThreshold>
<!-- 鏇存敼榛樿鐨勯槦鍒楃殑娣卞害,璇ュ�间細褰卞搷鎬ц兘.榛樿鍊间负256 -->
@@ -97,20 +97,33 @@
<appender-ref ref="file_error"/>
</appender>
- <!-- 绯荤粺妯″潡鏃ュ織绾у埆鎺у埗 -->
- <logger name="com.ruoyi" level="info" />
- <!-- Spring鏃ュ織绾у埆鎺у埗 -->
- <logger name="org.springframework" level="warn" />
+ <!-- 鏁村悎 skywalking 鎺у埗鍙拌緭鍑� tid -->
+<!-- <appender name="console" class="ch.qos.logback.core.ConsoleAppender">-->
+<!-- <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">-->
+<!-- <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">-->
+<!-- <pattern>[%tid] ${console.log.pattern}</pattern>-->
+<!-- </layout>-->
+<!-- <charset>utf-8</charset>-->
+<!-- </encoder>-->
+<!-- </appender>-->
- <root level="info">
- <appender-ref ref="console" />
- </root>
+ <!-- 鏁村悎 skywalking 鎺ㄩ�侀噰闆嗘棩蹇� -->
+<!-- <appender name="sky_log" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">-->
+<!-- <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">-->
+<!-- <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">-->
+<!-- <pattern>[%tid] ${console.log.pattern}</pattern>-->
+<!-- </layout>-->
+<!-- <charset>utf-8</charset>-->
+<!-- </encoder>-->
+<!-- </appender>-->
<!--绯荤粺鎿嶄綔鏃ュ織-->
<root level="info">
+ <appender-ref ref="console" />
<appender-ref ref="async_info" />
<appender-ref ref="async_error" />
<appender-ref ref="file_console" />
+<!-- <appender-ref ref="sky_log"/>-->
</root>
</configuration>
--
Gitblit v1.9.3