From 5cae58c69129631c80c611d1870c3a20721cebf4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 14 二月 2023 10:04:48 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main2
---
src/main/resources/logback-spring-local.xml | 49 +++++++++++++++++--------------------------------
1 files changed, 17 insertions(+), 32 deletions(-)
diff --git a/src/main/resources/logback-spring-local.xml b/src/main/resources/logback-spring-local.xml
index 724d05e..80d1803 100644
--- a/src/main/resources/logback-spring-local.xml
+++ b/src/main/resources/logback-spring-local.xml
@@ -2,16 +2,22 @@
<configuration debug="false">
<!--瀹氫箟鏃ュ織鏂囦欢鐨勫瓨鍌ㄥ湴鍧� -->
<springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
- <property name="LOG_HOME" value="logs/${spring.application.name}" />
+ <property name="LOG_HOME" value="logs" />
- <!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />-->
+ <substitutionProperty name="log.pattern" value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(---){faint} %clr(%-80.80logger{79}){cyan} %clr(:){faint} %m%n%wEx"/>
+
+ <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+ <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+ <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+
<!-- 鎺у埗鍙拌緭鍑� -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!--鏍煎紡鍖栬緭鍑猴細%d琛ㄧず鏃ユ湡锛�%thread琛ㄧず绾跨▼鍚嶏紝%-5level锛氱骇鍒粠宸︽樉绀�5涓瓧绗﹀搴�%msg锛氭棩蹇楁秷鎭紝%n鏄崲琛岀 -->
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
+ <pattern>${log.pattern}</pattern>
+ <charset>UTF-8</charset>
</encoder>
- <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter" >
<!--涓嶵hresholdFilter鐨勫尯鍒�,鍏佽onmatch-->
<!--璁剧疆鏃ュ織绾у埆 鎺ユ敹info绾у埆鐨勬棩蹇�-->
<level>DEBUG</level>
@@ -32,6 +38,7 @@
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!--鏍煎紡鍖栬緭鍑猴細%d琛ㄧず鏃ユ湡锛�%thread琛ㄧず绾跨▼鍚嶏紝%-5level锛氱骇鍒粠宸︽樉绀�5涓瓧绗﹀搴�%msg锛氭棩蹇楁秷鎭紝%n鏄崲琛岀 -->
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
+ <charset>UTF-8</charset>
</encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<!--涓嶵hresholdFilter鐨勫尯鍒�,鍏佽onmatch-->
@@ -53,32 +60,16 @@
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!--鏍煎紡鍖栬緭鍑猴細%d琛ㄧず鏃ユ湡锛�%thread琛ㄧず绾跨▼鍚嶏紝%-5level锛氱骇鍒粠宸︽樉绀�5涓瓧绗﹀搴�%msg锛氭棩蹇楁秷鎭紝%n鏄崲琛岀 -->
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
+ <charset>UTF-8</charset>
</encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<!--璁剧疆鏃ュ織绾у埆,杩囨护鎺塱nfo鏃ュ織,鍙緭鍏rror鏃ュ織-->
<level>WARN</level>
- <!-- <onMatch>ACCEPT</onMatch> <!– 鐢ㄨ繃婊ゅ櫒锛屽彧鎺ュ彈ERROR绾у埆鐨勬棩蹇椾俊鎭紝鍏朵綑鍏ㄩ儴杩囨护鎺� –>-->
- <!-- <onMismatch>DENY</onMismatch>-->
</filter>
</appender>
- <!-- 鐢熸垚 druid鏃ュ織杩藉姞 -->
- <appender name="druidSqlRollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <!--鍘嗗彶鏃ュ織鏂囦欢杈撳嚭鐨勬枃浠跺悕 -->
- <FileNamePattern>${LOG_HOME}/druid-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
- <!--鏃ュ織鏂囦欢淇濈暀澶╂暟 -->
- <MaxHistory>30</MaxHistory>
- <maxFileSize>50MB</maxFileSize>
- </rollingPolicy>
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <!--鏍煎紡鍖栬緭鍑猴細%d琛ㄧず鏃ユ湡锛�%thread琛ㄧず绾跨▼鍚嶏紝%-5level锛氱骇鍒粠宸︽樉绀�5涓瓧绗﹀搴�%msg锛氭棩蹇楁秷鎭紝%n鏄崲琛岀 -->
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
- </encoder>
- </appender>
-
<!-- 鐢熸垚 SIP鏃ュ織杩藉姞 -->
- <appender name="sipRollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <appender name="SipRollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--鍘嗗彶鏃ュ織鏂囦欢杈撳嚭鐨勬枃浠跺悕 -->
<FileNamePattern>${LOG_HOME}/sip-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
@@ -89,6 +80,7 @@
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!--鏍煎紡鍖栬緭鍑猴細%d琛ㄧず鏃ユ湡锛�%thread琛ㄧず绾跨▼鍚嶏紝%-5level锛氱骇鍒粠宸︽樉绀�5涓瓧绗﹀搴�%msg锛氭棩蹇楁秷鎭紝%n鏄崲琛岀 -->
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
+ <charset>UTF-8</charset>
</encoder>
</appender>
@@ -98,20 +90,13 @@
<appender-ref ref="STDOUT" />
</root>
- <logger name="wvp" level="debug" additivity="true">
+ <logger name="com.genersoft.iot.vmp" level="info" additivity="true">
<appender-ref ref="RollingFileError"/>
<appender-ref ref="RollingFile"/>
</logger>
- <logger name="GB28181_SIP" level="debug" additivity="true">
- <appender-ref ref="RollingFileError"/>
- <appender-ref ref="sipRollingFile"/>
+ <logger name="com.genersoft.iot.vmp.gb28181.conf.StackLoggerImpl" level="info" additivity="true">
+ <appender-ref ref="SipRollingFile" />
</logger>
- <!--璁板綍druid-sql鐨勮褰�-->
- <logger name="com.genersoft.iot.vmp.storager.dao" level="info" additivity="true">
- <!--AppenderRef ref="Console"/-->
- <appender-ref ref="RollingFileError"/>
- <appender-ref ref="druidSqlRollingFile"/>
- </logger>
</configuration>
\ No newline at end of file
--
Gitblit v1.8.0