From a39807064a500875d89bc46edcd2d0b3654575a9 Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期三, 24 七月 2024 15:14:46 +0800 Subject: [PATCH] 取水口日取水量漏损(历史) 取水口日取水量漏损(最新) 修改控制器报警与状态查询的排序、 修改农户日用水量统计的排序、日期类型 重构代码放置结构 --- pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 44 insertions(+), 4 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 f0ec3ac..1490364 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml @@ -74,12 +74,13 @@ global: dev: true #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О - accMw: - commandCallback: http://127.0.0.1:8079/remote/rtu/comCallback + mw: webPort: 8070 actutorPort: 9070 idSuffix: 0 sso: + cacheMaximumSize: 10000 #鐧诲綍鐢ㄦ埛缂撳瓨鍙紦瀛樼敤鎴风殑鏈�澶у�� + cacheDuration: 720 #缂撳瓨鐧诲綍鐢ㄦ埛鍙戝憜鏈�澶ф椂闀匡紙鍒嗛挓锛� checkUrl: http://127.0.0.1:8079/sso/sso/ssoCheck webPort: 8079 actutorPort: 9079 @@ -116,11 +117,50 @@ webPort: 8086 actutorPort: 9086 idSuffix: 8 - + wechat: + webPort: 8087 + actutorPort: 9087 + idSuffix: 9 + app: + webPort: 8088 + actutorPort: 9088 + idSuffix: 10 #椤圭洰缂栧彿 #projectCode: # ym: 100 # pj: 101 +#椤圭洰閰嶇疆 +project: + #椤圭洰缂栫爜 + projectNo: 10 + #鎺у埗鍣ㄧ被鍨� + controllerType: 57 + + #閫氳鍗忚 -#protocol: DYJS_2023,DYJS_2024 \ No newline at end of file +#protocol: DYJS_2023,DYJS_2024 +mw: + #鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О) + ym: + comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send" + sp: + comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send" + #鐩戞祴鎺у埗妯″潡鍥炶皟鍦板潃 + rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive" + #寰俊灏忕▼搴忓洖璋冨湴鍧� + rtuCallbackUrl_wx: "http://127.0.0.1:8087/wx/comRes/receive" + +#涓嶈繘琛寀serToken杩囨护鐨刄RL锛孈ConfigurationProperties瑕佹眰tokennofilter涓墍鏈夊瓧姣嶉兘灏忓啓 +tokennofilter: + urls: + - /sso/sso + - /remote/comRes/receive + - /wx/comRes/receive +#鑷姩缁熻閰嶇疆 +auto-statistics: + #鏈堢粺璁� + month: + startDay: 1 + startHour: 0 + startMinute: 5 -- Gitblit v1.8.0