diff --git a/yudao-framework/yudao-spring-boot-starter-monitor/pom.xml b/yudao-framework/yudao-spring-boot-starter-monitor/pom.xml
index bc8d235be..290338505 100644
--- a/yudao-framework/yudao-spring-boot-starter-monitor/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-monitor/pom.xml
@@ -44,18 +44,22 @@
io.opentracing
opentracing-util
+ true
org.apache.skywalking
apm-toolkit-trace
+ true
org.apache.skywalking
apm-toolkit-logback-1.x
+ true
org.apache.skywalking
apm-toolkit-opentracing
+ true
diff --git a/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/YudaoTracerAutoConfiguration.java b/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/YudaoTracerAutoConfiguration.java
index a3fa16503..787674262 100644
--- a/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/YudaoTracerAutoConfiguration.java
+++ b/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/YudaoTracerAutoConfiguration.java
@@ -3,6 +3,9 @@ package cn.iocoder.yudao.framework.tracer.config;
import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum;
import cn.iocoder.yudao.framework.tracer.core.aop.BizTraceAspect;
import cn.iocoder.yudao.framework.tracer.core.filter.TraceFilter;
+import io.opentracing.Tracer;
+import io.opentracing.util.GlobalTracer;
+import org.apache.skywalking.apm.toolkit.opentracing.SkywalkingTracer;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -16,30 +19,32 @@ import org.springframework.context.annotation.Bean;
* @author mashu
*/
@AutoConfiguration
-@ConditionalOnClass(value = {BizTraceAspect.class}, name = "jakarta.servlet.Filter")
+@ConditionalOnClass(name = {
+ "org.apache.skywalking.apm.toolkit.opentracing.SkywalkingTracer",
+ "io.opentracing.Tracer"
+})
@EnableConfigurationProperties(TracerProperties.class)
@ConditionalOnProperty(prefix = "yudao.tracer", value = "enable", matchIfMissing = true)
public class YudaoTracerAutoConfiguration {
- // TODO @芋艿:重要。目前 opentracing 版本存在冲突,要么保证 skywalking,要么保证阿里云短信 sdk
-// @Bean
-// public TracerProperties bizTracerProperties() {
-// return new TracerProperties();
-// }
-//
-// @Bean
-// public BizTraceAspect bizTracingAop() {
-// return new BizTraceAspect(tracer());
-// }
-//
-// @Bean
-// public Tracer tracer() {
-// // 创建 SkywalkingTracer 对象
-// SkywalkingTracer tracer = new SkywalkingTracer();
-// // 设置为 GlobalTracer 的追踪器
-// GlobalTracer.register(tracer);
-// return tracer;
-// }
+ @Bean
+ public TracerProperties bizTracerProperties() {
+ return new TracerProperties();
+ }
+
+ @Bean
+ public BizTraceAspect bizTracingAop() {
+ return new BizTraceAspect(tracer());
+ }
+
+ @Bean
+ public Tracer tracer() {
+ // 创建 SkywalkingTracer 对象
+ SkywalkingTracer tracer = new SkywalkingTracer();
+ // 设置为 GlobalTracer 的追踪器
+ GlobalTracer.registerIfAbsent(tracer);
+ return tracer;
+ }
/**
* 创建 TraceFilter 过滤器,响应 header 设置 traceId
diff --git a/yudao-gateway/src/main/resources/logback-spring.xml b/yudao-gateway/src/main/resources/logback-spring.xml
index b1b9f3faf..15b28cfdf 100644
--- a/yudao-gateway/src/main/resources/logback-spring.xml
+++ b/yudao-gateway/src/main/resources/logback-spring.xml
@@ -1,76 +1,56 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${CONSOLE_LOG_PATTERN}
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${FILE_LOG_PATTERN}
${LOG_FILE}
+
-
- ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}
-
- ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}
-
- ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}
+ ${LOG_FILE}.%d{yyyy-MM-dd}.%i.log
+ 30
+ 10MB
-
- 0
-
- 256
+ 0
+ 512
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/yudao-module-ai/yudao-module-ai-server/src/main/resources/logback-spring.xml b/yudao-module-ai/yudao-module-ai-server/src/main/resources/logback-spring.xml
index b1b9f3faf..15b28cfdf 100644
--- a/yudao-module-ai/yudao-module-ai-server/src/main/resources/logback-spring.xml
+++ b/yudao-module-ai/yudao-module-ai-server/src/main/resources/logback-spring.xml
@@ -1,76 +1,56 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${CONSOLE_LOG_PATTERN}
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${FILE_LOG_PATTERN}
${LOG_FILE}
+
-
- ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}
-
- ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}
-
- ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}
+ ${LOG_FILE}.%d{yyyy-MM-dd}.%i.log
+ 30
+ 10MB
-
- 0
-
- 256
+ 0
+ 512
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/yudao-module-bpm/yudao-module-bpm-server/src/main/resources/logback-spring.xml b/yudao-module-bpm/yudao-module-bpm-server/src/main/resources/logback-spring.xml
index b1b9f3faf..15b28cfdf 100644
--- a/yudao-module-bpm/yudao-module-bpm-server/src/main/resources/logback-spring.xml
+++ b/yudao-module-bpm/yudao-module-bpm-server/src/main/resources/logback-spring.xml
@@ -1,76 +1,56 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${CONSOLE_LOG_PATTERN}
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${FILE_LOG_PATTERN}
${LOG_FILE}
+
-
- ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}
-
- ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}
-
- ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}
+ ${LOG_FILE}.%d{yyyy-MM-dd}.%i.log
+ 30
+ 10MB
-
- 0
-
- 256
+ 0
+ 512
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/yudao-module-crm/yudao-module-crm-server/src/main/resources/logback-spring.xml b/yudao-module-crm/yudao-module-crm-server/src/main/resources/logback-spring.xml
index b1b9f3faf..15b28cfdf 100644
--- a/yudao-module-crm/yudao-module-crm-server/src/main/resources/logback-spring.xml
+++ b/yudao-module-crm/yudao-module-crm-server/src/main/resources/logback-spring.xml
@@ -1,76 +1,56 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${CONSOLE_LOG_PATTERN}
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${FILE_LOG_PATTERN}
${LOG_FILE}
+
-
- ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}
-
- ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}
-
- ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}
+ ${LOG_FILE}.%d{yyyy-MM-dd}.%i.log
+ 30
+ 10MB
-
- 0
-
- 256
+ 0
+ 512
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/yudao-module-erp/yudao-module-erp-server/src/main/resources/logback-spring.xml b/yudao-module-erp/yudao-module-erp-server/src/main/resources/logback-spring.xml
index b1b9f3faf..15b28cfdf 100644
--- a/yudao-module-erp/yudao-module-erp-server/src/main/resources/logback-spring.xml
+++ b/yudao-module-erp/yudao-module-erp-server/src/main/resources/logback-spring.xml
@@ -1,76 +1,56 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${CONSOLE_LOG_PATTERN}
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${FILE_LOG_PATTERN}
${LOG_FILE}
+
-
- ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}
-
- ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}
-
- ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}
+ ${LOG_FILE}.%d{yyyy-MM-dd}.%i.log
+ 30
+ 10MB
-
- 0
-
- 256
+ 0
+ 512
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/resources/logback-spring.xml b/yudao-module-infra/yudao-module-infra-server/src/main/resources/logback-spring.xml
index b1b9f3faf..15b28cfdf 100644
--- a/yudao-module-infra/yudao-module-infra-server/src/main/resources/logback-spring.xml
+++ b/yudao-module-infra/yudao-module-infra-server/src/main/resources/logback-spring.xml
@@ -1,76 +1,56 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${CONSOLE_LOG_PATTERN}
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${FILE_LOG_PATTERN}
${LOG_FILE}
+
-
- ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}
-
- ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}
-
- ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}
+ ${LOG_FILE}.%d{yyyy-MM-dd}.%i.log
+ 30
+ 10MB
-
- 0
-
- 256
+ 0
+ 512
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/logback-spring.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/logback-spring.xml
index b1b9f3faf..15b28cfdf 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/logback-spring.xml
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/logback-spring.xml
@@ -1,76 +1,56 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${CONSOLE_LOG_PATTERN}
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${FILE_LOG_PATTERN}
${LOG_FILE}
+
-
- ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}
-
- ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}
-
- ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}
+ ${LOG_FILE}.%d{yyyy-MM-dd}.%i.log
+ 30
+ 10MB
-
- 0
-
- 256
+ 0
+ 512
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/yudao-module-mall/yudao-module-product-server/src/main/resources/logback-spring.xml b/yudao-module-mall/yudao-module-product-server/src/main/resources/logback-spring.xml
index b1b9f3faf..15b28cfdf 100644
--- a/yudao-module-mall/yudao-module-product-server/src/main/resources/logback-spring.xml
+++ b/yudao-module-mall/yudao-module-product-server/src/main/resources/logback-spring.xml
@@ -1,76 +1,56 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${CONSOLE_LOG_PATTERN}
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${FILE_LOG_PATTERN}
${LOG_FILE}
+
-
- ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}
-
- ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}
-
- ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}
+ ${LOG_FILE}.%d{yyyy-MM-dd}.%i.log
+ 30
+ 10MB
-
- 0
-
- 256
+ 0
+ 512
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/yudao-module-mall/yudao-module-promotion-server/src/main/resources/logback-spring.xml b/yudao-module-mall/yudao-module-promotion-server/src/main/resources/logback-spring.xml
index b1b9f3faf..15b28cfdf 100644
--- a/yudao-module-mall/yudao-module-promotion-server/src/main/resources/logback-spring.xml
+++ b/yudao-module-mall/yudao-module-promotion-server/src/main/resources/logback-spring.xml
@@ -1,76 +1,56 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${CONSOLE_LOG_PATTERN}
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${FILE_LOG_PATTERN}
${LOG_FILE}
+
-
- ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}
-
- ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}
-
- ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}
+ ${LOG_FILE}.%d{yyyy-MM-dd}.%i.log
+ 30
+ 10MB
-
- 0
-
- 256
+ 0
+ 512
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/yudao-module-mall/yudao-module-statistics-server/src/main/resources/logback-spring.xml b/yudao-module-mall/yudao-module-statistics-server/src/main/resources/logback-spring.xml
index b1b9f3faf..15b28cfdf 100644
--- a/yudao-module-mall/yudao-module-statistics-server/src/main/resources/logback-spring.xml
+++ b/yudao-module-mall/yudao-module-statistics-server/src/main/resources/logback-spring.xml
@@ -1,76 +1,56 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${CONSOLE_LOG_PATTERN}
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${FILE_LOG_PATTERN}
${LOG_FILE}
+
-
- ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}
-
- ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}
-
- ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}
+ ${LOG_FILE}.%d{yyyy-MM-dd}.%i.log
+ 30
+ 10MB
-
- 0
-
- 256
+ 0
+ 512
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/yudao-module-mall/yudao-module-trade-server/src/main/resources/logback-spring.xml b/yudao-module-mall/yudao-module-trade-server/src/main/resources/logback-spring.xml
index b1b9f3faf..15b28cfdf 100644
--- a/yudao-module-mall/yudao-module-trade-server/src/main/resources/logback-spring.xml
+++ b/yudao-module-mall/yudao-module-trade-server/src/main/resources/logback-spring.xml
@@ -1,76 +1,56 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${CONSOLE_LOG_PATTERN}
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${FILE_LOG_PATTERN}
${LOG_FILE}
+
-
- ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}
-
- ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}
-
- ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}
+ ${LOG_FILE}.%d{yyyy-MM-dd}.%i.log
+ 30
+ 10MB
-
- 0
-
- 256
+ 0
+ 512
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/yudao-module-member/yudao-module-member-server/src/main/resources/logback-spring.xml b/yudao-module-member/yudao-module-member-server/src/main/resources/logback-spring.xml
index b1b9f3faf..15b28cfdf 100644
--- a/yudao-module-member/yudao-module-member-server/src/main/resources/logback-spring.xml
+++ b/yudao-module-member/yudao-module-member-server/src/main/resources/logback-spring.xml
@@ -1,76 +1,56 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${CONSOLE_LOG_PATTERN}
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${FILE_LOG_PATTERN}
${LOG_FILE}
+
-
- ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}
-
- ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}
-
- ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}
+ ${LOG_FILE}.%d{yyyy-MM-dd}.%i.log
+ 30
+ 10MB
-
- 0
-
- 256
+ 0
+ 512
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/yudao-module-mp/yudao-module-mp-server/src/main/resources/logback-spring.xml b/yudao-module-mp/yudao-module-mp-server/src/main/resources/logback-spring.xml
index b1b9f3faf..15b28cfdf 100644
--- a/yudao-module-mp/yudao-module-mp-server/src/main/resources/logback-spring.xml
+++ b/yudao-module-mp/yudao-module-mp-server/src/main/resources/logback-spring.xml
@@ -1,76 +1,56 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${CONSOLE_LOG_PATTERN}
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${FILE_LOG_PATTERN}
${LOG_FILE}
+
-
- ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}
-
- ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}
-
- ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}
+ ${LOG_FILE}.%d{yyyy-MM-dd}.%i.log
+ 30
+ 10MB
-
- 0
-
- 256
+ 0
+ 512
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/yudao-module-pay/yudao-module-pay-server/src/main/resources/logback-spring.xml b/yudao-module-pay/yudao-module-pay-server/src/main/resources/logback-spring.xml
index b1b9f3faf..15b28cfdf 100644
--- a/yudao-module-pay/yudao-module-pay-server/src/main/resources/logback-spring.xml
+++ b/yudao-module-pay/yudao-module-pay-server/src/main/resources/logback-spring.xml
@@ -1,76 +1,56 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${CONSOLE_LOG_PATTERN}
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${FILE_LOG_PATTERN}
${LOG_FILE}
+
-
- ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}
-
- ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}
-
- ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}
+ ${LOG_FILE}.%d{yyyy-MM-dd}.%i.log
+ 30
+ 10MB
-
- 0
-
- 256
+ 0
+ 512
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/yudao-module-report/yudao-module-report-server/src/main/resources/logback-spring.xml b/yudao-module-report/yudao-module-report-server/src/main/resources/logback-spring.xml
index b1b9f3faf..15b28cfdf 100644
--- a/yudao-module-report/yudao-module-report-server/src/main/resources/logback-spring.xml
+++ b/yudao-module-report/yudao-module-report-server/src/main/resources/logback-spring.xml
@@ -1,76 +1,56 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${CONSOLE_LOG_PATTERN}
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${FILE_LOG_PATTERN}
${LOG_FILE}
+
-
- ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}
-
- ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}
-
- ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}
+ ${LOG_FILE}.%d{yyyy-MM-dd}.%i.log
+ 30
+ 10MB
-
- 0
-
- 256
+ 0
+ 512
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/yudao-module-system/yudao-module-system-server/src/main/resources/logback-spring.xml b/yudao-module-system/yudao-module-system-server/src/main/resources/logback-spring.xml
index b1b9f3faf..15b28cfdf 100644
--- a/yudao-module-system/yudao-module-system-server/src/main/resources/logback-spring.xml
+++ b/yudao-module-system/yudao-module-system-server/src/main/resources/logback-spring.xml
@@ -1,76 +1,56 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${CONSOLE_LOG_PATTERN}
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${FILE_LOG_PATTERN}
${LOG_FILE}
+
-
- ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}
-
- ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}
-
- ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}
+ ${LOG_FILE}.%d{yyyy-MM-dd}.%i.log
+ 30
+ 10MB
-
- 0
-
- 256
+ 0
+ 512
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/yudao-server/src/main/resources/logback-spring.xml b/yudao-server/src/main/resources/logback-spring.xml
index b1b9f3faf..15b28cfdf 100644
--- a/yudao-server/src/main/resources/logback-spring.xml
+++ b/yudao-server/src/main/resources/logback-spring.xml
@@ -1,76 +1,56 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${CONSOLE_LOG_PATTERN}
-
-
- ${PATTERN_DEFAULT}
-
+
+ ${FILE_LOG_PATTERN}
${LOG_FILE}
+
-
- ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}
-
- ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}
-
- ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}
-
- ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}
+ ${LOG_FILE}.%d{yyyy-MM-dd}.%i.log
+ 30
+ 10MB
-
- 0
-
- 256
+ 0
+ 512
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+