From ac1e604eb455e165e84496270fe065cbb4540bca Mon Sep 17 00:00:00 2001
From: Iwan Lebron <105045937+iwanlebron@users.noreply.github.com>
Date: 星期六, 27 七月 2024 11:50:18 +0800
Subject: [PATCH] 修复前端传参错误

---
 src/main/resources/application-dev.yml |   82 +++++++++++++++++++---------------------
 1 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index f5404e2..93c8af3 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,4 +1,8 @@
 spring:
+  # 璁剧疆鎺ュ彛瓒呮椂鏃堕棿
+  mvc:
+    async:
+      request-timeout: 20000
   thymeleaf:
     cache: false
   # [鍙�塢涓婁紶鏂囦欢澶у皬闄愬埗
@@ -6,6 +10,8 @@
     multipart:
       max-file-size: 10MB
       max-request-size: 100MB
+  cache:
+    type: redis
   # REDIS鏁版嵁搴撻厤缃�
   redis:
     # [蹇呴』淇敼] Redis鏈嶅姟鍣↖P, REDIS瀹夎鍦ㄦ湰鏈虹殑,浣跨敤127.0.0.1
@@ -15,26 +21,30 @@
     # [鍙�塢 鏁版嵁搴� DB
     database: 7
     # [鍙�塢 璁块棶瀵嗙爜,鑻ヤ綘鐨剅edis鏈嶅姟鍣ㄦ病鏈夎缃瘑鐮侊紝灏变笉闇�瑕佺敤瀵嗙爜鍘昏繛鎺�
-    password:
+    password: luna
     # [鍙�塢 瓒呮椂鏃堕棿
     timeout: 10000
     # mysql鏁版嵁婧�
   datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/test_gb-89wulian?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true
-    username: root
-    password: root
-    hikari:
-      connection-timeout: 20000             # 鏄鎴风绛夊緟杩炴帴姹犺繛鎺ョ殑鏈�澶ф绉掓暟
-      initialSize: 10                       # 杩炴帴姹犲垵濮嬪寲杩炴帴鏁�
-      maximum-pool-size: 200                # 杩炴帴姹犳渶澶ц繛鎺ユ暟
-      minimum-idle: 5                       # 杩炴帴姹犳渶灏忕┖闂茶繛鎺ユ暟
-      idle-timeout: 300000                  # 鍏佽杩炴帴鍦ㄨ繛鎺ユ睜涓┖闂茬殑鏈�闀挎椂闂达紙浠ユ绉掍负鍗曚綅锛�
-      max-lifetime: 1200000                 # 鏄睜涓繛鎺ュ叧闂悗鐨勬渶闀跨敓鍛藉懆鏈燂紙浠ユ绉掍负鍗曚綅)
+    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绔彛, 缃戦〉鍜屾帴鍙h皟鐢ㄩ兘鏄繖涓鍙�
 server:
-  port: 18978
+  port: 8080
   # [鍙�塢 HTTPS閰嶇疆锛� 榛樿涓嶅紑鍚�
   ssl:
     # [鍙�塢 鏄惁寮�鍚疕TTPS璁块棶
@@ -48,11 +58,6 @@
 
 # 浣滀负28181鏈嶅姟鍣ㄧ殑閰嶇疆
 sip:
-  # [蹇呴』淇敼] 鏈満鐨処P锛屽搴斾綘鐨勭綉鍗★紝鐩戝惉浠�涔坕p灏辨槸浣跨敤浠�涔堢綉鍗★紝
-  # 濡傛灉瑕佺洃鍚寮犵綉鍗★紝鍙互浣跨敤閫楀彿鍒嗛殧澶氫釜IP锛� 渚嬪锛� 192.168.1.4,10.0.0.4
-  # 濡傛灉涓嶆槑鐧斤紝灏变娇鐢�0.0.0.0锛屽ぇ閮ㄥ垎鎯呭喌閮芥槸鍙互鐨�
-  # 璇蜂笉瑕佷娇鐢�127.0.0.1锛屼换浣曞寘鎷琹ocalhost鍦ㄥ唴鐨勫煙鍚嶉兘鏄笉鍙互鐨勩��
-  ip: 192.168.1.18
   # [鍙�塢 28181鏈嶅姟鐩戝惉鐨勭鍙�
   port: 8116
   # 鏍规嵁鍥芥爣6.1.2涓瀹氾紝domain瀹滈噰鐢↖D缁熶竴缂栫爜鐨勫墠鍗佷綅缂栫爜銆傚浗鏍囬檮褰旸涓畾涔夊墠8浣嶄负涓績缂栫爜锛堢敱鐪佺骇銆佸競绾с�佸尯绾с�佸熀灞傜紪鍙风粍鎴愶紝鍙傜収GB/T 2260-2007锛�
