From 10f776678eeabfa0c73cf052db0e0044342f407f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 25 二月 2022 20:33:38 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-pro-record
---
src/main/resources/all-application.yml | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index c0b2919..dab500e 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -1,10 +1,15 @@
-# 姝ら厤缃枃浠跺彧鏄敤浣滃睍绀烘墍鏈夐厤缃」锛� 涓嶅彲涓嶇洿鎺ヤ娇鐢�
+# 姝ら厤缃枃浠跺彧鏄敤浣滃睍绀烘墍鏈夐厤缃」锛� 涓嶅彲鐩存帴浣跨敤
spring:
+ # [鍙�塢涓婁紶鏂囦欢澶у皬闄愬埗
+ servlet:
+ multipart:
+ max-file-size: 10MB
+ max-request-size: 100MB
# REDIS鏁版嵁搴撻厤缃�
redis:
# [蹇呴』淇敼] Redis鏈嶅姟鍣↖P, REDIS瀹夎鍦ㄦ湰鏈虹殑,浣跨敤127.0.0.1
@@ -88,7 +93,7 @@
#zlm 榛樿鏈嶅姟鍣ㄩ厤缃�
media:
- # [鍙�塢 zlm鏈嶅姟鍣ㄥ敮涓�id锛岀敤浜庤Е鍙慼ook鏃跺尯鍒槸鍝彴鏈嶅姟鍣�,general.mediaServerId
+ # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄥ敮涓�id锛岀敤浜庤Е鍙慼ook鏃跺尯鍒槸鍝彴鏈嶅姟鍣�,general.mediaServerId
id:
# [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑鍐呯綉IP
ip: 192.168.0.100
@@ -163,6 +168,8 @@
- /api/v1/**
# 鎺ㄦ祦鐩存挱鏄惁褰曞埗
record-push-live: true
+ # 鍥芥爣鏄惁褰曞埗
+ record-sip: true
# 鏄惁灏嗘棩蹇楀瓨鍌ㄨ繘鏁版嵁搴�
logInDatebase: true
# 绗笁鏂瑰尮閰嶏紝鐢ㄤ簬浠巗tream閽熻幏鍙栨湁鏁堜俊鎭�
@@ -176,4 +183,4 @@
version:
version: "@project.version@"
description: "@project.description@"
- artifact-id: "@project.artifactId@"
\ No newline at end of file
+ artifact-id: "@project.artifactId@"
--
Gitblit v1.8.0