From b17449e66cc31e5eeb3202605e837001ef2f4b6d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 29 十一月 2024 11:58:19 +0800
Subject: [PATCH] 与通信中间件通信配置内容优化及修改，相应有备份配置文件也做了修改
---
/dev/null | 386 ------------------------------------------------
pipIrr-platform/pipIrr-global/src/main/resources/application-global(ym元谋系统).yml | 14 -
pipIrr-platform/pipIrr-global/src/main/resources/application-global(test测试系统).yml | 14 -
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-global(sp沙盘系统).yml | 14 -
5 files changed, 13 insertions(+), 417 deletions(-)
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050sp\346\262\231\347\233\230\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050sp\346\262\231\347\233\230\347\263\273\347\273\237\051.yml"
index a369ae8..0ca5332 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050sp\346\262\231\347\233\230\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050sp\346\262\231\347\233\230\347\263\273\347\273\237\051.yml"
@@ -310,22 +310,16 @@
#閫氳涓棿浠剁浉鍏抽厤缃�
#protocol: DYJS_2023,DYJS_2024
mw:
- #鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О)
+ #鍛戒护鍙戦�侀�氫俊涓棿浠跺湴鍧�
ym:
+ url: "http://127.0.0.1:8070"
comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
- ugTaskSendUrl: "http://127.0.0.1:8070/rtuMw/com/upgradeRtu"
- rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
- rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
sp:
+ url: "http://127.0.0.1:8073"
comSendUrl: "http://127.0.0.1:8073/rtuMw/com/send"
- ugTaskSendUrl: "http://127.0.0.1:8073/rtuMw/com/upgradeRtu"
- rtuLogFileUrl: "http://127.0.0.1:8073/rtuMw/com/rtuLogFile"
- rtuLogTextUrl: "http://127.0.0.1:8073/rtuMw/com/rtuLogText"
test:
+ url: "http://127.0.0.1:8072"
comSendUrl: "http://127.0.0.1:8072/rtuMw/com/send"
- ugTaskSendUrl: "http://127.0.0.1:8072/rtuMw/com/upgradeRtu"
- rtuLogFileUrl: "http://127.0.0.1:8072/rtuMw/com/rtuLogFile"
- rtuLogTextUrl: "http://127.0.0.1:8072/rtuMw/com/rtuLogText"
#鐩戞祴鎺у埗妯″潡鍥炶皟鍦板潃
rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
#rtu杩滅▼鍗囩骇妯″潡鍥炶皟鍦板潃
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
index 7b529cc..a74a259 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
@@ -310,22 +310,16 @@
#閫氳涓棿浠剁浉鍏抽厤缃�
#protocol: DYJS_2023,DYJS_2024
mw:
- #鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О)
+ #鍛戒护鍙戦�侀�氫俊涓棿浠跺湴鍧�
ym:
+ url: "http://127.0.0.1:8070"
comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
- ugTaskSendUrl: "http://127.0.0.1:8070/rtuMw/com/upgradeRtu"
- rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
- rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
sp:
+ url: "http://127.0.0.1:8073"
comSendUrl: "http://127.0.0.1:8073/rtuMw/com/send"
- ugTaskSendUrl: "http://127.0.0.1:8073/rtuMw/com/upgradeRtu"
- rtuLogFileUrl: "http://127.0.0.1:8073/rtuMw/com/rtuLogFile"
- rtuLogTextUrl: "http://127.0.0.1:8073/rtuMw/com/rtuLogText"
test:
+ url: "http://127.0.0.1:8072"
comSendUrl: "http://127.0.0.1:8072/rtuMw/com/send"
- ugTaskSendUrl: "http://127.0.0.1:8072/rtuMw/com/upgradeRtu"
- rtuLogFileUrl: "http://127.0.0.1:8072/rtuMw/com/rtuLogFile"
- rtuLogTextUrl: "http://127.0.0.1:8072/rtuMw/com/rtuLogText"
#鐩戞祴鎺у埗妯″潡鍥炶皟鍦板潃
rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
#rtu杩滅▼鍗囩骇妯″潡鍥炶皟鍦板潃
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml"
index 5e8b483..e7a60d0 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml"
@@ -310,22 +310,16 @@
#閫氳涓棿浠剁浉鍏抽厤缃�
#protocol: DYJS_2023,DYJS_2024
mw:
- #鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О)
+ #鍛戒护鍙戦�侀�氫俊涓棿浠跺湴鍧�
ym:
+ url: "http://127.0.0.1:8070"
comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
- ugTaskSendUrl: "http://127.0.0.1:8070/rtuMw/com/upgradeRtu"
- rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
- rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
sp:
+ url: "http://127.0.0.1:8073"
comSendUrl: "http://127.0.0.1:8073/rtuMw/com/send"
- ugTaskSendUrl: "http://127.0.0.1:8073/rtuMw/com/upgradeRtu"
- rtuLogFileUrl: "http://127.0.0.1:8073/rtuMw/com/rtuLogFile"
- rtuLogTextUrl: "http://127.0.0.1:8073/rtuMw/com/rtuLogText"
test:
+ url: "http://127.0.0.1:8072"
comSendUrl: "http://127.0.0.1:8072/rtuMw/com/send"
- ugTaskSendUrl: "http://127.0.0.1:8072/rtuMw/com/upgradeRtu"
- rtuLogFileUrl: "http://127.0.0.1:8072/rtuMw/com/rtuLogFile"
- rtuLogTextUrl: "http://127.0.0.1:8072/rtuMw/com/rtuLogText"
#鐩戞祴鎺у埗妯″潡鍥炶皟鍦板潃
rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
#rtu杩滅▼鍗囩骇妯″潡鍥炶皟鍦板潃
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050\345\274\200\345\217\221\346\265\213\350\257\225---166PC\346\234\272\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050\345\274\200\345\217\221\346\265\213\350\257\225---166PC\346\234\272\051.yml"
deleted file mode 100644
index ab8092d..0000000
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050\345\274\200\345\217\221\346\265\213\350\257\225---166PC\346\234\272\051.yml"
+++ /dev/null
@@ -1,386 +0,0 @@
-spring:
- servlet:
- multipart:
- # 鍓嶇涓婁紶鏂囦欢锛岄檺鍒跺崟涓枃浠剁殑澶у皬鍜岄檺鍒舵墍鏈夋枃浠剁殑澶у皬
- max-file-size: 500MB
- max-request-size: 5000MB
-logging:
- charset:
- console: UTF-8
- config:
- classpath: log4j2.yml
-#绂佺敤鐧芥爣閿欒椤甸潰
-server:
- error:
- whitelabel:
- enabled: false
- #servlet閰嶇疆
- servlet:
- encoding:
- #鍙栨秷榛樿鐨勫瓧绗﹂泦缂栫爜
- enabled: true
- #璁剧疆寮哄埗浣跨敤鎸囧畾瀛楃缂栫爜闆�
- force: true
- #浣跨敤鐨勫瓧绗︾紪鐮�
- charset: utf-8
-# actuator閰嶇疆锛屽厛include浜嗗叏閮紝鐒跺悗鍐峞xclude鎸囧畾鐨別ndpoint
-management:
- endpoints:
- web:
- exposure:
- include: '*'
- #exclude: beans
- .shutdown:
- enabled: true #鏄惁寮�鍚�/actuator/shutdown
-
-# SpringDoc-OpenApi 閰嶇疆
-springdoc:
- swagger-ui:
- #搴旂敤actuator鏃讹紝璁块棶: http://[IP]:[port]/actuator/swagger-ui/index.html 渚嬪http://127.0.0.1:9080/actuator/swagger-ui/index.html
- #鏈敤actuator鏃讹紝璁块棶: http://[IP]:[port]/[context]/swagger-ui/index.html 渚嬪http://127.0.0.1:8080/[瀛愮郴缁熶笂涓嬫枃锛坆ase锛塢/swagger-ui/index.html
- path: /swagger-ui
- operationsSorter: method # HTTP 鏂规硶鎺掑簭
- tagsSorter: alpha # API 鎺掑簭
- api-docs:
- path: /v3/apiDocs
- groups:
- enabled: true
- show-actuator: true #鍦╝ctuator閰嶇疆鐨勭鍙ｅ強涓婁笅鏂囦腑璁块棶 SpringDoc-OpenApi
- use-management-port: true #搴旂敤actuator閰嶇疆鐨勭鍙ｏ紝浣嗕笂闈㈢殑swagger-ui:path鍙細閲囩敤榛樿鍊約wagger-ui
- packages-to-scan: com.dy
- #paths-to-match: /sys/**, /demo/**, /**
- paths-to-match: /**
- web:
- title: 澶х鑺傛按绠＄亴鐩戞帶绯荤粺API
- description: 澶х鑺傛按绠＄亴鐩戞帶绯荤粺鏈嶅姟绔� Restfull API
- version: v1.0.0
- license-name: 澶х鑺傛按鐮旂┒闄�
-
-#MybatisPlus 閰嶇疆鏃ュ織鏄剧ず鎵цSQL
-mybatis-plus:
- #鍖归厤sql璇彞鐨勬槧灏勬枃浠剁殑浣嶇疆锛宑lasspath浠ｈ〃鍦╮esources涓�
- mapper-locations: classpath:mapper/*.xml
- #浠ヤ笅涓や釜閰嶇疆鍙互鐪佺暐锛屽湪mapper鏄犲皠鏂囦欢涓厤缃�淍Mapper鈥濅篃鏄彲浠ョ殑銆�
- #浣跨敤type-aliases-package涓寚瀹歟ntity鎵弿鍖呰矾寰勶紝璁﹎ybatis鑷姩鎵弿鑷畾涔夌殑entity
- #type-aliases-package: com.dy.pipIrrGlobal.daoBa
- configuration:
- #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #鏃惰�岃緭鍑烘棩蹇楋紝鏃惰�屼笉杈撳嚭鏃ュ織
- log-impl: org.apache.ibatis.logging.log4j2.Log4j2Impl
- #寮�鍚┘宄皍Name鑷姩鏄犲皠鍒皍_name
- #2023-10-24缁忓疄楠岋紝涓嬮潰閰嶇疆true鎴杅alse锛岄兘鑳戒粠u_name鏄犲皠鍒皍Name
- #map-underscore-to-camel-case: true
- lazyLoadingEnabled: true # 寮�鍚欢鏃跺姞杞藉紑鍏�
- aggressiveLazyLoading: false # 灏嗙Н鏋佸姞杞芥敼涓烘秷鏋佸姞杞斤紙鍗虫寜闇�鍔犺浇锛夛紝榛樿鍊兼槸false
- lazy-load-trigger-methods: "" # 闃绘尅涓嶇浉骞茬殑鎿嶄綔瑙﹀彂锛屽疄鐜版噿鍔犺浇
- cache-enabled: true #鎵撳紑鍏ㄥ眬缂撳瓨寮�鍏筹紙浜岀骇鐜锛夛紝榛樿鍊兼槸true
- default-enum-type-handler: com.dy.common.mybatis.envm.EnumCodeTypeHandler
-
-pipIrr:
- global:
- dev: true #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
- dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
- nginx:
- webPort: 54321
- mw:
- webPort: 8070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
- actutorPort: 9070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
- idSuffix: 0
- sso:
- cacheMaximumSize: 10000 #鐧诲綍鐢ㄦ埛缂撳瓨鍙紦瀛樼敤鎴风殑鏈�澶у��
- cacheDuration: 720 #缂撳瓨鐧诲綍鐢ㄦ埛鍙戝憜鏈�澶ф椂闀匡紙鍒嗛挓锛�
- checkUrl: http://127.0.0.1:8079/sso/sso/ssoCheck
- webPort: 8079
- actutorPort: 9079
- idSuffix: 1
- base:
- webPort: 8080
- actutorPort: 9080
- idSuffix: 2
- remote:
- webPort: 8081
- actutorPort: 9081
- idSuffix: 3
- statistics:
- webPort: 8082
- actutorPort: 9082
- idSuffix: 4
- gis:
- webPort: 8083
- actutorPort: 9083
- idSuffix: 5
- demo:
- webPort: 8000
- actutorPort: 9000
- idSuffix: 99
- sell:
- webPort: 8084
- actutorPort: 9084
- idSuffix: 6
- project:
- webPort: 8085
- actutorPort: 9085
- idSuffix: 7
- irrigate:
- webPort: 8086
- actutorPort: 9086
- idSuffix: 8
- wechat:
- webPort: 8087
- actutorPort: 9087
- idSuffix: 9
- app:
- webPort: 8088
- actutorPort: 9088
- idSuffix: 10
- operation:
- webPort: 8089
- actutorPort: 9089
- idSuffix: 11
-
-
- file:
- idSuffix: 99
- file1:
- webPort: 8180
- actutorPort: 9180
- file2:
- webPort: 8180
- actutorPort: 9180
- file3:
- webPort: 8180
- actutorPort: 9180
- file4:
- webPort: 8180
- actutorPort: 9180
- file5:
- webPort: 8180
- actutorPort: 9180
- file6:
- webPort: 8180
- actutorPort: 9180
- file7:
- webPort: 8180
- actutorPort: 9180
- file8:
- webPort: 8180
- actutorPort: 9180
- file9:
- webPort: 8180
- actutorPort: 9180
- file10:
- webPort: 8180
- actutorPort: 9180
- file11:
- webPort: 8180
- actutorPort: 9180
- file12:
- webPort: 8180
- actutorPort: 9180
-
-
-#web鍒嗗竷寮忔枃浠剁郴缁�
-dy:
- photoZipWidth: 400 #缂╃暐鍥惧昂瀵�
- webFile:
- fmUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
- supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗ｏ紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
- sv1:
- id: dyFile1
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
- relativePath: webFile1
- hashStart: 0
- hashEnd: 5461
- restUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file #file鏄笂涓嬫枃,ip涓哄眬鍩熺綉ip鎴栨湰鍦癐P
- webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
- webDownloadPath: http://127.0.0.1:${pipIrr.file1.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
- sv2:
- id: dyFile2
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
- relativePath: webFile2
- hashStart: 5462
- hashEnd: 10923
- restUrl: http://127.0.0.1:${pipIrr.file2.webPort}/file
- webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://127.0.0.1:${pipIrr.file2.webPort}/file/download/down?id=
- sv3:
- id: dyFile3
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
- relativePath: webFile3
- hashStart: 10924
- hashEnd: 16385
- restUrl: http://127.0.0.1:${pipIrr.file3.webPort}/file
- webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://127.0.0.1:${pipIrr.file3.webPort}/file/download/down?id=
- sv4:
- id: dyFile4
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
- relativePath: webFile4
- hashStart: 16386
- hashEnd: 21847
- restUrl: http://127.0.0.1:${pipIrr.file4.webPort}/file
- webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://127.0.0.1:${pipIrr.file4.webPort}/file/download/down?id=
- sv5:
- id: dyFile5
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
- relativePath: webFile5
- hashStart: 21848
- hashEnd: 27309
- restUrl: http://127.0.0.1:${pipIrr.file5.webPort}/file
- webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://127.0.0.1:${pipIrr.file5.webPort}/file/download/down?id=
- sv6:
- id: dyFile6
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
- relativePath: webFile6
- hashStart: 27310
- hashEnd: 32767
- restUrl: http://127.0.0.1:${pipIrr.file6.webPort}/file
- webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://127.0.0.1:${pipIrr.file6.webPort}/file/download/down?id=
- sv7:
- id: dyFile7
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
- relativePath: webFile7
- hashStart: 32768
- hashEnd: 38229
- restUrl: http://127.0.0.1:${pipIrr.file7.webPort}/file
- webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://127.0.0.1:${pipIrr.file7.webPort}/file/download/down?id=
- sv8:
- id: dyFile8
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
- relativePath: webFile8
- hashStart: 38230
- hashEnd: 43691
- restUrl: http://127.0.0.1:${pipIrr.file8.webPort}/file
- webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://127.0.0.1:${pipIrr.file8.webPort}/file/download/down?id=
- sv9:
- id: dyFile9
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
- relativePath: webFile9
- hashStart: 43692
- hashEnd: 49153
- restUrl: http://127.0.0.1:${pipIrr.file9.webPort}/file
- webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://127.0.0.1:${pipIrr.file9.webPort}/file/download/down?id=
- sv10:
- id: dyFile10
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
- relativePath: webFile10
- hashStart: 49154
- hashEnd: 54615
- restUrl: http://127.0.0.1:${pipIrr.file10.webPort}/file
- webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://127.0.0.1:${pipIrr.file10.webPort}/file/download/down?id=
- sv11:
- id: dyFile11
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
- relativePath: webFile11
- hashStart: 54616
- hashEnd: 60077
- restUrl: http://127.0.0.1:${pipIrr.file11.webPort}/file
- webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://127.0.0.1:${pipIrr.file11.webPort}/file/download/down?id=
- sv12:
- id: dyFile12
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
- relativePath: webFile12
- hashStart: 60078
- hashEnd: 65535
- restUrl: http://127.0.0.1:${pipIrr.file12.webPort}/file
- webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://127.0.0.1:${pipIrr.file12.webPort}/file/download/down?id=
-
-
-#椤圭洰缂栧彿
-#projectCode:
-# ym: 100
-# sp: 101
-
-#椤圭洰閰嶇疆
-project:
- #椤圭洰缂栫爜
- projectNo: 10
- #鎺у埗鍣ㄧ被鍨�
- controllerType: 57
- #榛樿琛屾斂鍖哄垝缂栫爜锛堝ぉ娲�-澶╂触甯�-姝︽竻鍖�-浜花宸ヤ笟鍥�-澶х鑺傛按锛�
- divisionCode: 120114403100
-
-
-#閫氳涓棿浠剁浉鍏抽厤缃�
-#protocol: DYJS_2023,DYJS_2024
-mw:
- #鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О)
- ym:
- comSendUrl: "http://192.168.40.166:8070/rtuMw/com/send"
- rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
- rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
- sp:
- comSendUrl: "http://127.0.0.1:8073/rtuMw/com/send"
- rtuLogFileUrl: "http://127.0.0.1:8073/rtuMw/com/rtuLogFile"
- rtuLogTextUrl: "http://127.0.0.1:8073/rtuMw/com/rtuLogText"
- test:
- comSendUrl: "http://127.0.0.1:8072/rtuMw/com/send"
- rtuLogFileUrl: "http://127.0.0.1:8072/rtuMw/com/rtuLogFile"
- rtuLogTextUrl: "http://127.0.0.1:8072/rtuMw/com/rtuLogText"
- #鐩戞祴鎺у埗妯″潡鍥炶皟鍦板潃
- 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
- - /app/captcha/get
- - /file/file #web鍒嗗竷寮忔枃浠剁郴缁�
- - /file/fm #web鍒嗗竷寮忔枃浠剁郴缁�
-
-#鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
-auto-statistics:
- startHour: 0 #寮�濮嬪皬鏃� 0
- startMinute: 5 #寮�濮嬪垎閽� 5
-
-#閽夐拤娑堟伅鎺ㄩ��
-dingtalk:
- ym:
- enable: true #鏄惁鍚敤
- robot:
- url: https://oapi.dingtalk.com/robot/send
- access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
- secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
- at-all: true
- mobile: 18602657034
- sp:
- enable: true #鏄惁鍚敤
- robot:
- url: https://oapi.dingtalk.com/robot/send
- access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
- secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
- at-all: true
- mobile: 18602657034
- test:
- enable: true #鏄惁鍚敤
- robot:
- url: https://oapi.dingtalk.com/robot/send
- access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
- secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
- at-all: true
- mobile: 18602657034
-
-#闃�鎺у櫒鍙傛暟
-rtu:
- batteryVolt: 17
- signalIntensity:
- weak: 10
- ordinary: 20
-# strong: 20
-
-#铏氭嫙鍗￠厤缃弬鏁�
-vc:
- #铏氭嫙鍗℃渶浣庝綑棰濇姤璀﹀��
- alarmValue: 10
\ No newline at end of file
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 c67fa0f..c037eec 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -310,7 +310,7 @@
#閫氳涓棿浠剁浉鍏抽厤缃�
#protocol: DYJS_2023,DYJS_2024
mw:
- #鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О)
+ #鍛戒护鍙戦�侀�氫俊涓棿浠跺湴鍧�
ym:
url: "http://127.0.0.1:8070"
comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
--
Gitblit v1.8.0