From 86a701ce885871d2468ec31eb13be5595673a01b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 28 三月 2024 10:24:13 +0800
Subject: [PATCH] Merge branch 'master' into dev/abl支持

---
 src/main/resources/all-application.yml |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index 528bd1a..e616187 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -178,9 +178,9 @@
     # 褰曞儚杈呭姪鏈嶅姟锛� 閮ㄧ讲姝ゆ湇鍔″彲浠ュ疄鐜皕lm褰曞儚鐨勭鐞嗕笌涓嬭浇锛� 0 琛ㄧず涓嶄娇鐢�
     record-assist-port: 0
 
-# [鍙�塢 鏃ュ織閰嶇疆, 涓�鑸笉闇�瑕佹敼
+# [鍙�塢 鏃ュ織閰嶇疆, 濡傛灉涓嶉渶瑕佸湪jar澶栦慨鏀规棩蹇楀唴瀹归偅涔堝彲浠ヤ笉閰嶇疆姝ら」
 logging:
-    config: classpath:logback-spring-local.xml
+    config: classpath:logback-spring.xml
 
 # [鏍规嵁涓氬姟闇�姹傞厤缃甝
 user-settings:
@@ -217,12 +217,16 @@
     push-authority: true
     # 璁惧涓婄嚎鏃舵槸鍚﹁嚜鍔ㄥ悓姝ラ�氶亾
     sync-channel-on-device-online: false
+    # 鍥芥爣绾ц仈璇煶鍠婅瘽鍙戞祦妯″紡 * UDP:udp浼犺緭 TCP-ACTIVE锛歵cp涓诲姩妯″紡 TCP-PASSIVE锛歵cp琚姩妯″紡
+    broadcast-for-platform: UDP
     # 鏄惁浣跨敤璁惧鏉ユ簮Ip浣滀负鍥炲IP锛� 涓嶈缃垯涓� false
     sip-use-source-ip-as-remote-address: false
     # 鏄惁寮�鍚痵ip鏃ュ織
     sip-log: true
     # 鏄惁寮�鍚痵ql鏃ュ織
     sql-log: true
+    # 鏀跺埌ack娑堟伅鍚庡紑濮嬪彂娴侊紝榛樿false锛� 鍥炲200ok鍚庣洿鎺ュ紑濮嬪彂娴�
+    push-stream-after-ack: false
     # 娑堟伅閫氶亾鍔熻兘-缂哄皯鍥芥爣ID鏄惁缁欐墍鏈変笂绾у彂閫佹秷鎭�
     send-to-platforms-when-id-lost: true
     # 淇濇寔閫氶亾鐘舵�侊紝涓嶆帴鍙梟otify閫氶亾鐘舵�佸彉鍖栵紝 鍏煎娴峰悍骞冲彴鍙戦�侀敊璇秷鎭�

--
Gitblit v1.8.0