From 4605d42cf4bc37be25d4dceef4c06becf59435b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Wed, 2 Nov 2022 17:22:47 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E6=8A=BD?= =?UTF-8?q?=E5=8F=96=20logback=20=E9=80=9A=E7=94=A8=E9=85=8D=E7=BD=AE=20lo?= =?UTF-8?q?gback-common.xml=20=E7=AE=80=E5=8C=96=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=97=A5=E5=BF=97=E6=96=87=E4=BB=B6=E4=B9=A6?= =?UTF-8?q?=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-auth/src/main/resources/logback.xml | 88 +---------------- .../src/main/resources/logback-common.xml | 97 +++++++++++++++++++ .../ruoyi-demo/src/main/resources/logback.xml | 88 +---------------- .../src/main/resources/logback.xml | 88 +---------------- ruoyi-gateway/src/main/resources/logback.xml | 88 +---------------- .../ruoyi-gen/src/main/resources/logback.xml | 88 +---------------- .../ruoyi-job/src/main/resources/logback.xml | 88 +---------------- .../src/main/resources/logback.xml | 88 +---------------- .../src/main/resources/logback.xml | 88 +---------------- .../src/main/resources/logback.xml | 88 +---------------- .../src/main/resources/logback-spring.xml | 88 +---------------- .../src/main/resources/logback.xml | 88 +---------------- .../src/main/resources/logback.xml | 88 +---------------- 13 files changed, 109 insertions(+), 1044 deletions(-) create mode 100644 ruoyi-common/ruoyi-common-core/src/main/resources/logback-common.xml diff --git a/ruoyi-auth/src/main/resources/logback.xml b/ruoyi-auth/src/main/resources/logback.xml index 4d66014c..a2e187f8 100644 --- a/ruoyi-auth/src/main/resources/logback.xml +++ b/ruoyi-auth/src/main/resources/logback.xml @@ -5,7 +5,6 @@ <!-- 日志输出格式 --> <property name="console.log.pattern" value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/> - <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/> <!-- 控制台输出 --> <appender name="console" class="ch.qos.logback.core.ConsoleAppender"> @@ -15,89 +14,7 @@ </encoder> </appender> - <!-- 控制台输出 --> - <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/console.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/console.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大 1天 --> - <maxHistory>1</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - <charset>utf-8</charset> - </encoder> - <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - </filter> - </appender> - - <!-- 系统日志输出 --> - <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/info.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/error.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>ERROR</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <!-- info异步输出 --> - <appender name="async_info" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_info"/> - </appender> - - <!-- error异步输出 --> - <appender name="async_error" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_error"/> - </appender> + <include resource="logback-common.xml" /> <include resource="logback-logstash.xml" /> @@ -107,8 +24,5 @@ <!--系统操作日志--> <root level="info"> <appender-ref ref="console"/> - <appender-ref ref="async_info"/> - <appender-ref ref="async_error"/> - <appender-ref ref="file_console"/> </root> </configuration> diff --git a/ruoyi-common/ruoyi-common-core/src/main/resources/logback-common.xml b/ruoyi-common/ruoyi-common-core/src/main/resources/logback-common.xml new file mode 100644 index 00000000..89eaa97e --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/resources/logback-common.xml @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<included> + + <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/> + + <!-- 控制台输出 --> + <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender"> + <file>${log.path}/console.log</file> + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> + <!-- 日志文件名格式 --> + <fileNamePattern>${log.path}/console.%d{yyyy-MM-dd}.log</fileNamePattern> + <!-- 日志最大 1天 --> + <maxHistory>1</maxHistory> + </rollingPolicy> + <encoder> + <pattern>${log.pattern}</pattern> + <charset>utf-8</charset> + </encoder> + <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> + <!-- 过滤的级别 --> + <level>INFO</level> + </filter> + </appender> + + <!-- 系统日志输出 --> + <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender"> + <file>${log.path}/info.log</file> + <!-- 循环政策:基于时间创建日志文件 --> + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> + <!-- 日志文件名格式 --> + <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern> + <!-- 日志最大的历史 60天 --> + <maxHistory>60</maxHistory> + </rollingPolicy> + <encoder> + <pattern>${log.pattern}</pattern> + </encoder> + <filter class="ch.qos.logback.classic.filter.LevelFilter"> + <!-- 过滤的级别 --> + <level>INFO</level> + <!-- 匹配时的操作:接收(记录) --> + <onMatch>ACCEPT</onMatch> + <!-- 不匹配时的操作:拒绝(不记录) --> + <onMismatch>DENY</onMismatch> + </filter> + </appender> + + <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender"> + <file>${log.path}/error.log</file> + <!-- 循环政策:基于时间创建日志文件 --> + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> + <!-- 日志文件名格式 --> + <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern> + <!-- 日志最大的历史 60天 --> + <maxHistory>60</maxHistory> + </rollingPolicy> + <encoder> + <pattern>${log.pattern}</pattern> + </encoder> + <filter class="ch.qos.logback.classic.filter.LevelFilter"> + <!-- 过滤的级别 --> + <level>ERROR</level> + <!-- 匹配时的操作:接收(记录) --> + <onMatch>ACCEPT</onMatch> + <!-- 不匹配时的操作:拒绝(不记录) --> + <onMismatch>DENY</onMismatch> + </filter> + </appender> + + <!-- info异步输出 --> + <appender name="async_info" class="ch.qos.logback.classic.AsyncAppender"> + <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> + <discardingThreshold>0</discardingThreshold> + <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> + <queueSize>512</queueSize> + <!-- 添加附加的appender,最多只能添加一个 --> + <appender-ref ref="file_info"/> + </appender> + + <!-- error异步输出 --> + <appender name="async_error" class="ch.qos.logback.classic.AsyncAppender"> + <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> + <discardingThreshold>0</discardingThreshold> + <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> + <queueSize>512</queueSize> + <!-- 添加附加的appender,最多只能添加一个 --> + <appender-ref ref="file_error"/> + </appender> + + <!--系统操作日志--> + <root level="info"> + <appender-ref ref="async_info"/> + <appender-ref ref="async_error"/> + <appender-ref ref="file_console"/> + </root> +</included> diff --git a/ruoyi-example/ruoyi-demo/src/main/resources/logback.xml b/ruoyi-example/ruoyi-demo/src/main/resources/logback.xml index 758a7205..ec6586f2 100644 --- a/ruoyi-example/ruoyi-demo/src/main/resources/logback.xml +++ b/ruoyi-example/ruoyi-demo/src/main/resources/logback.xml @@ -5,7 +5,6 @@ <!-- 日志输出格式 --> <property name="console.log.pattern" value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/> - <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/> <!-- 控制台输出 --> <appender name="console" class="ch.qos.logback.core.ConsoleAppender"> @@ -15,95 +14,10 @@ </encoder> </appender> - <!-- 控制台输出 --> - <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/console.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/console.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大 1天 --> - <maxHistory>1</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - <charset>utf-8</charset> - </encoder> - <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - </filter> - </appender> - - <!-- 系统日志输出 --> - <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/info.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/error.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>ERROR</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <!-- info异步输出 --> - <appender name="async_info" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_info"/> - </appender> - - <!-- error异步输出 --> - <appender name="async_error" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_error"/> - </appender> + <include resource="logback-common.xml" /> <!--系统操作日志--> <root level="info"> <appender-ref ref="console" /> - <appender-ref ref="async_info"/> - <appender-ref ref="async_error"/> - <appender-ref ref="file_console" /> </root> </configuration> diff --git a/ruoyi-example/ruoyi-stream-mq/src/main/resources/logback.xml b/ruoyi-example/ruoyi-stream-mq/src/main/resources/logback.xml index 0158d813..05075604 100644 --- a/ruoyi-example/ruoyi-stream-mq/src/main/resources/logback.xml +++ b/ruoyi-example/ruoyi-stream-mq/src/main/resources/logback.xml @@ -5,7 +5,6 @@ <!-- 日志输出格式 --> <property name="console.log.pattern" value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/> - <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/> <!-- 控制台输出 --> <appender name="console" class="ch.qos.logback.core.ConsoleAppender"> @@ -15,89 +14,7 @@ </encoder> </appender> - <!-- 控制台输出 --> - <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/console.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/console.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大 1天 --> - <maxHistory>1</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - <charset>utf-8</charset> - </encoder> - <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - </filter> - </appender> - - <!-- 系统日志输出 --> - <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/info.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/error.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>ERROR</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <!-- info异步输出 --> - <appender name="async_info" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_info"/> - </appender> - - <!-- error异步输出 --> - <appender name="async_error" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_error"/> - </appender> + <include resource="logback-common.xml" /> <!-- 开启 skywalking 日志收集 --> <include resource="logback-skylog.xml" /> @@ -105,8 +22,5 @@ <!--系统操作日志--> <root level="info"> <appender-ref ref="console" /> - <appender-ref ref="async_info"/> - <appender-ref ref="async_error"/> - <appender-ref ref="file_console" /> </root> </configuration> diff --git a/ruoyi-gateway/src/main/resources/logback.xml b/ruoyi-gateway/src/main/resources/logback.xml index 4d66014c..a2e187f8 100644 --- a/ruoyi-gateway/src/main/resources/logback.xml +++ b/ruoyi-gateway/src/main/resources/logback.xml @@ -5,7 +5,6 @@ <!-- 日志输出格式 --> <property name="console.log.pattern" value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/> - <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/> <!-- 控制台输出 --> <appender name="console" class="ch.qos.logback.core.ConsoleAppender"> @@ -15,89 +14,7 @@ </encoder> </appender> - <!-- 控制台输出 --> - <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/console.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/console.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大 1天 --> - <maxHistory>1</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - <charset>utf-8</charset> - </encoder> - <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - </filter> - </appender> - - <!-- 系统日志输出 --> - <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/info.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/error.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>ERROR</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <!-- info异步输出 --> - <appender name="async_info" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_info"/> - </appender> - - <!-- error异步输出 --> - <appender name="async_error" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_error"/> - </appender> + <include resource="logback-common.xml" /> <include resource="logback-logstash.xml" /> @@ -107,8 +24,5 @@ <!--系统操作日志--> <root level="info"> <appender-ref ref="console"/> - <appender-ref ref="async_info"/> - <appender-ref ref="async_error"/> - <appender-ref ref="file_console"/> </root> </configuration> diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml index 87594199..0ef8ae4a 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml @@ -5,7 +5,6 @@ <!-- 日志输出格式 --> <property name="console.log.pattern" value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/> - <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/> <!-- 控制台输出 --> <appender name="console" class="ch.qos.logback.core.ConsoleAppender"> @@ -15,97 +14,12 @@ </encoder> </appender> - <!-- 控制台输出 --> - <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/console.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/console.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大 1天 --> - <maxHistory>1</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - <charset>utf-8</charset> - </encoder> - <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - </filter> - </appender> - - <!-- 系统日志输出 --> - <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/info.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/error.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>ERROR</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <!-- info异步输出 --> - <appender name="async_info" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_info"/> - </appender> - - <!-- error异步输出 --> - <appender name="async_error" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_error"/> - </appender> + <include resource="logback-common.xml" /> <include resource="logback-logstash.xml" /> <!--系统操作日志--> <root level="info"> <appender-ref ref="console"/> - <appender-ref ref="async_info"/> - <appender-ref ref="async_error"/> - <appender-ref ref="file_console"/> </root> </configuration> diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-job/src/main/resources/logback.xml index 4d66014c..a2e187f8 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/logback.xml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/logback.xml @@ -5,7 +5,6 @@ <!-- 日志输出格式 --> <property name="console.log.pattern" value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/> - <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/> <!-- 控制台输出 --> <appender name="console" class="ch.qos.logback.core.ConsoleAppender"> @@ -15,89 +14,7 @@ </encoder> </appender> - <!-- 控制台输出 --> - <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/console.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/console.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大 1天 --> - <maxHistory>1</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - <charset>utf-8</charset> - </encoder> - <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - </filter> - </appender> - - <!-- 系统日志输出 --> - <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/info.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/error.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>ERROR</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <!-- info异步输出 --> - <appender name="async_info" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_info"/> - </appender> - - <!-- error异步输出 --> - <appender name="async_error" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_error"/> - </appender> + <include resource="logback-common.xml" /> <include resource="logback-logstash.xml" /> @@ -107,8 +24,5 @@ <!--系统操作日志--> <root level="info"> <appender-ref ref="console"/> - <appender-ref ref="async_info"/> - <appender-ref ref="async_error"/> - <appender-ref ref="file_console"/> </root> </configuration> diff --git a/ruoyi-modules/ruoyi-resource/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-resource/src/main/resources/logback.xml index 4d66014c..a2e187f8 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/resources/logback.xml +++ b/ruoyi-modules/ruoyi-resource/src/main/resources/logback.xml @@ -5,7 +5,6 @@ <!-- 日志输出格式 --> <property name="console.log.pattern" value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/> - <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/> <!-- 控制台输出 --> <appender name="console" class="ch.qos.logback.core.ConsoleAppender"> @@ -15,89 +14,7 @@ </encoder> </appender> - <!-- 控制台输出 --> - <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/console.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/console.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大 1天 --> - <maxHistory>1</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - <charset>utf-8</charset> - </encoder> - <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - </filter> - </appender> - - <!-- 系统日志输出 --> - <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/info.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/error.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>ERROR</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <!-- info异步输出 --> - <appender name="async_info" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_info"/> - </appender> - - <!-- error异步输出 --> - <appender name="async_error" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_error"/> - </appender> + <include resource="logback-common.xml" /> <include resource="logback-logstash.xml" /> @@ -107,8 +24,5 @@ <!--系统操作日志--> <root level="info"> <appender-ref ref="console"/> - <appender-ref ref="async_info"/> - <appender-ref ref="async_error"/> - <appender-ref ref="file_console"/> </root> </configuration> diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml index ce1e8725..caaa3455 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml @@ -5,7 +5,6 @@ <!-- 日志输出格式 --> <property name="console.log.pattern" value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/> - <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/> <!-- 控制台输出 --> <appender name="console" class="ch.qos.logback.core.ConsoleAppender"> @@ -15,89 +14,7 @@ </encoder> </appender> - <!-- 控制台输出 --> - <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/console.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/console.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大 1天 --> - <maxHistory>1</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - <charset>utf-8</charset> - </encoder> - <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - </filter> - </appender> - - <!-- 系统日志输出 --> - <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/info.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/error.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>ERROR</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <!-- info异步输出 --> - <appender name="async_info" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_info"/> - </appender> - - <!-- error异步输出 --> - <appender name="async_error" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_error"/> - </appender> + <include resource="logback-common.xml" /> <include resource="logback-logstash.xml" /> @@ -107,8 +24,5 @@ <!--系统操作日志--> <root level="info"> <appender-ref ref="console" /> - <appender-ref ref="async_info"/> - <appender-ref ref="async_error"/> - <appender-ref ref="file_console" /> </root> </configuration> diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml b/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml index ce1e8725..caaa3455 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml @@ -5,7 +5,6 @@ <!-- 日志输出格式 --> <property name="console.log.pattern" value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/> - <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/> <!-- 控制台输出 --> <appender name="console" class="ch.qos.logback.core.ConsoleAppender"> @@ -15,89 +14,7 @@ </encoder> </appender> - <!-- 控制台输出 --> - <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/console.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/console.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大 1天 --> - <maxHistory>1</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - <charset>utf-8</charset> - </encoder> - <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - </filter> - </appender> - - <!-- 系统日志输出 --> - <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/info.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/error.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>ERROR</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <!-- info异步输出 --> - <appender name="async_info" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_info"/> - </appender> - - <!-- error异步输出 --> - <appender name="async_error" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_error"/> - </appender> + <include resource="logback-common.xml" /> <include resource="logback-logstash.xml" /> @@ -107,8 +24,5 @@ <!--系统操作日志--> <root level="info"> <appender-ref ref="console" /> - <appender-ref ref="async_info"/> - <appender-ref ref="async_error"/> - <appender-ref ref="file_console" /> </root> </configuration> diff --git a/ruoyi-visual/ruoyi-seata-server/src/main/resources/logback-spring.xml b/ruoyi-visual/ruoyi-seata-server/src/main/resources/logback-spring.xml index 193e559a..dc942aee 100644 --- a/ruoyi-visual/ruoyi-seata-server/src/main/resources/logback-spring.xml +++ b/ruoyi-visual/ruoyi-seata-server/src/main/resources/logback-spring.xml @@ -27,7 +27,6 @@ <!-- 日志输出格式 --> <property name="console.log.pattern" value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/> - <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/> <!-- 控制台输出 --> <appender name="console" class="ch.qos.logback.core.ConsoleAppender"> @@ -37,89 +36,7 @@ </encoder> </appender> - <!-- 控制台输出 --> - <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/console.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/console.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大 1天 --> - <maxHistory>1</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - <charset>utf-8</charset> - </encoder> - <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - </filter> - </appender> - - <!-- 系统日志输出 --> - <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/info.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/error.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>ERROR</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <!-- info异步输出 --> - <appender name="async_info" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_info"/> - </appender> - - <!-- error异步输出 --> - <appender name="async_error" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_error"/> - </appender> + <include resource="logback-common.xml" /> <include resource="logback-logstash.xml" /> @@ -128,8 +45,5 @@ <root level="INFO"> <appender-ref ref="console"/> - <appender-ref ref="async_info"/> - <appender-ref ref="async_error"/> - <appender-ref ref="file_console"/> </root> </configuration> diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/logback.xml b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/logback.xml index 4d66014c..a2e187f8 100644 --- a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/logback.xml +++ b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/logback.xml @@ -5,7 +5,6 @@ <!-- 日志输出格式 --> <property name="console.log.pattern" value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/> - <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/> <!-- 控制台输出 --> <appender name="console" class="ch.qos.logback.core.ConsoleAppender"> @@ -15,89 +14,7 @@ </encoder> </appender> - <!-- 控制台输出 --> - <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/console.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/console.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大 1天 --> - <maxHistory>1</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - <charset>utf-8</charset> - </encoder> - <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - </filter> - </appender> - - <!-- 系统日志输出 --> - <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/info.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/error.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>ERROR</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <!-- info异步输出 --> - <appender name="async_info" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_info"/> - </appender> - - <!-- error异步输出 --> - <appender name="async_error" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_error"/> - </appender> + <include resource="logback-common.xml" /> <include resource="logback-logstash.xml" /> @@ -107,8 +24,5 @@ <!--系统操作日志--> <root level="info"> <appender-ref ref="console"/> - <appender-ref ref="async_info"/> - <appender-ref ref="async_error"/> - <appender-ref ref="file_console"/> </root> </configuration> diff --git a/ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/logback.xml b/ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/logback.xml index 4d66014c..a2e187f8 100644 --- a/ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/logback.xml +++ b/ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/logback.xml @@ -5,7 +5,6 @@ <!-- 日志输出格式 --> <property name="console.log.pattern" value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/> - <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/> <!-- 控制台输出 --> <appender name="console" class="ch.qos.logback.core.ConsoleAppender"> @@ -15,89 +14,7 @@ </encoder> </appender> - <!-- 控制台输出 --> - <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/console.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/console.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大 1天 --> - <maxHistory>1</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - <charset>utf-8</charset> - </encoder> - <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - </filter> - </appender> - - <!-- 系统日志输出 --> - <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/info.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>INFO</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.path}/error.log</file> - <!-- 循环政策:基于时间创建日志文件 --> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <!-- 日志文件名格式 --> - <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern> - <!-- 日志最大的历史 60天 --> - <maxHistory>60</maxHistory> - </rollingPolicy> - <encoder> - <pattern>${log.pattern}</pattern> - </encoder> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <!-- 过滤的级别 --> - <level>ERROR</level> - <!-- 匹配时的操作:接收(记录) --> - <onMatch>ACCEPT</onMatch> - <!-- 不匹配时的操作:拒绝(不记录) --> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <!-- info异步输出 --> - <appender name="async_info" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_info"/> - </appender> - - <!-- error异步输出 --> - <appender name="async_error" class="ch.qos.logback.classic.AsyncAppender"> - <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 --> - <discardingThreshold>0</discardingThreshold> - <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 --> - <queueSize>512</queueSize> - <!-- 添加附加的appender,最多只能添加一个 --> - <appender-ref ref="file_error"/> - </appender> + <include resource="logback-common.xml" /> <include resource="logback-logstash.xml" /> @@ -107,8 +24,5 @@ <!--系统操作日志--> <root level="info"> <appender-ref ref="console"/> - <appender-ref ref="async_info"/> - <appender-ref ref="async_error"/> - <appender-ref ref="file_console"/> </root> </configuration>