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-dev.yml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 44f70e6..512152b 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -36,7 +36,7 @@
 # 浣滀负28181鏈嶅姟鍣ㄧ殑閰嶇疆
 sip:
     # [蹇呴』淇敼] 鏈満鐨処P
-    ip: 192.168.0.100
+    ip:
     # [鍙�塢 28181鏈嶅姟鐩戝惉鐨勭鍙�
     port: 5060
     # 鏍规嵁鍥芥爣6.1.2涓瀹氾紝domain瀹滈噰鐢↖D缁熶竴缂栫爜鐨勫墠鍗佷綅缂栫爜銆傚浗鏍囬檮褰旸涓畾涔夊墠8浣嶄负涓績缂栫爜锛堢敱鐪佺骇銆佸競绾с�佸尯绾с�佸熀灞傜紪鍙风粍鎴愶紝鍙傜収GB/T 2260-2007锛�
@@ -66,8 +66,7 @@
         # [鍙�塢 鍥芥爣绾ц仈鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鍙戦�佸獟浣撴祦,
         send-port-range: 30000,30500 # 绔彛鑼冨洿
     # 褰曞儚杈呭姪鏈嶅姟锛� 閮ㄧ讲姝ゆ湇鍔″彲浠ュ疄鐜皕lm褰曞儚鐨勭鐞嗕笌涓嬭浇锛� 0 琛ㄧず涓嶄娇鐢�
-    record-assist-port: 0
-
+    record-assist-port: 18081
 # [鍙�塢 鏃ュ織閰嶇疆, 涓�鑸笉闇�瑕佹敼
 logging:
     file:
@@ -84,6 +83,7 @@
 user-settings:
     # 鎺ㄦ祦鐩存挱鏄惁褰曞埗
     record-push-live: true
+    auto-apply-play: false
 
 # 鍦ㄧ嚎鏂囨。锛� swagger-ui锛堢敓浜х幆澧冨缓璁叧闂級
 swagger-ui:
@@ -93,4 +93,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