From fc8bb378deb706e4887eacbc25f9326f74b1757b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 21 十一月 2023 10:50:02 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
src/main/resources/logback-spring.xml | 2 +-
src/main/resources/application-dev.yml | 3 ---
src/main/resources/all-application.yml | 4 ++--
src/main/resources/application-docker.yml | 4 ----
4 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index 5e1804c..8196b7c 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -150,9 +150,9 @@
# 褰曞儚杈呭姪鏈嶅姟锛� 閮ㄧ讲姝ゆ湇鍔″彲浠ュ疄鐜皕lm褰曞儚鐨勭鐞嗕笌涓嬭浇锛� 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 c25f739..d3e195e 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -110,7 +110,4 @@
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 0e0c0ad..f6f6f34 100644
--- a/src/main/resources/application-docker.yml
+++ b/src/main/resources/application-docker.yml
@@ -71,10 +71,6 @@
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 dfda37e..76b4ba3 100644
--- a/src/main/resources/logback-spring-local.xml
+++ b/src/main/resources/logback-spring.xml
@@ -86,7 +86,7 @@
<!-- 鏃ュ織杈撳嚭绾у埆 -->
- <root level="INFO">
+ <root level="DEBUG">
<appender-ref ref="STDOUT" />
</root>
--
Gitblit v1.8.0