From 33ab45fd0086a11582f2bb1c12bfae73938399b2 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 26 Apr 2021 09:46:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A2=B3=E7=90=86=20logback-spring.xml=20?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tracer/core/aop/BizTraceAspect.java       |  2 +-
 src/main/resources/application-local.yaml     |  1 +
 src/main/resources/logback-spring.xml         | 62 ++++++++-----------
 3 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/src/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java b/src/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java
index 5f1d945b0..bff0fe300 100644
--- a/src/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java
+++ b/src/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java
@@ -58,7 +58,7 @@ public class BizTraceAspect {
             span.setTag(BizTrace.TYPE_TAG, StrUtil.toString(SpElUtil.analysisSpEl(trace.type(), joinPoint)));
             span.setTag(BizTrace.ID_TAG, StrUtil.toString(SpElUtil.analysisSpEl(trace.id(), joinPoint)));
         } catch (Exception ex) {
-            log.error("[around][解析 bizType 与 bizId 发生异常]", ex);
+            log.error("[setBizTag][解析 bizType 与 bizId 发生异常]", ex);
         }
     }
 
diff --git a/src/main/resources/application-local.yaml b/src/main/resources/application-local.yaml
index f99655ebe..fd25bfc64 100644
--- a/src/main/resources/application-local.yaml
+++ b/src/main/resources/application-local.yaml
@@ -146,6 +146,7 @@ spring:
 logging:
   file:
     path: ${user.home}/logs/ # 日志文件的路径
+    name: ${spring.application.name} # 日志文件名
 
 --- #################### 芋道相关配置 ####################
 
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 16f7d5261..49eb3c249 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -1,70 +1,62 @@
-<configuration>　　
-    　
+<configuration>
+    <!-- 变量 -->
+    <springProperty scope="context" name="yudao.info.base-package" source="yudao.info.base-package"/>
+    <property name="PATTERN_DEFAULT" value="%d{yyyy-MM-dd HH:mm:ss.SSS} | %tid | %thread | %-5level | %msg%n"/>
+
+    <!-- 控制台 Appender -->
     <appender name="STDOUT" 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>%d{ISO8601} | %tid | %thread | %-5level | %msg%n</pattern>
+                <pattern>${PATTERN_DEFAULT}</pattern>
             </layout>
         </encoder>
     </appender>
 
+    <!-- 文件 Appender -->
     <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>./logs/ruoyi-vue-pro-%d{yyyy-MM-dd_HH}.log</FileNamePattern>
-            <MaxHistory>3</MaxHistory>
-        </rollingPolicy>
         <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
             <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
-                <pattern>%d{ISO8601} | %tid | %thread | %-5level | %msg%n</pattern>
+                <pattern>${PATTERN_DEFAULT}</pattern>
             </layout>
         </encoder>
-        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <MaxFileSize>10MB</MaxFileSize>
-        </triggeringPolicy>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE}.%d{yyyy-MM-dd}.%i.log}</fileNamePattern>
+            <maxFileSize>10MB</maxFileSize>
+            <maxHistory>7</maxHistory>
+            <cleanHistoryOnStart>false</cleanHistoryOnStart>
+        </rollingPolicy>
     </appender>
-
     <appender name="ASYNC" class="ch.qos.logback.classic.AsyncAppender">
         <discardingThreshold>0</discardingThreshold>
         <queueSize>10</queueSize>
         <appender-ref ref="FILE"/>
     </appender>
 
-    <!-- skywalking grpc 日志收集 8.4.0版本开始支持 -->
+    <!-- SkyWalking GRPC 日志收集，实现日志中心。注意：SkyWalking 8.4.0 版本开始支持 -->
     <appender name="GRPC" 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.mdc.TraceIdMDCPatternLogbackLayout">
-                <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%X{tid}] [%thread] %-5level %logger{36} -%msg%n</Pattern>
+                <pattern>${PATTERN_DEFAULT}</pattern>
             </layout>
-        </encoder>s
+        </encoder>
     </appender>
 
-    <springProfile name="dev">
-        <logger name="cn.iocoder.dashboard" level="INFO" additivity="false">
+    <!-- 本地环境 -->
+    <springProfile name="local">
+        <logger name="${yudao.info.base-package}" level="INFO" additivity="false">
             <appender-ref ref="STDOUT"/>
+            <appender-ref ref="GRPC"/>
             <appender-ref ref="ASYNC"/>
+            <!-- 本地环境下，不打印日志文件 -->
         </logger>
     </springProfile>
-
-    <springProfile name="local">
-        <logger name="cn.iocoder.dashboard" level="INFO" additivity="false">
+    <!-- 其它环境 -->
+    <springProfile name="default">
+        <logger name="${yudao.info.base-package}" level="INFO" additivity="false">
             <appender-ref ref="STDOUT"/>
+            <appender-ref ref="ASYNC"/>
             <appender-ref ref="GRPC"/>
         </logger>
     </springProfile>
 
-    <springProfile name="default">
-        <logger name="cn.iocoder.dashboard" level="INFO" additivity="false">
-            <appender-ref ref="STDOUT"/>
-            <appender-ref ref="ASYNC"/>
-        </logger>
-    </springProfile>
-
-    <root level="INFO">　　　　　　
-        <appender-ref ref="STDOUT"/>　　　
-        <appender-ref ref="ASYNC"/>　
-    </root>
-
-    <logger name="cn.iocoder.dashboard" level="INFO">
-        <appender-ref ref="STDOUT"/>
-    </logger>
 </configuration>