From d0b51c6d6f2b7a530c0557b6279cc6dfced223cf Mon Sep 17 00:00:00 2001 From: zhubaomin <470473919@qq.com> Date: 星期日, 27 四月 2025 19:01:04 +0800 Subject: [PATCH] 各轮灌组开阀时间提前10分钟,第一组除外,改为配置文件设置 --- pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 194 +++++++++++++++++++++++++++++++++--------------- 1 files changed, 132 insertions(+), 62 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml index 52b898c..92e5bc3 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.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 @@ -81,12 +88,12 @@ dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О nginx: - root: E:/apps/pipIrr/nginx-1.27.0 + root: D:/apps/pipIrr/nginx-1.27.0 webPort: 54321 - webFilePort: 19913 + webFilePort: 64321 mw: - webPort: 8070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢� - actutorPort: 9070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢� + webPort: ${common.pipIrr_mw_webPort} #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢� + actutorPort: ${common.pipIrr_mw_actutorPort} #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢� idSuffix: 0 sso: cacheMaximumSize: 10000 #鐧诲綍鐢ㄦ埛缂撳瓨鍙紦瀛樼敤鎴风殑鏈�澶у�� @@ -190,107 +197,107 @@ dy: photoZipWidth: 400 #缂╃暐鍥惧昂瀵� webFile: - fmUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file # fm鐨剋eb涓婁笅鏂� URL + fmUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file # fm鐨剋eb涓婁笅鏂� URL supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗o紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷 sv1: id: dyFile1 - absolutePath: ${pipIrr.nginx.root}/html/webfiles/ #鎵�鏈塻v*鐨勫畨瑁呰矾寰勬渶濂戒竴鏍凤紝杩欐牱灏卞彲浠ョ粺涓�閰嶇疆浜� + absolutePath: ${pipIrr.nginx.root}/html/webfiles/ relativePath: webFile1 hashStart: 0 hashEnd: 5461 - restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file #file鏄笂涓嬫枃,ip涓哄眬鍩熺綉ip鎴栨湰鍦癐P - webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� - webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + restUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file #file鏄笂涓嬫枃,ip涓哄眬鍩熺綉ip鎴栨湰鍦癐P + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� sv2: id: dyFile2 - absolutePath: ${pipIrr.nginx.root}/html/webfiles/ #鎵�鏈塻v*鐨勫畨瑁呰矾寰勬渶濂戒竴鏍凤紝杩欐牱灏卞彲浠ョ粺涓�閰嶇疆浜� + absolutePath: ${pipIrr.nginx.root}/html/webfiles/ relativePath: webFile2 hashStart: 5462 hashEnd: 10923 - restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file - webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ - webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= + restUrl: http://127.0.0.1:${pipIrr.file2.webPort}/file + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� sv3: id: dyFile3 absolutePath: ${pipIrr.nginx.root}/html/webfiles/ relativePath: webFile3 hashStart: 10924 hashEnd: 16385 - restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file - webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ - webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= + restUrl: http://127.0.0.1:${pipIrr.file3.webPort}/file + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� sv4: id: dyFile4 absolutePath: ${pipIrr.nginx.root}/html/webfiles/ relativePath: webFile4 hashStart: 16386 hashEnd: 21847 - restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file - webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ - webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= + restUrl: http://127.0.0.1:${pipIrr.file4.webPort}/file + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� sv5: id: dyFile5 absolutePath: ${pipIrr.nginx.root}/html/webfiles/ relativePath: webFile5 hashStart: 21848 hashEnd: 27309 - restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file - webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ - webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= + restUrl: http://127.0.0.1:${pipIrr.file5.webPort}/file + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� sv6: id: dyFile6 absolutePath: ${pipIrr.nginx.root}/html/webfiles/ relativePath: webFile6 hashStart: 27310 hashEnd: 32767 - restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file - webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ - webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= + restUrl: http://127.0.0.1:${pipIrr.file6.webPort}/file + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� sv7: id: dyFile7 absolutePath: ${pipIrr.nginx.root}/html/webfiles/ relativePath: webFile7 hashStart: 32768 hashEnd: 38229 - restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file - webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ - webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= + restUrl: http://127.0.0.1:${pipIrr.file7.webPort}/file + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� sv8: id: dyFile8 absolutePath: ${pipIrr.nginx.root}/html/webfiles/ relativePath: webFile8 hashStart: 38230 hashEnd: 43691 - restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file - webUrl: http://no253541tf71.vicp.fun${pipIrr.nginx.webFilePort}/webfiles/ - webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= + restUrl: http://127.0.0.1:${pipIrr.file8.webPort}/file + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� sv9: id: dyFile9 absolutePath: ${pipIrr.nginx.root}/html/webfiles/ relativePath: webFile9 hashStart: 43692 hashEnd: 49153 - restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file - webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ - webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= + restUrl: http://127.0.0.1:${pipIrr.file9.webPort}/file + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� sv10: id: dyFile10 absolutePath: ${pipIrr.nginx.root}/html/webfiles/ relativePath: webFile10 hashStart: 49154 hashEnd: 54615 - restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file - webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ - webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= + restUrl: http://127.0.0.1:${pipIrr.file10.webPort}/file + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� sv11: id: dyFile11 absolutePath: ${pipIrr.nginx.root}/html/webfiles/ relativePath: webFile11 hashStart: 54616 hashEnd: 60077 - restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file - webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ - webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= + restUrl: http://127.0.0.1:${pipIrr.file11.webPort}/file + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� sv12: id: dyFile12 absolutePath: ${pipIrr.nginx.root}/html/webfiles/ @@ -298,8 +305,8 @@ hashStart: 60078 hashEnd: 65535 restUrl: http://127.0.0.1:${pipIrr.file12.webPort}/file - webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ - webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file12.webPort}/file/download/down?id= + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� #椤圭洰缂栧彿 #projectCode: @@ -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鍒嗗竷寮忔枃浠剁郴缁� @@ -361,7 +387,7 @@ #閽夐拤娑堟伅鎺ㄩ�� dingtalk: ym: - enable: true #鏄惁鍚敤 + enable: false #鏄惁鍚敤 robot: url: https://oapi.dingtalk.com/robot/send access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f @@ -369,15 +395,7 @@ at-all: true mobile: 18602657034 mj: - enable: true #鏄惁鍚敤 - robot: - url: https://oapi.dingtalk.com/robot/send - access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f - secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7 - at-all: true - mobile: 18602657034 - mq: - enable: true #鏄惁鍚敤 + enable: false #鏄惁鍚敤 robot: url: https://oapi.dingtalk.com/robot/send access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f @@ -385,7 +403,7 @@ at-all: true mobile: 18602657034 sp: - enable: true #鏄惁鍚敤 + enable: false #鏄惁鍚敤 robot: url: https://oapi.dingtalk.com/robot/send access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f @@ -393,7 +411,55 @@ at-all: true mobile: 18602657034 test: - enable: true #鏄惁鍚敤 + enable: false #鏄惁鍚敤 + robot: + url: https://oapi.dingtalk.com/robot/send + access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f + secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7 + at-all: true + mobile: 18602657034 + mq: + enable: false #鏄惁鍚敤 + robot: + url: https://oapi.dingtalk.com/robot/send + access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f + secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7 + at-all: true + mobile: 18602657034 + yq: + enable: false #鏄惁鍚敤 + robot: + url: https://oapi.dingtalk.com/robot/send + access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f + secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7 + at-all: true + mobile: 18602657034 + hlj: + enable: false #鏄惁鍚敤 + robot: + url: https://oapi.dingtalk.com/robot/send + access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f + secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7 + at-all: true + mobile: 18602657034 + gz: + enable: false #鏄惁鍚敤 + robot: + url: https://oapi.dingtalk.com/robot/send + access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f + secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7 + at-all: true + mobile: 18602657034 + lz: + enable: false #鏄惁鍚敤 + robot: + url: https://oapi.dingtalk.com/robot/send + access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f + secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7 + at-all: true + mobile: 18602657034 + jc: + enable: false #鏄惁鍚敤 robot: url: https://oapi.dingtalk.com/robot/send access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f @@ -403,7 +469,6 @@ #闃�鎺у櫒鍙傛暟 rtu: - batteryVolt: 17 signalIntensity: weak: 10 ordinary: 20 @@ -412,4 +477,9 @@ #铏氭嫙鍗¢厤缃弬鏁� vc: #铏氭嫙鍗℃渶浣庝綑棰濇姤璀﹀�� - alarmValue: 10 \ No newline at end of file + alarmValue: 10 + +#杞亴閰嶇疆 +rotation: + #杞亴缁勬彁鍓嶅紑闃�鏃堕棿 + preOpeningTime: 10 \ No newline at end of file -- Gitblit v1.8.0