From f2032d8331cd8939bb8dd4ef372033a2dcdbc850 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Thu, 17 Feb 2022 16:10:55 +0800
Subject: [PATCH] +添加法人变更，以及跨区域备案字段更改
---
src/main/resources/log/logback-dev.xml | 131 +++++++++++++++++++++++--------------------
1 files changed, 70 insertions(+), 61 deletions(-)
diff --git a/src/main/resources/log/logback-dev.xml b/src/main/resources/log/logback-dev.xml
index 11bf05e..86ae5fd 100644
--- a/src/main/resources/log/logback-dev.xml
+++ b/src/main/resources/log/logback-dev.xml
@@ -21,27 +21,11 @@
</encoder>
</appender>
+
<!-- 生成日志文件 -->
<appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件输出的文件名 -->
- <FileNamePattern>/home/zhongsong/log/info/info-%d{yyyy-MM-dd}.log</FileNamePattern>
- <maxHistory>10</maxHistory>
- </rollingPolicy>
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%n%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] [%logger{50}] %n%-5level: %msg%n</pattern>
- </encoder>
- <!-- 打印日志级别 -->
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>INFO</level>
- <onMatch>ACCEPT</onMatch>
- <onMismatch>DENY</onMismatch>
- </filter>
- </appender>
-
- <!-- 生成日志文件 -->
- <appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件输出的文件名 -->
<FileNamePattern>/home/zhongsong/log/warn/warn-%d{yyyy-MM-dd}.log</FileNamePattern>
<maxHistory>30</maxHistory>
@@ -52,6 +36,23 @@
<!-- 打印日志级别 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>WARN</level>
+ <onMatch>ACCEPT</onMatch>
+ <onMismatch>DENY</onMismatch>
+ </filter>
+ </appender>
+
+ <!-- 生成日志文件 -->
+ <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 日志文件输出的文件名 -->
+ <FileNamePattern>/home/zhongsong/log/error/error-%d{yyyy-MM-dd}.log</FileNamePattern>
+ <maxHistory>30</maxHistory>
+ </rollingPolicy>
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <pattern>%n%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] [%logger{50}] %n%-5level: %msg%n</pattern>
+ </encoder>
+ <!-- 打印日志级别 -->
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
@@ -61,7 +62,7 @@
<if condition='property("ELK_MODE").toUpperCase().contains("TRUE")'>
<then>
<!-- 推送日志至elk -->
- <appender name="STDOUT_LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+ <appender name="INFO_LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
<destination>${DESTINATION}</destination>
<!-- 日志输出编码 -->
<encoder charset="UTF-8" class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
@@ -90,61 +91,69 @@
<stackTrace/>
</providers>
</encoder>
+ <!-- 打印日志级别 -->
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
+ <level>INFO</level>
+ <onMatch>ACCEPT</onMatch>
+ <onMismatch>DENY</onMismatch>
+ </filter>
+ </appender>
+
+ <!-- 推送日志至elk -->
+ <appender name="ERROR_LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+ <destination>${DESTINATION}</destination>
+ <!-- 日志输出编码 -->
+ <encoder charset="UTF-8" class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+ <providers>
+ <timestamp>
+ <timeZone>UTC</timeZone>
+ </timestamp>
+ <pattern>
+ <pattern>
+ {
+ "traceId": "%X{traceId}",
+ "requestId": "%X{requestId}",
+ "accountId": "%X{accountId}",
+ "tenantId": "%X{tenantId}",
+ "logLevel": "%level",
+ "serviceName": "${springAppName:-SpringApp}",
+ "pid": "${PID:-}",
+ "thread": "%thread",
+ "class": "%logger{40}",
+ "line":"%L",
+ "message": "%message"
+ }
+ </pattern>
+ </pattern>
+ <mdc/>
+ <stackTrace/>
+ </providers>
+ </encoder>
+ <!-- 打印日志级别 -->
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
+ <level>ERROR</level>
+ <onMatch>ACCEPT</onMatch>
+ <onMismatch>DENY</onMismatch>
+ </filter>
</appender>
</then>
</if>
<!-- 日志输出级别 -->
- <root level="WARN">
+ <root level="INFO">
<appender-ref ref="STDOUT"/>
- <appender-ref ref="${STDOUT_APPENDER}"/>
+ <appender-ref ref="${INFO_APPENDER}"/>
+ <appender-ref ref="${ERROR_APPENDER}"/>
</root>
<logger name="net.sf.ehcache" level="INFO"/>
<logger name="druid.sql" level="INFO"/>
-
-
- <!-- MyBatis log configure -->
- <logger name="com.apache.ibatis" level="INFO"/>
- <logger name="org.mybatis.spring" level="INFO"/>
- <logger name="java.sql.Connection" level="INFO"/>
- <logger name="java.sql.Statement" level="INFO"/>
- <logger name="java.sql.PreparedStatement" level="INFO"/>
-
- <!-- 减少部分debug日志 -->
- <logger name="druid.sql" level="INFO"/>
- <logger name="org.apache.shiro" level="INFO"/>
- <logger name="org.mybatis.spring" level="INFO"/>
- <logger name="org.springframework" level="INFO"/>
- <logger name="org.springframework.context" level="WARN"/>
- <logger name="org.springframework.beans" level="WARN"/>
- <logger name="com.baomidou.mybatisplus" level="INFO"/>
- <logger name="org.apache.ibatis.io" level="INFO"/>
- <logger name="org.apache.velocity" level="INFO"/>
- <logger name="org.eclipse.jetty" level="INFO"/>
- <logger name="io.undertow" level="INFO"/>
- <logger name="org.xnio.nio" level="INFO"/>
- <logger name="org.thymeleaf" level="INFO"/>
- <logger name="springfox.documentation" level="INFO"/>
- <logger name="org.hibernate.validator" level="INFO"/>
- <logger name="com.netflix.loadbalancer" level="INFO"/>
- <logger name="com.netflix.hystrix" level="INFO"/>
- <logger name="com.netflix.zuul" level="INFO"/>
- <logger name="de.codecentric" level="INFO"/>
- <!-- cache INFO -->
- <logger name="net.sf.ehcache" level="INFO"/>
- <logger name="org.springframework.cache" level="INFO"/>
- <!-- cloud -->
- <logger name="org.apache.http" level="INFO"/>
- <logger name="com.netflix.discovery" level="INFO"/>
- <logger name="com.netflix.eureka" level="INFO"/>
- <!-- 业务日志 -->
- <Logger name="org.springblade" level="WARN"/>
- <Logger name="org.springblade.core.tenant" level="INFO"/>
- <Logger name="org.springblade.core.version" level="INFO"/>
+ <logger name="org.springblade.modules" level="DEBUG">
+ <appender-ref ref="ERROR"/>
+ <appender-ref ref="INFO"/>
+ </logger>
<!-- 减少nacos日志 -->
<logger name="com.alibaba.nacos" level="ERROR"/>
-
</configuration>
--
Gitblit v1.9.3