From b0cc14051c84af562cee794cef0f0a9551e23b9c Mon Sep 17 00:00:00 2001
From: chenlw <brokge@qq.com>
Date: 星期四, 16 十二月 2021 12:49:12 +0800
Subject: [PATCH] 1.修复录像合并文件下载链接问题;2.时间滑道,endTime超出24小时问题。3.录像文件格式命名 startTime~endTime~duration.mp4

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

diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index 140ef0a..2058742 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -38,6 +38,9 @@
         password:
         type: com.alibaba.druid.pool.DruidDataSource
         driver-class-name:  org.sqlite.JDBC
+        journal_mode: WAL
+        synchronous: NORMAL
+        transaction_mode: IMMEDIATE
         max-active: 1
         min-idle: 1
 
@@ -73,11 +76,15 @@
     # [鍙�塢 榛樿璁惧璁よ瘉瀵嗙爜锛屽悗缁墿灞曚娇鐢ㄨ澶囧崟鐙瘑鐮�, 绉婚櫎瀵嗙爜灏嗕笉杩涜鏍¢獙
     password: admin123
     # [鍙�塢 蹇冭烦瓒呮椂鏃堕棿锛� 寤鸿璁剧疆涓哄績璺冲懆鏈熺殑涓夊��
-    keepalive-timeout: 180
+    keepalive-timeout: 255
     # [鍙�塢 鍥芥爣绾ц仈娉ㄥ唽澶辫触锛屽啀娆″彂璧锋敞鍐岀殑鏃堕棿闂撮殧銆� 榛樿60绉�
     register-time-interval: 60
+    # [鍙�塢 浜戝彴鎺у埗閫熷害
+    ptz-speed: 50
     # TODO [鍙�塢 鏀跺埌蹇冭烦鍚庤嚜鍔ㄤ笂绾匡紝 閲嶅惎鏈嶅姟鍚庝細灏嗘墍鏈夎澶囩疆涓虹绾匡紝榛樿false锛岀瓑寰呮敞鍐屽悗涓婄嚎銆傝缃负true鍒欐敹鍒板績璺宠缃负涓婄嚎銆�
     # keepalliveToOnline: false
+    # 鏄惁瀛樺偍alarm淇℃伅
+    alarm: false
 
 #zlm 榛樿鏈嶅姟鍣ㄩ厤缃�
 media:
@@ -117,6 +124,8 @@
         enable: true
         # [鍙�塢 鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�,
         port-range: 30000,30500 # 绔彛鑼冨洿
+        # [鍙�塢 鍥芥爣绾ц仈鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鍙戦�佸獟浣撴祦,
+        send-port-range: 30000,30500 # 绔彛鑼冨洿
     # 褰曞儚杈呭姪鏈嶅姟锛� 閮ㄧ讲姝ゆ湇鍔″彲浠ュ疄鐜皕lm褰曞儚鐨勭鐞嗕笌涓嬭浇锛� 0 琛ㄧず涓嶄娇鐢�
     record-assist-port: 0
 
@@ -130,9 +139,11 @@
     level:
         com.genersoft.iot: debug
         com.genersoft.iot.vmp.storager.dao: info
-        com.genersoft.iot.vmp.gb28181: info
+        com.genersoft.iot.vmp.gb28181: debug
 # [鏍规嵁涓氬姟闇�姹傞厤缃甝
 user-settings:
+    # [鍙�塢 鏈嶅姟ID锛屼笉鍐欏垯涓�000000
+    server-id:
     # [鍙�塢 鑷姩鐐规挱锛� 浣跨敤鍥哄畾娴佸湴鍧�杩涜鎾斁鏃讹紝濡傛灉鏈偣鎾垯鑷姩杩涜鐐规挱, 闇�瑕乺tp.enable=true
     auto-apply-play: false
     # [鍙�塢 閮ㄥ垎璁惧闇�瑕佹墿灞昐DP锛岄渶瑕佹墦寮�姝よ缃�
@@ -152,7 +163,15 @@
     record-push-live: true
     # 鏄惁灏嗘棩蹇楀瓨鍌ㄨ繘鏁版嵁搴�
     logInDatebase: true
+    # 绗笁鏂瑰尮閰嶏紝鐢ㄤ簬浠巗tream閽熻幏鍙栨湁鏁堜俊鎭�
+    thirdPartyGBIdReg: [\s\S]*
 
 # 鍦ㄧ嚎鏂囨。锛� swagger-ui锛堢敓浜х幆澧冨缓璁叧闂級
 swagger-ui:
-    enabled: true
\ No newline at end of file
+    enabled: true
+
+# 鐗堟湰淇℃伅锛� 涓嶉渶淇敼
+version:
+    version: "@project.version@"
+    description: "@project.description@"
+    artifact-id: "@project.artifactId@"
\ No newline at end of file

--
Gitblit v1.8.0