From 059a5a678ab21738c3fecb9e2bd1e2dc47220a4f Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期四, 07 一月 2021 15:31:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
---
src/main/resources/application-dev.yml | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index de77739..7b98bd1 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -20,12 +20,20 @@
timeout: 10000
# [涓嶅彲鐢╙ jdbc鏁版嵁搴撻厤缃�, 鏆備笉鏀寔
datasource:
+ # name: eiot
+ # url: jdbc:mysql://127.0.0.1:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
+ # username:
+ # password:
+ # type: com.alibaba.druid.pool.DruidDataSource
+ # driver-class-name: com.mysql.jdbc.Driver
name: eiot
- url: jdbc:mysql://127.0.0.1:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
+ url: jdbc:sqlite::resource:wvp.sqlite
username:
password:
type: com.alibaba.druid.pool.DruidDataSource
- driver-class-name: com.mysql.jdbc.Driver
+ driver-class-name: org.sqlite.JDBC
+ max-active: 1
+ min-idle: 1
# [鍙�塢 WVP鐩戝惉鐨凥TTP绔彛, 缃戦〉鍜屾帴鍙ｈ皟鐢ㄩ兘鏄繖涓鍙�
server:
@@ -70,8 +78,10 @@
secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc
# [鍙�塢 zlm鏈嶅姟鍣ㄧ殑general.streamNoneReaderDelayMS
streamNoneReaderDelayMS: 600000 # 鏃犱汉瑙傜湅澶氫箙鑷姩鍏抽棴娴�, -1琛ㄧず姘镐笉鑷姩鍏抽棴,鍗� 鍏抽棴鎸夐渶鎷夋祦
- # [鍙�塢 鑷姩鐐规挱锛� 浣跨敤鍥哄畾娴佸湴鍧�杩涜鎾斁鏃讹紝濡傛灉鏈偣鎾垯鑷姩杩涜鐐规挱
+ # [鍙�塢 鑷姩鐐规挱锛� 浣跨敤鍥哄畾娴佸湴鍧�杩涜鎾斁鏃讹紝濡傛灉鏈偣鎾垯鑷姩杩涜鐐规挱, 闇�瑕乺tp.enable=true
autoApplyPlay: true
+ # [鍙�塢 閮ㄥ垎璁惧闇�瑕佹墿灞昐DP锛岄渶瑕佹墦寮�姝よ缃�
+ seniorSdp: false
# 鍚敤udp澶氱鍙ｆā寮�, 璇︾粏瑙ｉ噴鍙傝��: https://github.com/xia-chu/ZLMediaKit/wiki/GB28181%E6%8E%A8%E6%B5%81 涓嬬殑楂橀樁浣跨敤
rtp:
# [鍙�塢 鏄惁鍚敤udp澶氱鍙ｆā寮�, 寮�鍚悗浼氬湪udpPortRange鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�
--
Gitblit v1.8.0