Merge branch 'wvp-28181-2.0' into feature/record

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java

src/main/resources/all-application.yml

@@ -167,9 +167,9 @@ media:
     # 录像辅助服务， 部署此服务可以实现zlm录像的管理与下载， 0 表示不使用
     record-assist-port: 0
 
-# [可选] 日志配置, 一般不需要改
+# [可选] 日志配置, 如果不需要在jar外修改日志内容那么可以不配置此项
 logging:
-    config: classpath:logback-spring-local.xml
+    config: classpath:logback-spring.xml
 
 # [根据业务需求配置]
 user-settings:

src/main/resources/application-dev.yml

@@ -110,7 +110,4 @@ user-settings:
   allowed-origins:
     - http://localhost:8080
     - http://127.0.0.1:8080
-# [可选] 日志配置, 一般不需要改
-logging:
-  config: classpath:logback-spring-local.xml
 

src/main/resources/application-docker.yml

@@ -71,10 +71,6 @@ media:
     record-assist-port: 18081
     sdp-ip: ${sip.ip}
     stream-ip: ${sip.ip}
-# [可选] 日志配置, 一般不需要改
-# [可选] 日志配置, 一般不需要改
-logging:
-    config: classpath:logback-spring-local.xml
 
 # [根据业务需求配置]
 user-settings:

src/main/resources/logback-spring.xml

@@ -4,8 +4,8 @@
 	<springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
 	<property name="LOG_HOME" value="logs" />
 
-	<substitutionProperty name="log.pattern" value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(---){faint} %clr(%-1.30logger{0}){cyan} %clr(:){faint} %m%n%wEx"/>
-
+	<substitutionProperty name="log.pattern"
+						  value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr([%thread]) %clr(%5p) %clr(---){faint} %clr(%logger{50}){cyan}%clr(:) %clr(%L){cyan} %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"/>