From 22e1d92a9d8ae6aa257889f882722b8e48648abc Mon Sep 17 00:00:00 2001 From: mk1990 <37614016+mk1990@users.noreply.github.com> Date: 星期一, 18 四月 2022 09:32:20 +0800 Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 --- src/main/resources/all-application.yml | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml index d814459..3f148d6 100644 --- a/src/main/resources/all-application.yml +++ b/src/main/resources/all-application.yml @@ -1,7 +1,7 @@ -# 姝ら厤缃枃浠跺彧鏄敤浣滃睍绀烘墍鏈夐厤缃」锛� 涓嶅彲涓嶇洿鎺ヤ娇鐢� +# 姝ら厤缃枃浠跺彧鏄敤浣滃睍绀烘墍鏈夐厤缃」锛� 涓嶅彲鐩存帴浣跨敤 spring: @@ -147,7 +147,7 @@ rtp: # [鍙�塢 鏄惁鍚敤澶氱鍙fā寮�, 寮�鍚悗浼氬湪portRange鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈� enable: true - # [鍙�塢 鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�, + # [鍙�塢 鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�, 蹇呴』鎻愬墠鍦▃lm涓婇厤缃灞炴�э紝涓嶇劧鑷姩閰嶇疆姝ゅ睘鎬у彲鑳戒笉鎴愬姛 port-range: 30000,30500 # 绔彛鑼冨洿 # [鍙�塢 鍥芥爣绾ц仈鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鍙戦�佸獟浣撴祦, send-port-range: 30000,30500 # 绔彛鑼冨洿 @@ -170,8 +170,8 @@ save-position-history: false # 鐐规挱绛夊緟瓒呮椂鏃堕棿,鍗曚綅锛氭绉� play-timeout: 3000 - # 绛夊緟闊宠棰戠紪鐮佷俊鎭啀杩斿洖锛� true锛� 鍙互鏍规嵁缂栫爜閫夋嫨鍚堥�傜殑鎾斁鍣紝false锛� 鍙互鏇村揩鐐规挱 - wait-track: false + # 涓婄骇鐐规挱绛夊緟瓒呮椂鏃堕棿,鍗曚綅锛氭绉� + platform-play-timeout: 60000 # 鏄惁寮�鍚帴鍙i壌鏉� interface-authentication: true # 鑷姩閰嶇疆redis 鍙互杩囨湡浜嬩欢 @@ -186,7 +186,7 @@ # 鏄惁灏嗘棩蹇楀瓨鍌ㄨ繘鏁版嵁搴� logInDatebase: true # 绗笁鏂瑰尮閰嶏紝鐢ㄤ簬浠巗tream閽熻幏鍙栨湁鏁堜俊鎭� - thirdPartyGBIdReg: [\s\S]* + thirdPartyGBIdReg: "[\\s\\S]*" # 鍦ㄧ嚎鏂囨。锛� swagger-ui锛堢敓浜х幆澧冨缓璁叧闂級 swagger-ui: -- Gitblit v1.8.0