From a16b4f71ec5a4d3d526c9c35a1e1f7843a49e921 Mon Sep 17 00:00:00 2001
From: hotcoffie <35990065+hotcoffie@users.noreply.github.com>
Date: 星期三, 01 十二月 2021 20:35:16 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0

---
 src/main/resources/all-application.yml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index f2d85ec..6328bc3 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -73,7 +73,7 @@
     # [鍙�塢 榛樿璁惧璁よ瘉瀵嗙爜锛屽悗缁墿灞曚娇鐢ㄨ澶囧崟鐙瘑鐮�, 绉婚櫎瀵嗙爜灏嗕笉杩涜鏍￠獙
     password: admin123
     # [鍙�塢 蹇冭烦瓒呮椂鏃堕棿锛� 寤鸿璁剧疆涓哄績璺冲懆鏈熺殑涓夊��
-    keepalive-timeout: 180
+    keepalive-timeout: 255
     # [鍙�塢 鍥芥爣绾ц仈娉ㄥ唽澶辫触锛屽啀娆″彂璧锋敞鍐岀殑鏃堕棿闂撮殧銆� 榛樿60绉�
     register-time-interval: 60
     # [鍙�塢 浜戝彴鎺у埗閫熷害
@@ -137,6 +137,8 @@
         com.genersoft.iot.vmp.gb28181: info
 # [鏍规嵁涓氬姟闇�姹傞厤缃甝
 user-settings:
+    # [鍙�塢 鏈嶅姟ID锛屼笉鍐欏垯涓�000000
+    server-id:
     # [鍙�塢 鑷姩鐐规挱锛� 浣跨敤鍥哄畾娴佸湴鍧�杩涜鎾斁鏃讹紝濡傛灉鏈偣鎾垯鑷姩杩涜鐐规挱, 闇�瑕乺tp.enable=true
     auto-apply-play: false
     # [鍙�塢 閮ㄥ垎璁惧闇�瑕佹墿灞昐DP锛岄渶瑕佹墦寮�姝よ缃�

--
Gitblit v1.8.0