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 @@ spring-cloud-starter-zipkin 2.2.8.RELEASE + + + net.logstash.logback + logstash-logback-encoder + 5.2 + 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 @@ DENY - + + + + 192.168.44.128:5044 + + + + + UTC + + + + { + "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" + } + + + + + @@ -64,6 +92,7 @@ + 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 @@ spring-cloud-starter-zipkin 2.2.8.RELEASE + + + net.logstash.logback + logstash-logback-encoder + 5.2 + 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 @@ DENY - + + + + 192.168.44.128:5044 + + + + + UTC + + + + { + "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" + } + + + + + @@ -64,6 +92,7 @@ +