From 819ec97d6653af3a2daab3e9e2914662a8086a8d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 12 四月 2024 16:05:29 +0800
Subject: [PATCH] 移除全量脚本多余字段
---
src/main/resources/application-dev.yml | 60 ++++++++++++++++++++++++++++++++----------------------------
1 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index f5404e2..5be3036 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
# [鍙�塢涓婁紶鏂囦欢澶у皬闄愬埗
@@ -15,26 +19,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绔彛, 缃戦〉鍜屾帴鍙ｈ皟鐢ㄩ兘鏄繖涓鍙�
server:
- port: 18978
+ port: 8080
# [鍙�塢 HTTPS閰嶇疆锛� 榛樿涓嶅紑鍚�
ssl:
# [鍙�塢 鏄惁寮�鍚疕TTPS璁块棶
@@ -52,7 +60,7 @@
# 濡傛灉瑕佺洃鍚寮犵綉鍗★紝鍙互浣跨敤閫楀彿鍒嗛殧澶氫釜IP锛� 渚嬪锛� 192.168.1.4,10.0.0.4
# 濡傛灉涓嶆槑鐧斤紝灏变娇鐢�0.0.0.0锛屽ぇ閮ㄥ垎鎯呭喌閮芥槸鍙互鐨�
# 璇蜂笉瑕佷娇鐢�127.0.0.1锛屼换浣曞寘鎷琹ocalhost鍦ㄥ唴鐨勫煙鍚嶉兘鏄笉鍙互鐨勩��
- ip: 192.168.1.18
+ ip: 172.19.128.50
# [鍙�塢 28181鏈嶅姟鐩戝惉鐨勭鍙�
port: 8116
# 鏍规嵁鍥芥爣6.1.2涓瀹氾紝domain瀹滈噰鐢↖D缁熶竴缂栫爜鐨勫墠鍗佷綅缂栫爜銆傚浗鏍囬檮褰旸涓畾涔夊墠8浣嶄负涓績缂栫爜锛堢敱鐪佺骇銆佸競绾с�佸尯绾с�佸熀灞傜紪鍙风粍鎴愶紝鍙傜収GB/T 2260-2007锛�
@@ -69,21 +77,21 @@
#zlm 榛樿鏈嶅姟鍣ㄩ厤缃�
media:
- id: 89wulian-one
+ id: zlmediakit-local
# [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑鍐呯綉IP
- ip: 192.168.1.18
+ ip: 172.19.128.50
# [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑http.port
- http-port: 80
+ http-port: 9092
# [鍙�塢 杩斿洖娴佸湴鍧�鏃剁殑ip锛岀疆绌轰娇鐢� media.ip
- stream-ip: 192.168.1.18
+ stream-ip: 172.19.128.50
# [鍙�塢 wvp鍦ㄥ浗鏍囦俊浠や腑浣跨敤鐨刬p锛屾ip涓烘憚鍍忔満鍙互璁块棶鍒扮殑ip锛� 缃┖浣跨敤 media.ip
- sdp-ip: 192.168.1.18
+ sdp-ip: 172.19.128.50
# [鍙�塢 zlm鏈嶅姟鍣ㄧ殑hook鎵�浣跨敤鐨処P, 榛樿浣跨敤sip.ip
- hook-ip: 192.168.1.18
+ hook-ip: 172.19.128.50
# [鍙�塢 zlm鏈嶅姟鍣ㄧ殑http.sslport, 缃┖浣跨敤zlm閰嶇疆鏂囦欢閰嶇疆
- http-ssl-port: 443
+ http-ssl-port: 1443
# [鍙�塢 zlm鏈嶅姟鍣ㄧ殑hook.admin_params=secret
- secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc
+ secret: 10000
# 鍚敤澶氱鍙ｆā寮�, 澶氱鍙ｆā寮忎娇鐢ㄧ鍙ｅ尯鍒嗘瘡璺祦锛屽吋瀹规�ф洿濂姐�� 鍗曠鍙ｄ娇鐢ㄦ祦鐨剆src鍖哄垎锛� 鐐规挱瓒呮椂寤鸿浣跨敤澶氱鍙ｆ祴璇�
rtp:
# [鍙�塢 鏄惁鍚敤澶氱鍙ｆā寮�, 寮�鍚悗浼氬湪portRange鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�
@@ -102,11 +110,7 @@
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
+ config: classpath:logback-spring.xml
--
Gitblit v1.8.0