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 | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index dd2e0f7..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锛� @@ -52,7 +52,7 @@ #zlm 榛樿鏈嶅姟鍣ㄩ厤缃� media: # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑鍐呯綉IP - ip: 192.168.0.100 + ip: 127.0.0.1 # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑http.port http-port: 80 # [鍙�塢 zlm鏈嶅姟鍣ㄧ殑hook.admin_params=secret @@ -63,9 +63,10 @@ enable: true # [鍙�塢 鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�, port-range: 30000,30500 # 绔彛鑼冨洿 + # [鍙�塢 鍥芥爣绾ц仈鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鍙戦�佸獟浣撴祦, + send-port-range: 30000,30500 # 绔彛鑼冨洿 # 褰曞儚杈呭姪鏈嶅姟锛� 閮ㄧ讲姝ゆ湇鍔″彲浠ュ疄鐜皕lm褰曞儚鐨勭鐞嗕笌涓嬭浇锛� 0 琛ㄧず涓嶄娇鐢� - record-assist-port: 0 - + record-assist-port: 18081 # [鍙�塢 鏃ュ織閰嶇疆, 涓�鑸笉闇�瑕佹敼 logging: file: @@ -82,9 +83,14 @@ user-settings: # 鎺ㄦ祦鐩存挱鏄惁褰曞埗 record-push-live: true + auto-apply-play: false # 鍦ㄧ嚎鏂囨。锛� swagger-ui锛堢敓浜х幆澧冨缓璁叧闂級 -springfox: - documentation: - swagger-ui: - enabled: true \ No newline at end of file +swagger-ui: + enabled: true + +# 鐗堟湰淇℃伅锛� 涓嶉渶淇敼 +version: + version: "@project.version@" + description: "@project.description@" + artifact-id: "@project.artifactId@" -- Gitblit v1.8.0