@@ -69,21 +74,17 @@
 
 #zlm 榛樿鏈嶅姟鍣ㄩ厤缃�
 media:
-  id: 89wulian-one
+  id: zlmediakit-local
   # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑鍐呯綉IP
-  ip: 192.168.1.18
+  ip: 172.19.128.50
+  # [鍙�塢 鏈夊叕缃慖P灏遍厤缃叕缃慖P, 涓嶅彲鐢ㄥ煙鍚�
+  wan_ip:
   # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑http.port
-  http-port: 80
-  # [鍙�塢 杩斿洖娴佸湴鍧�鏃剁殑ip锛岀疆绌轰娇鐢� media.ip
-  stream-ip: 192.168.1.18
-  # [鍙�塢 wvp鍦ㄥ浗鏍囦俊浠や腑浣跨敤鐨刬p锛屾ip涓烘憚鍍忔満鍙互璁块棶鍒扮殑ip锛� 缃┖浣跨敤 media.ip
-  sdp-ip: 192.168.1.18
-  # [鍙�塢 zlm鏈嶅姟鍣ㄧ殑hook鎵�浣跨敤鐨処P, 榛樿浣跨敤sip.ip
-  hook-ip: 192.168.1.18
-  # [鍙�塢 zlm鏈嶅姟鍣ㄧ殑http.sslport, 缃┖浣跨敤zlm閰嶇疆鏂囦欢閰嶇疆
-  http-ssl-port: 443
-  # [鍙�塢 zlm鏈嶅姟鍣ㄧ殑hook.admin_params=secret
-  secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc
+  http-port: 9092
+  # [鍙�塢 zlm鏈嶅姟鍣ㄨ闂甒VP鎵�浣跨敤鐨処P, 榛樿浣跨敤127.0.0.1锛寊lm鍜寃vp娌℃湁閮ㄧ讲鍦ㄥ悓涓�鍙版湇鍔″櫒鏃跺繀椤婚厤缃�
+  hook-ip: 172.19.128.50
+  # [蹇呴�夐�塢 zlm鏈嶅姟鍣ㄧ殑hook.admin_params=secret
+  secret: TWSYFgYJOQWB4ftgeYut8DW4wbs7pQnj
   # 鍚敤澶氱鍙fā寮�, 澶氱鍙fā寮忎娇鐢ㄧ鍙e尯鍒嗘瘡璺祦锛屽吋瀹规�ф洿濂姐�� 鍗曠鍙d娇鐢ㄦ祦鐨剆src鍖哄垎锛� 鐐规挱瓒呮椂寤鸿浣跨敤澶氱鍙f祴璇�
   rtp:
     # [鍙�塢 鏄惁鍚敤澶氱鍙fā寮�, 寮�鍚悗浼氬湪portRange鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�
@@ -92,21 +93,16 @@
     port-range: 50000,50300 # 绔彛鑼冨洿
     # [鍙�塢 鍥芥爣绾ц仈鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鍙戦�佸獟浣撴祦,
     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
-  # 璺ㄥ煙閰嶇疆锛岄厤缃綘璁块棶鍓嶇椤甸潰鐨勫湴鍧�鍗冲彲锛� 鍙互閰嶇疆澶氫釜
-  allowed-origins:
-    - http://localhost:8080
-    - http://127.0.0.1:8080
-# [鍙�塢 鏃ュ織閰嶇疆, 涓�鑸笉闇�瑕佹敼
-logging:
-  config: classpath:logback-spring-local.xml
+  # 鎺ㄦ祦鐩存挱鏄惁褰曞埗
+  record-push-live: true
+  # 鍥芥爣鏄惁褰曞埗
+  record-sip: true
+  # 鍥芥爣鐐规挱 鎸夐渶鎷夋祦, true锛氭湁浜鸿鐪嬫媺娴侊紝鏃犱汉瑙傜湅閲婃斁锛� false锛氭媺璧峰悗涓嶈嚜鍔ㄩ噴鏀�
+  stream-on-demand: true
 

--
Gitblit v1.8.0