From bb6ecb15529851daa10eefe04e918c24b00459a3 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 29 三月 2024 19:18:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/application-dev.yml | 110 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 70 insertions(+), 40 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index f06bd3e..5be3036 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,4 +1,10 @@
spring:
+ # 璁剧疆鎺ュ彛瓒呮椂鏃堕棿
+ mvc:
+ async:
+ request-timeout: 20000
+ thymeleaf:
+ cache: false
# [鍙�塢涓婁紶鏂囦欢澶у皬闄愬埗
servlet:
multipart:
@@ -11,76 +17,100 @@
# [蹇呴』淇敼] 绔彛鍙�
port: 6379
# [鍙�塢 鏁版嵁搴� DB
- database: 6
+ database: 7
# [鍙�塢 璁块棶瀵嗙爜,鑻ヤ綘鐨剅edis鏈嶅姟鍣ㄦ病鏈夎缃瘑鐮侊紝灏变笉闇�瑕佺敤瀵嗙爜鍘昏繛鎺�
- password: face2020
+ password: luna
# [鍙�塢 瓒呮椂鏃堕棿
timeout: 10000
# mysql鏁版嵁婧�
datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- 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: 123456
- 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,slf4j # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛岀洃鎺х粺璁＄敤鐨刦ilter:sta, 鏃ュ織鐢ㄧ殑filter:log4j
- useGlobalDataSourceStat: true # 鍚堝苟澶氫釜DruidDataSource鐨勭洃鎺ф暟鎹�
- # 閫氳繃connectProperties灞炴�ф潵鎵撳紑mergeSql鍔熻兘锛涙參SQL璁板綍
- connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=1000
- #stat-view-servlet.url-pattern: /admin/druid/*
-
+ 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 # 鏄睜涓繛鎺ュ叧闂悗鐨勬渶闀跨敓鍛藉懆鏈燂紙浠ユ绉掍负鍗曚綅)
#[鍙�塢 WVP鐩戝惉鐨凥TTP绔彛, 缃戦〉鍜屾帴鍙ｈ皟鐢ㄩ兘鏄繖涓鍙�
server:
- port: 18080
+ port: 8080
+ # [鍙�塢 HTTPS閰嶇疆锛� 榛樿涓嶅紑鍚�
+ ssl:
+ # [鍙�塢 鏄惁寮�鍚疕TTPS璁块棶
+ enabled: false
+ # [鍙�塢 璇佷功鏂囦欢璺緞锛屾斁缃湪resource/鐩綍涓嬪嵆鍙紝淇敼xxx涓烘枃浠跺悕
+ key-store: classpath:test.monitor.89iot.cn.jks
+ # [鍙�塢 璇佷功瀵嗙爜
+ key-store-password: gpf64qmw
+ # [鍙�塢 璇佷功绫诲瀷锛� 榛樿涓簀ks锛屾牴鎹疄闄呬慨鏀�
+ key-store-type: JKS
# 浣滀负28181鏈嶅姟鍣ㄧ殑閰嶇疆
sip:
- # [蹇呴』淇敼] 鏈満鐨処P
- ip: 192.168.41.16
+ # [蹇呴』淇敼] 鏈満鐨処P锛屽搴斾綘鐨勭綉鍗★紝鐩戝惉浠�涔坕p灏辨槸浣跨敤浠�涔堢綉鍗★紝
+ # 濡傛灉瑕佺洃鍚寮犵綉鍗★紝鍙互浣跨敤閫楀彿鍒嗛殧澶氫釜IP锛� 渚嬪锛� 192.168.1.4,10.0.0.4
+ # 濡傛灉涓嶆槑鐧斤紝灏变娇鐢�0.0.0.0锛屽ぇ閮ㄥ垎鎯呭喌閮芥槸鍙互鐨�
+ # 璇蜂笉瑕佷娇鐢�127.0.0.1锛屼换浣曞寘鎷琹ocalhost鍦ㄥ唴鐨勫煙鍚嶉兘鏄笉鍙互鐨勩��
+ ip: 172.19.128.50
# [鍙�塢 28181鏈嶅姟鐩戝惉鐨勭鍙�
- port: 5060
+ port: 8116
# 鏍规嵁鍥芥爣6.1.2涓瀹氾紝domain瀹滈噰鐢↖D缁熶竴缂栫爜鐨勫墠鍗佷綅缂栫爜銆傚浗鏍囬檮褰旸涓畾涔夊墠8浣嶄负涓績缂栫爜锛堢敱鐪佺骇銆佸競绾с�佸尯绾с�佸熀灞傜紪鍙风粍鎴愶紝鍙傜収GB/T 2260-2007锛�
# 鍚庝袱浣嶄负琛屼笟缂栫爜锛屽畾涔夊弬鐓ч檮褰旸.3
# 3701020049鏍囪瘑灞变笢娴庡崡鍘嗕笅鍖� 淇℃伅琛屼笟鎺ュ叆
# [鍙�塢
- domain: 4401020049
+ domain: 4101050000
# [鍙�塢
- id: 44010200492000000001
+ id: 41010500002000000001
# [鍙�塢 榛樿璁惧璁よ瘉瀵嗙爜锛屽悗缁墿灞曚娇鐢ㄨ澶囧崟鐙瘑鐮�, 绉婚櫎瀵嗙爜灏嗕笉杩涜鏍￠獙
- password: admin123
+ password: bajiuwulian1006
+ # 鏄惁瀛樺偍alarm淇℃伅
+ alarm: true
#zlm 榛樿鏈嶅姟鍣ㄩ厤缃�
media:
- id: FQ3TF8yT83wh5Wvz
+ id: zlmediakit-local
# [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑鍐呯綉IP
- ip: 192.168.41.16
+ ip: 172.19.128.50
# [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑http.port
- http-port: 8091
+ http-port: 9092
+ # [鍙�塢 杩斿洖娴佸湴鍧�鏃剁殑ip锛岀疆绌轰娇鐢� media.ip
+ stream-ip: 172.19.128.50
+ # [鍙�塢 wvp鍦ㄥ浗鏍囦俊浠や腑浣跨敤鐨刬p锛屾ip涓烘憚鍍忔満鍙互璁块棶鍒扮殑ip锛� 缃┖浣跨敤 media.ip
+ sdp-ip: 172.19.128.50
+ # [鍙�塢 zlm鏈嶅姟鍣ㄧ殑hook鎵�浣跨敤鐨処P, 榛樿浣跨敤sip.ip
+ hook-ip: 172.19.128.50
+ # [鍙�塢 zlm鏈嶅姟鍣ㄧ殑http.sslport, 缃┖浣跨敤zlm閰嶇疆鏂囦欢閰嶇疆
+ http-ssl-port: 1443
# [鍙�塢 zlm鏈嶅姟鍣ㄧ殑hook.admin_params=secret
- secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc
+ secret: 10000
# 鍚敤澶氱鍙ｆā寮�, 澶氱鍙ｆā寮忎娇鐢ㄧ鍙ｅ尯鍒嗘瘡璺祦锛屽吋瀹规�ф洿濂姐�� 鍗曠鍙ｄ娇鐢ㄦ祦鐨剆src鍖哄垎锛� 鐐规挱瓒呮椂寤鸿浣跨敤澶氱鍙ｆ祴璇�
rtp:
# [鍙�塢 鏄惁鍚敤澶氱鍙ｆā寮�, 寮�鍚悗浼氬湪portRange鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�
enable: true
# [鍙�塢 鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�, 蹇呴』鎻愬墠鍦▃lm涓婇厤缃灞炴�э紝涓嶇劧鑷姩閰嶇疆姝ゅ睘鎬у彲鑳戒笉鎴愬姛
- port-range: 30000,30500 # 绔彛鑼冨洿
+ port-range: 50000,50300 # 绔彛鑼冨洿
# [鍙�塢 鍥芥爣绾ц仈鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鍙戦�佸獟浣撴祦,
- send-port-range: 30000,30500 # 绔彛鑼冨洿
+ send-port-range: 50000,50300 # 绔彛鑼冨洿
# 褰曞儚杈呭姪鏈嶅姟锛� 閮ㄧ讲姝ゆ湇鍔″彲浠ュ疄鐜皕lm褰曞儚鐨勭鐞嗕笌涓嬭浇锛� 0 琛ㄧず涓嶄娇鐢�
record-assist-port: 18081
+# [鏍规嵁涓氬姟闇�姹傞厤缃甝
+user-settings:
+ # 鐐规挱/褰曞儚鍥炴斁 绛夊緟瓒呮椂鏃堕棿,鍗曚綅锛氭绉�
+ play-timeout: 180000
+ # [鍙�塢 鑷姩鐐规挱锛� 浣跨敤鍥哄畾娴佸湴鍧�杩涜鎾斁鏃讹紝濡傛灉鏈偣鎾垯鑷姩杩涜鐐规挱, 闇�瑕乺tp.enable=true
+ auto-apply-play: true
+ # 璁惧/閫氶亾鐘舵�佸彉鍖栨椂鍙戦�佹秷鎭�
+ device-status-notify: true
# [鍙�塢 鏃ュ織閰嶇疆, 涓�鑸笉闇�瑕佹敼
logging:
- config: classpath:logback-spring-local.xml
+ config: classpath:logback-spring.xml
+
--
Gitblit v1.8.0