From a01295603af6ef75776bdee328c9df18b1a9a9f2 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Fri, 3 Nov 2023 17:32:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/all-application.yml | 4 ++-- src/main/resources/application-dev.yml | 3 --- src/main/resources/application-docker.yml | 4 ---- .../{logback-spring-local.xml => logback-spring.xml} | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) rename src/main/resources/{logback-spring-local.xml => logback-spring.xml} (99%) diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml index 595f629c..dfc858f5 100644 --- a/src/main/resources/all-application.yml +++ b/src/main/resources/all-application.yml @@ -150,9 +150,9 @@ media: # 录像辅助服务, 部署此服务可以实现zlm录像的管理与下载, 0 表示不使用 record-assist-port: 0 -# [可选] 日志配置, 一般不需要改 +# [可选] 日志配置, 如果不需要在jar外修改日志内容那么可以不配置此项 logging: - config: classpath:logback-spring-local.xml + config: classpath:logback-spring.xml # [根据业务需求配置] user-settings: diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index e149886e..e775a6bd 100644 --- a/src/main/resources/application-dev.yml +++ b/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 diff --git a/src/main/resources/application-docker.yml b/src/main/resources/application-docker.yml index 0e0c0ad3..f6f6f348 100644 --- a/src/main/resources/application-docker.yml +++ b/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: diff --git a/src/main/resources/logback-spring-local.xml b/src/main/resources/logback-spring.xml similarity index 99% rename from src/main/resources/logback-spring-local.xml rename to src/main/resources/logback-spring.xml index dfda37e2..76b4ba3e 100644 --- a/src/main/resources/logback-spring-local.xml +++ b/src/main/resources/logback-spring.xml @@ -86,7 +86,7 @@ - +