From 6ac131bcf6ec034ffc9e5813c68c56c6e5c32b70 Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期三, 01 十二月 2021 22:45:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/resources/application-docker.yml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/application-docker.yml b/src/main/resources/application-docker.yml
index ff60f5a..e8f2c71 100644
--- a/src/main/resources/application-docker.yml
+++ b/src/main/resources/application-docker.yml
@@ -8,7 +8,7 @@
# [鍙�塢 鏁版嵁搴� DB
database: ${REDIS_DB:6}
# [鍙�塢 璁块棶瀵嗙爜,鑻ヤ綘鐨剅edis鏈嶅姟鍣ㄦ病鏈夎缃瘑鐮侊紝灏变笉闇�瑕佺敤瀵嗙爜鍘昏繛鎺�
- password: ${REDIS_PWD:}
+ password: ${REDIS_PWD:root}
# [鍙�塢 瓒呮椂鏃堕棿
timeout: 10000
# [鍙�塢 jdbc鏁版嵁搴撻厤缃�, 椤圭洰浣跨敤sqlite浣滀负鏁版嵁搴擄紝涓�鑸笉闇�瑕侀厤缃�
@@ -67,7 +67,7 @@
send-port-range: 30000,30500 # 绔彛鑼冨洿
# 褰曞儚杈呭姪鏈嶅姟锛� 閮ㄧ讲姝ゆ湇鍔″彲浠ュ疄鐜皕lm褰曞儚鐨勭鐞嗕笌涓嬭浇锛� 0 琛ㄧず涓嶄娇鐢�
record-assist-port: 18081
- sdp-ip: ${sip.ip}
+ sdp-ip: ${media.ip}
stream-ip: ${sip.ip}
# [鍙�塢 鏃ュ織閰嶇疆, 涓�鑸笉闇�瑕佹敼
logging:
@@ -85,7 +85,7 @@
user-settings:
# 鎺ㄦ祦鐩存挱鏄惁褰曞埗
record-push-live: true
- auto-apply-play: false
+ auto-apply-play: true
# 鍦ㄧ嚎鏂囨。锛� swagger-ui锛堢敓浜х幆澧冨缓璁叧闂級
swagger-ui:
--
Gitblit v1.8.0