From b6e604f2449bb65dfaafb0f0741ba54ff0d2f9c2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 30 四月 2024 15:20:03 +0800
Subject: [PATCH] 修改云端录像详情页使用直接访问zlm的方式播放录像
---
src/main/resources/all-application.yml | 189 ++++++++++++++++++++++++++++++----------------
1 files changed, 123 insertions(+), 66 deletions(-)
diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index f7f8604..e616187 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -5,6 +5,10 @@
spring:
+ # 璁剧疆鎺ュ彛瓒呮椂鏃堕棿
+ mvc:
+ async:
+ request-timeout: 20000
# [鍙�塢涓婁紶鏂囦欢澶у皬闄愬埗
servlet:
multipart:
@@ -28,46 +32,49 @@
poolMaxIdle: 500
# [鍙�塢 鏈�澶х殑绛夊緟鏃堕棿(绉�)
poolMaxWait: 5
- # [鍙�塢 jdbc鏁版嵁搴撻厤缃�, 椤圭洰浣跨敤sqlite浣滀负鏁版嵁搴擄紝涓�鑸笉闇�瑕侀厤缃�
+ # [蹇呴�塢 jdbc鏁版嵁搴撻厤缃�
datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false
- username: root
- password: root123
- druid:
- initialSize: 10 # 杩炴帴姹犲垵濮嬪寲杩炴帴鏁�
- maxActive: 200 # 杩炴帴姹犳渶澶ц繛鎺ユ暟
- minIdle: 5 # 杩炴帴姹犳渶灏忕┖闂茶繛鎺ユ暟
- maxWait: 60000 # 鑾峰彇杩炴帴鏃舵渶澶х瓑寰呮椂闂达紝鍗曚綅姣銆傞厤缃簡maxWait涔嬪悗锛岀己鐪佸惎鐢ㄥ叕骞抽攣锛屽苟鍙戞晥鐜囦細鏈夋墍涓嬮檷锛屽鏋滈渶瑕佸彲浠ラ�氳繃閰嶇疆useUnfairLock灞炴�т负true浣跨敤闈炲叕骞抽攣銆�
- keepAlive: true # 杩炴帴姹犱腑鐨刴inIdle鏁伴噺浠ュ唴鐨勮繛鎺ワ紝绌洪棽鏃堕棿瓒呰繃minEvictableIdleTimeMillis锛屽垯浼氭墽琛宬eepAlive鎿嶄綔銆�
- validationQuery: select 1 # 妫�娴嬭繛鎺ユ槸鍚︽湁鏁坰ql锛岃姹傛槸鏌ヨ璇彞锛屽父鐢╯elect 'x'銆傚鏋渧alidationQuery涓簄ull锛宼estOnBorrow銆乼estOnReturn銆乼estWhileIdle閮戒笉浼氳捣浣滅敤銆�
- testWhileIdle: true # 寤鸿閰嶇疆涓簍rue锛屼笉褰卞搷鎬ц兘锛屽苟涓斾繚璇佸畨鍏ㄦ�с�傜敵璇疯繛鎺ョ殑鏃跺�欐娴嬶紝濡傛灉绌洪棽鏃堕棿澶т簬timeBetweenEvictionRunsMillis锛屾墽琛寁alidationQuery妫�娴嬭繛鎺ユ槸鍚︽湁鏁堛��
- testOnBorrow: false # 鐢宠杩炴帴鏃舵墽琛寁alidationQuery妫�娴嬭繛鎺ユ槸鍚︽湁鏁堬紝鍋氫簡杩欎釜閰嶇疆浼氶檷浣庢�ц兘銆�
- testOnReturn: false # 褰掕繕杩炴帴鏃舵墽琛寁alidationQuery妫�娴嬭繛鎺ユ槸鍚︽湁鏁堬紝鍋氫簡杩欎釜閰嶇疆浼氶檷浣庢�ц兘銆�
- poolPreparedStatements: false # 鏄惁闁嬪暉PSCache锛屼甫涓旀寚瀹氭瘡鍊嬮�ｇ窔涓奝SCache鐨勫ぇ灏�
- timeBetweenEvictionRunsMillis: 60000 # 閰嶇疆闁撻殧澶氫箙鎵嶉�茶涓�娆℃娓紝妾㈡脯闇�瑕侀棞闁夌殑绌洪枓閫ｇ窔锛屽柈浣嶆槸姣
- minEvictableIdleTimeMillis: 300000 # 閰嶇疆涓�鍊嬮�ｇ窔鍦ㄦ睜涓渶灏忕敓瀛樼殑鏅傞枔锛屽柈浣嶆槸姣
- filters: stat,wall,slf4j # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛岀洃鎺х粺璁＄敤鐨刦ilter:sta, 鏃ュ織鐢ㄧ殑filter:log4j, 闃插尽sql娉ㄥ叆鐨刦ilter:wall
- useGlobalDataSourceStat: true # 鍚堝苟澶氫釜DruidDataSource鐨勭洃鎺ф暟鎹�
- # 閫氳繃connectProperties灞炴�ф潵鎵撳紑mergeSql鍔熻兘锛涙參SQL璁板綍
- connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=1000
- #stat-view-servlet.url-pattern: /admin/druid/*
+ # kingbase閰嶇疆
+ # type: com.zaxxer.hikari.HikariDataSource
+ # driver-class-name: com.kingbase8.Driver
+ # url: jdbc:kingbase8://192.168.1.55:54321/wvp?useUnicode=true&characterEncoding=utf8
+ # username: system
+ # password: system
+ # postgresql閰嶇疆
+ # type: com.zaxxer.hikari.HikariDataSource
+ # driver-class-name: org.postgresql.Driver
+ # url: jdbc:postgresql://192.168.1.242:3306/242wvp
+ # username: root
+ # password: SYceshizu1234
+ # mysql閰嶇疆
+ dynamic:
+ primary: master
+ datasource:
+ master:
+ type: com.zaxxer.hikari.HikariDataSource
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://127.0.0.1:3306/wvp2?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true
+ username: root
+ password: root123
+ hikari:
+ connection-timeout: 20000 # 鏄鎴风绛夊緟杩炴帴姹犺繛鎺ョ殑鏈�澶ф绉掓暟
+ initialSize: 50 # 杩炴帴姹犲垵濮嬪寲杩炴帴鏁�
+ maximum-pool-size: 200 # 杩炴帴姹犳渶澶ц繛鎺ユ暟
+ minimum-idle: 10 # 杩炴帴姹犳渶灏忕┖闂茶繛鎺ユ暟
+ idle-timeout: 300000 # 鍏佽杩炴帴鍦ㄨ繛鎺ユ睜涓┖闂茬殑鏈�闀挎椂闂达紙浠ユ绉掍负鍗曚綅锛�
+ max-lifetime: 1200000 # 鏄睜涓繛鎺ュ叧闂悗鐨勬渶闀跨敓鍛藉懆鏈燂紙浠ユ绉掍负鍗曚綅)
+ share:
+ type: com.zaxxer.hikari.HikariDataSource
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://127.0.0.1:3306/wvp269_1?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
+ username: root
+ password: 12345678
-# druid绠＄悊鐩戞帶椤甸潰鐨勪竴浜涢厤缃�
-rj-druid-manage:
- allow: # 璁块棶druid鐩戞帶椤甸潰鐨処P鐧藉悕鍗�
- deny: 192.168.1.100 # 璁块棶druid鐩戞帶椤甸潰IP榛戝悕鍗�
- loginUsername: rjAdmin # 璁块棶druid鐩戞帶椤甸潰璐﹀彿
- loginPassword: rj@2022 # 璁块棶druid鐩戞帶椤甸潰瀵嗙爜
-#mybatis:
-# configuration:
-# # 杩欎釜閰嶇疆浼氬皢鎵ц鐨剆ql鎵撳嵃鍑烘潵锛屽湪寮�鍙戞垨娴嬭瘯鐨勬椂鍊欏彲浠ョ敤
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-# # 杩斿洖绫诲瀷涓篗ap,鏄剧ずnull瀵瑰簲鐨勫瓧娈�
-# call-setters-on-nulls: true
-## [鍙�塢 WVP鐩戝惉鐨凥TTP绔彛, 缃戦〉鍜屾帴鍙ｈ皟鐢ㄩ兘鏄繖涓鍙�
+
+# 淇敼鍒嗛〉鎻掍欢涓� postgresql锛� 鏁版嵁搴撶被鍨嬩负mysql涓嶉渶瑕�
+#pagehelper:
+# helper-dialect: postgresql
# [鍙�塢 WVP鐩戝惉鐨凥TTP绔彛, 缃戦〉鍜屾帴鍙ｈ皟鐢ㄩ兘鏄繖涓鍙�
server:
@@ -79,16 +86,24 @@
# [鍙�塢 璇佷功鏂囦欢璺緞锛屾斁缃湪resource/鐩綍涓嬪嵆鍙紝淇敼xxx涓烘枃浠跺悕
key-store: classpath:xxx.jks
# [鍙�塢 璇佷功瀵嗙爜
- key-password: password
+ key-store-password: password
# [鍙�塢 璇佷功绫诲瀷锛� 榛樿涓簀ks锛屾牴鎹疄闄呬慨鏀�
key-store-type: JKS
+ # 閰嶇疆璇佷功鍙互浣跨敤濡備笅涓ら」锛屽涓婇潰浜岄�変竴鍗冲彲
+ # PEM 缂栫爜璇佷功
+ certificate: xx.pem
+ # 绉侀挜鏂囦欢
+ certificate-private-key: xx.key
# 浣滀负28181鏈嶅姟鍣ㄧ殑閰嶇疆
sip:
- # [蹇呴』淇敼] 鏈満鐨処P, 蹇呴』鏄綉鍗′笂鐨処P锛岀敤浜巗ip涓嬪崗璁爤鐩戝惉ip锛屽鏋滅洃鍚墍鏈夎缃负0.0.0.0
- monitor-ip: 0.0.0.0
- # [蹇呴』淇敼] 鏈満鐨処P
- ip: 192.168.0.100
+ # [蹇呴』淇敼] 鏈満鐨処P锛屽搴斾綘鐨勭綉鍗★紝鐩戝惉浠�涔坕p灏辨槸浣跨敤浠�涔堢綉鍗★紝
+ # 濡傛灉瑕佺洃鍚寮犵綉鍗★紝鍙互浣跨敤閫楀彿鍒嗛殧澶氫釜IP锛� 渚嬪锛� 192.168.1.4,10.0.0.4
+ # 濡傛灉涓嶆槑鐧斤紝灏变娇鐢�0.0.0.0锛屽ぇ閮ㄥ垎鎯呭喌閮芥槸鍙互鐨�
+ # 璇蜂笉瑕佷娇鐢�127.0.0.1锛屼换浣曞寘鎷琹ocalhost鍦ㄥ唴鐨勫煙鍚嶉兘鏄笉鍙互鐨勩��
+ ip: 0.0.0.0
+ # [鍙�塢 娌℃湁浠讳綍涓氬姟闇�姹傦紝浠呬粎鏄湪鍓嶇灞曠ず鐨勬椂鍊欑敤
+ show-ip: 192.168.0.100
# [鍙�塢 28181鏈嶅姟鐩戝惉鐨勭鍙�
port: 5060
# 鏍规嵁鍥芥爣6.1.2涓瀹氾紝domain瀹滈噰鐢↖D缁熶竴缂栫爜鐨勫墠鍗佷綅缂栫爜銆傚浗鏍囬檮褰旸涓畾涔夊墠8浣嶄负涓績缂栫爜锛堢敱鐪佺骇銆佸競绾с�佸尯绾с�佸熀灞傜紪鍙风粍鎴愶紝鍙傜収GB/T 2260-2007锛�
@@ -100,8 +115,6 @@
id: 44010200492000000001
# [鍙�塢 榛樿璁惧璁よ瘉瀵嗙爜锛屽悗缁墿灞曚娇鐢ㄨ澶囧崟鐙瘑鐮�, 绉婚櫎瀵嗙爜灏嗕笉杩涜鏍￠獙
password: admin123
- # [鍙�塢 蹇冭烦瓒呮椂鏃堕棿锛� 寤鸿璁剧疆涓哄績璺冲懆鏈熺殑涓夊��
- keepalive-timeout: 255
# [鍙�塢 鍥芥爣绾ц仈娉ㄥ唽澶辫触锛屽啀娆″彂璧锋敞鍐岀殑鏃堕棿闂撮殧銆� 榛樿60绉�
register-time-interval: 60
# [鍙�塢 浜戝彴鎺у埗閫熷害
@@ -110,6 +123,15 @@
# keepalliveToOnline: false
# 鏄惁瀛樺偍alarm淇℃伅
alarm: false
+
+# 鍋氫负JT1078鏈嶅姟鍣ㄧ殑閰嶇疆
+jt1078:
+ #[蹇呴』淇敼] 鏄惁寮�鍚�1078鐨勬湇鍔�
+ enable: true
+ #[蹇呬慨淇敼] 1708璁惧鎺ュ叆鐨勭鍙�
+ port: 21078
+ #[鍙�塢 璁惧閴存潈鐨勫瘑鐮�
+ password: admin123
#zlm 榛樿鏈嶅姟鍣ㄩ厤缃�
media:
@@ -141,22 +163,24 @@
auto-config: true
# [鍙�塢 zlm鏈嶅姟鍣ㄧ殑hook.admin_params=secret
secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc
- # [鍙�塢 zlm鏈嶅姟鍣ㄧ殑general.streamNoneReaderDelayMS
- stream-none-reader-delay-ms: 18000 # 鏃犱汉瑙傜湅澶氫箙鑷姩鍏抽棴娴�, -1琛ㄧず姘镐笉鑷姩鍏抽棴,鍗� 鍏抽棴鎸夐渶鎷夋祦
+ # 褰曞儚璺緞
+ record-path: ./www/record
+ # 褰曞儚淇濆瓨鏃堕暱
+ record-day: 7
# 鍚敤澶氱鍙ｆā寮�, 澶氱鍙ｆā寮忎娇鐢ㄧ鍙ｅ尯鍒嗘瘡璺祦锛屽吋瀹规�ф洿濂姐�� 鍗曠鍙ｄ娇鐢ㄦ祦鐨剆src鍖哄垎锛� 鐐规挱瓒呮椂寤鸿浣跨敤澶氱鍙ｆ祴璇�
rtp:
# [鍙�塢 鏄惁鍚敤澶氱鍙ｆā寮�, 寮�鍚悗浼氬湪portRange鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�
enable: true
# [鍙�塢 鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�, 蹇呴』鎻愬墠鍦▃lm涓婇厤缃灞炴�э紝涓嶇劧鑷姩閰嶇疆姝ゅ睘鎬у彲鑳戒笉鎴愬姛
port-range: 30000,30500 # 绔彛鑼冨洿
- # [鍙�塢 鍥芥爣绾ц仈鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鍙戦�佸獟浣撴祦,
- send-port-range: 30000,30500 # 绔彛鑼冨洿
+ # [鍙�塢 鍥芥爣绾ц仈鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鍙戦�佸獟浣撴祦锛岃涓嶈涓庢敹娴佺鍙ｈ寖鍥撮噸鍚�
+ send-port-range: 50502,50506 # 绔彛鑼冨洿
# 褰曞儚杈呭姪鏈嶅姟锛� 閮ㄧ讲姝ゆ湇鍔″彲浠ュ疄鐜皕lm褰曞儚鐨勭鐞嗕笌涓嬭浇锛� 0 琛ㄧず涓嶄娇鐢�
record-assist-port: 0
-# [鍙�塢 鏃ュ織閰嶇疆, 涓�鑸笉闇�瑕佹敼
+# [鍙�塢 鏃ュ織閰嶇疆, 濡傛灉涓嶉渶瑕佸湪jar澶栦慨鏀规棩蹇楀唴瀹归偅涔堝彲浠ヤ笉閰嶇疆姝ら」
logging:
- config: classpath:logback-spring-local.xml
+ config: classpath:logback-spring.xml
# [鏍规嵁涓氬姟闇�姹傞厤缃甝
user-settings:
@@ -168,12 +192,12 @@
senior-sdp: false
# 淇濆瓨绉诲姩浣嶇疆鍘嗗彶杞ㄨ抗锛歵rue:淇濈暀鍘嗗彶鏁版嵁锛宖alse:浠呬繚鐣欐渶鍚庣殑浣嶇疆(榛樿)
save-position-history: false
- # 鐐规挱绛夊緟瓒呮椂鏃堕棿,鍗曚綅锛氭绉�
- play-timeout: 3000
+ # 鐐规挱/褰曞儚鍥炴斁 绛夊緟瓒呮椂鏃堕棿,鍗曚綅锛氭绉�
+ play-timeout: 18000
+ # 涓婄骇鐐规挱绛夊緟瓒呮椂鏃堕棿,鍗曚綅锛氭绉�
+ platform-play-timeout: 60000
# 鏄惁寮�鍚帴鍙ｉ壌鏉�
interface-authentication: true
- # 鑷姩閰嶇疆redis 鍙互杩囨湡浜嬩欢
- redis-config: true
# 鎺ュ彛閴存潈渚嬪鐨勬帴鍙�, 鍗充笉杩涜鎺ュ彛閴存潈鐨勬帴鍙�,灏介噺璇︾粏涔﹀啓锛屽敖閲忎笉鐢�/**锛岃嚦灏戜袱绾х洰褰�
interface-authentication-excludes:
- /api/v1/**
@@ -182,16 +206,49 @@
# 鍥芥爣鏄惁褰曞埗
record-sip: true
# 鏄惁灏嗘棩蹇楀瓨鍌ㄨ繘鏁版嵁搴�
- logInDatebase: true
- # 绗笁鏂瑰尮閰嶏紝鐢ㄤ簬浠巗tream閽熻幏鍙栨湁鏁堜俊鎭�
- thirdPartyGBIdReg: "[\\s\\S]*"
+ logInDatabase: true
+ # 浣跨敤鎺ㄦ祦鐘舵�佷綔涓烘帹娴侀�氶亾鐘舵��
+ use-pushing-as-status: true
+ # 浣跨敤鏉ユ簮璇锋眰ip浣滀负streamIp,褰撲笖浠呭綋浣犲彧鏈墇lm鑺傜偣瀹冧笌wvp鍦ㄤ竴璧风殑鎯呭喌涓嬪紑鍚�
+ use-source-ip-as-stream-ip: false
+ # 鍥芥爣鐐规挱 鎸夐渶鎷夋祦, true锛氭湁浜鸿鐪嬫媺娴侊紝鏃犱汉瑙傜湅閲婃斁锛� false锛氭媺璧峰悗涓嶈嚜鍔ㄩ噴鏀�
+ stream-on-demand: true
+ # 鎺ㄦ祦閴存潈锛� 榛樿寮�鍚�
+ 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閫氶亾鐘舵�佸彉鍖栵紝 鍏煎娴峰悍骞冲彴鍙戦�侀敊璇秷鎭�
+ refuse-channel-status-channel-form-notify: false
+ # 璁剧疆notify缂撳瓨闃熷垪鏈�澶ч暱搴︼紝瓒呰繃姝ら暱搴︾殑鏁版嵁灏嗚繑鍥�486 BUSY_HERE锛屾秷鎭涪寮�, 榛樿10000
+ max-notify-count-queue: 10000
+ # 璁惧/閫氶亾鐘舵�佸彉鍖栨椂鍙戦�佹秷鎭�
+ device-status-notify: false
+ # 涓婄骇骞冲彴鐐规挱鏃朵笉浣跨敤涓婄骇骞冲彴鎸囧畾鐨剆src锛屼娇鐢ㄨ嚜瀹氫箟鐨剆src锛屽弬鑰冨浗鏍囨枃妗�-鐐规挱澶栧煙璁惧濯掍綋娴丼SRC澶勭悊鏂瑰紡
+ use-custom-ssrc-for-parent-invite: true
+ # 鍥芥爣绾ц仈绂荤嚎鍚庡涔呴噸璇曚竴娆℃敞鍐�
+ register-again-after-time: 60
+ # 鍥芥爣缁鏂瑰紡锛宼rue涓虹画璁紝姣忔娉ㄥ唽鍦ㄥ悓涓�涓細璇濋噷锛宖alse涓洪噸鏂版敞鍐岋紝姣忔浣跨敤鏂扮殑浼氳瘽
+ register-keep-int-dialog: false
+ # 璺ㄥ煙閰嶇疆锛屼笉閰嶇疆姝ら」鍒欏厑璁告墍鏈夎法鍩熻姹傦紝閰嶇疆鍚庡垯鍙厑璁搁厤缃殑椤甸潰鐨勫湴鍧�璇锋眰锛� 鍙互閰嶇疆澶氫釜
+ allowed-origins:
+ - http://localhost:8008
+ - http://192.168.1.3:8008
-# 鍦ㄧ嚎鏂囨。锛� swagger-ui锛堢敓浜х幆澧冨缓璁叧闂級
-swagger-ui:
- enabled: true
-
-# 鐗堟湰淇℃伅锛� 涓嶉渶淇敼
-version:
- version: "@project.version@"
- description: "@project.description@"
- artifact-id: "@project.artifactId@"
+# 鍏抽棴鍦ㄧ嚎鏂囨。锛堢敓浜х幆澧冨缓璁叧闂級
+springdoc:
+ api-docs:
+ enabled: false
+ swagger-ui:
+ enabled: false
--
Gitblit v1.8.0