From c3d51f9ba3300b60261d13a5b0b4f7402bba0ee0 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 02 四月 2025 08:30:00 +0800
Subject: [PATCH] 修改轮灌组接口、分页获取轮灌组接口、获取全部轮灌组接口、获取轮灌组详情接口
---
pipIrr-platform/pipIrr-global/src/main/resources/application-global(166web文件花生壳).yml | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050166web\346\226\207\344\273\266\350\212\261\347\224\237\345\243\263\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050166web\346\226\207\344\273\266\350\212\261\347\224\237\345\243\263\051.yml"
index 0473a51..bc9864b 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050166web\346\226\207\344\273\266\350\212\261\347\224\237\345\243\263\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050166web\346\226\207\344\273\266\350\212\261\347\224\237\345\243\263\051.yml"
@@ -1,9 +1,16 @@
spring:
+ main:
+ allow-bean-definition-overriding: true #璁剧疆涓簍rue鏃讹紝鍚庡畾涔夌殑bean浼氳鐩栦箣鍓嶅畾涔夌殑鐩稿悓鍚嶇О鐨刡ean
servlet:
multipart:
# 鍓嶇涓婁紶鏂囦欢锛岄檺鍒跺崟涓枃浠剁殑澶у皬鍜岄檺鍒舵墍鏈夋枃浠剁殑澶у皬
max-file-size: 500MB
max-request-size: 5000MB
+ http:
+ client:
+ # spring restTemplate 瀵瑰http璁块棶鏃�
+ connect-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿
+ read-timeout: 3000 # 璇诲彇瓒呮椂鏃堕棿
logging:
charset:
console: UTF-8
@@ -326,20 +333,37 @@
mj:
url: "http://127.0.0.1:8071"
comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
- mq:
- url: "http://127.0.0.1:8100"
- comSendUrl: "http://127.0.0.1:8100/rtuMw/com/send"
sp:
url: "http://127.0.0.1:8073"
comSendUrl: "http://127.0.0.1:8073/rtuMw/com/send"
test:
url: "http://127.0.0.1:8072"
comSendUrl: "http://127.0.0.1:8072/rtuMw/com/send"
- #鐩戞祴鎺у埗妯″潡鍥炶皟鍦板潃
+ mq:
+ url: "http://127.0.0.1:8100"
+ comSendUrl: "http://127.0.0.1:8100/rtuMw/com/send"
+ yq:
+ url: "http://127.0.0.1:8101"
+ comSendUrl: "http://127.0.0.1:8101/rtuMw/com/send"
+ hlj:
+ url: "http://127.0.0.1:8102"
+ comSendUrl: "http://127.0.0.1:8102/rtuMw/com/send"
+ gz:
+ url: "http://127.0.0.1:8103"
+ comSendUrl: "http://127.0.0.1:8103/rtuMw/com/send"
+ lz:
+ url: "http://127.0.0.1:8104"
+ comSendUrl: "http://127.0.0.1:8104/rtuMw/com/send"
+ jc:
+ url: "http://127.0.0.1:8105"
+ comSendUrl: "http://127.0.0.1:8105/rtuMw/com/send"
+ #Rtu杩滅▼鍛戒护缁撴灉鍥炶皟鍦板潃
rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
- #rtu杩滅▼鍗囩骇妯″潡鍥炶皟鍦板潃
+ #鎺ユ敹閫氫俊涓棿浠舵秷鎭腑蹇冩秷鎭殑鍦板潃
+ mwMsCenterReceiveUrl_rm: "http://127.0.0.1:8081/remote/msCenter/receive"
+ #rtu杩滅▼鍗囩骇鐘舵�佷俊鎭洖璋冨湴鍧�
ugCallbackUrl_rm: "http://127.0.0.1:8081/remote/rtuUpgradeStateReceiver/receive"
- #寰俊灏忕▼搴忓洖璋冨湴鍧�
+ #寰俊灏忕▼搴忓簲鐢ㄤ腑Rtu杩滅▼鍛戒护缁撴灉鍥炶皟鍦板潃
rtuCallbackUrl_wx: "http://127.0.0.1:8087/wx/comRes/receive"
#涓嶈繘琛寀serToken杩囨护鐨刄RL锛孈ConfigurationProperties瑕佹眰tokennofilter涓墍鏈夊瓧姣嶉兘灏忓啓
@@ -347,7 +371,9 @@
urls:
- /sso/sso
- /remote/comRes/receive
+ - /remote/msCenter/receive
- /remote/rtuUpgradeStateReceiver/receive
+ - /remote/websocket
- /wx/comRes/receive
- /app/captcha/get
- /file/file #web鍒嗗竷寮忔枃浠剁郴缁�
--
Gitblit v1.8.0