From 427d87e5572d72d0e3aaa4364e4f53569222e321 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 25 三月 2025 21:40:05 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/resources/log4j2.xml | 31
pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml | 15
pipIrr-platform/文档/SaaS/端口、IP、标签配置.docx | 0
pipIrr-platform/pipIrr-global/src/main/resources/application-database-hlj.yml | 69
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application(233服务器).yml | 4
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application(233服务器).yml | 4
pipIrr-platform/pipIrr-global/src/main/resources/application-global(166web文件花生壳).yml | 23
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application(233服务器).yml | 4
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/msCenter/TestMsResource.java | 6
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/.gitattributes | 2
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/resources/config.xml | 21
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_83_Up.java | 37
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application-self.yml | 29
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config(lz凉州).xml | 167 +
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application(121服务器).yml | 4
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/AdapterImp_HttpUnit.java | 26
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/.mvn/wrapper/maven-wrapper.properties | 19
pipIrr-platform/pipIrr-global/src/main/resources/init-config(121服务器).xml | 384 ++++
pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application(233服务器).yml | 4
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml | 19
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/BjnlCommon.java | 21
pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application(233服务器).yml | 4
pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application-self.yml | 12
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml | 4
pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application-self.yml | 12
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml | 15
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config(jc金川).xml | 167 +
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/Result.java | 15
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/PipIrrMwRtu3rdApplication.java | 71
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Up.java | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-common-mw.yml | 30
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application(233服务器).yml | 4
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config(gz甘州).xml | 167 +
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/largeScreen/WebSocketHeartBeat.java | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 143 +
pipIrr-platform/pipIrr-global/src/main/resources/application-database-jc.yml | 69
pipIrr-platform/pipIrr-global/src/main/resources/application-database-lz.yml | 69
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application(121服务器).yml | 4
pipIrr-platform/pipIrr-global/src/main/resources/application-common-web.yml | 4
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/ParamProtocol.java | 14
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/TcpHandler.java | 90 +
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application-self.yml | 12
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/mvnw | 259 ++
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/XjnkProtocol.java | 13
pipIrr-platform/pipIrr-mw/pom.xml | 2
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/Worker.java | 127 +
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application(233服务器).yml | 4
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/mvnw.cmd | 149 +
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java | 15
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/TcpClUnitAdapter.java | 14
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/HttpUnit.java | 63
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java | 6
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/ServerProperties.java | 13
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application(121服务器).yml | 4
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/.gitignore | 34
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application(233服务器).yml | 4
pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/log4j2.xml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application(233服务器).yml | 4
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/BjnlProtocol.java | 25
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application.yml | 17
pipIrr-platform/文档/第三方平台接口/新疆农垦学院/一出二恒压电动阀门对接协议.pdf | 0
pipIrr-platform/pipIrr-global/src/main/resources/application-common-web(121服务器).yml | 4
pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application(121服务器).yml | 4
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/test/java/com/dy/rtuMw3rd/PipIrrMwRtu3rdApplicationTests.java | 13
pipIrr-platform/文档/第三方平台接口/北京市农林科学院智能装备技术研究中心/说明--刘润玉.docx | 0
pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/application.yml | 4
pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application(121服务器).yml | 4
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java | 36
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/NetDataCodecFactory.java | 40
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd93_A3Vo.java | 8
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml | 3
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/NetDataDecoder.java | 92 +
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application.yml | 17
pipIrr-platform/pipIrr-global/src/main/resources/application-database(开发测试---单数据库).yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-database-gz.yml | 69
pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/resources/application.yml | 4
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/ParamLogin.java | 14
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/accessToken/Res4AccessTokenVo.java | 17
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application(121服务器).yml | 4
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/AdapterImp_TcpClUnit.java | 24
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application-self.yml | 17
pipIrr-platform/文档/第三方平台接口/新疆农垦学院/三生云接口文档.pdf | 0
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application.yml | 6
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application(121服务器).yml | 4
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application(121服务器).yml | 4
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application-self.yml | 22
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application(233服务器).yml | 4
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/largeScreen/WebSocketServer.java | 4
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/msCenter/CenterMsReceiveCtrl.java | 2
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/ParamAuth.java | 13
pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application-self.yml | 12
pipIrr-platform/pipIrr-global/src/main/resources/application-common-web(233服务器).yml | 4
pipIrr-platform/文档/第三方平台接口/北京市农林科学院智能装备技术研究中心/物联网共享数据标准接口文档1.4.0.pdf | 0
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config(hlj黑龙江).xml | 167 +
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/ResStatus.java | 17
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/HttpCallback.java | 10
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/statusPush/ControllerStatusVo.java | 49
pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpOpenCloseValve.java | 4
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java | 9
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/Worker.java | 218 ++
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml | 15
pipIrr-platform/pipIrr-global/src/main/resources/application-database.yml | 4
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/TcpConnect.java | 83
pipIrr-platform/pipIrr-global/src/main/resources/init-config(233服务器).xml | 321 +++
pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application(121服务器).yml | 4
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Down.java | 6
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/ResProtocol.java | 14
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/XjnkResVo.java | 14
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application-self.yml | 17
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/deal/XjnkDealer.java | 31
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application(233服务器).yml | 4
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml | 15
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application(121服务器).yml | 4
pipIrr-platform/文档/第三方平台接口/温州瑞新/说明--刘润玉.docx | 0
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config(yq延庆).xml | 167 +
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml | 36
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/mainController/MainControllerVo.java | 21
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml | 31
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/controller/ControllerVo.java | 21
pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application(233服务器).yml | 4
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application-self.yml | 12
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/TcpClUnitConfigVo.java | 18
pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/config.xml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application(121服务器).yml | 4
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/HttpsRq.java | 63
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java | 57
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/HttpUnitConfigVo.java | 16
pipIrr-platform/文档/第三方平台接口/新疆农垦学院/说明--刘润玉.docx | 0
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application-self.yml | 12
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application-self.yml | 12
pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application.yml | 15
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application-self.yml | 12
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/HttpUnitAdapter.java | 13
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application.yml | 19
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/TcpClUnit.java | 102 +
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java | 16
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application(121服务器).yml | 4
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/HttpSvCtrl.java | 35
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application-self.yml | 31
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/NetDataEncoder.java | 31
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application(233服务器).yml | 4
/dev/null | 17
pipIrr-platform/pipIrr-global/src/main/resources/application-database-yq.yml | 69
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application(121服务器).yml | 4
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/Server.java | 135 +
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/deal/BjnlDealer.java | 27
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml | 25
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/resources/application.yml | 16
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/pom.xml | 187 ++
pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml | 15
151 files changed, 4,888 insertions(+), 378 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java
index 5a9f2bc..1f722b4 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java
@@ -116,20 +116,26 @@
short index = ProtocolConstantV206V1.dataIndex + 1 ;
//绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99999999.99锛屽崟浣嶄负m3銆�
- int tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 4) ;
- cdData.totalAmount = tpInt/100.0 ;
+ long tpLong = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
+ cdData.totalAmount = tpLong/100.0 ;
index += 5 ;
//鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�8瀛楄妭浣庝綅鍦ㄥ墠楂樹綅鍦ㄥ悗銆�
+ if(ByteUtil.bytesIsAll0xFF(bs, index, 8)){
+ throw new Exception("IC鍗″彿鏁版嵁鏍煎紡閿欒锛�8瀛楄妭鍏ㄩ儴涓�0xFF锛岃垗寮冩暟鎹�") ;
+ }
cdData.icCardNo = GlParse.parseIcCardNo(bs, index) ;
index += 8 ;
//IC鍗″彿鏍煎紡锛�4瀛楄妭HEX鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
+ if(ByteUtil.bytesIsAll0xFF(bs, index, 4)){
+ throw new Exception("IC鍦板潃鏁版嵁鏍煎紡閿欒锛�4瀛楄妭鍏ㄩ儴涓�0xFF锛岃垗寮冩暟鎹�") ;
+ }
cdData.icCardAddr = ByteUtil.bytes2Hex_LE(bs, false, index, 4) ;
index += 4 ;
//鐢ㄦ按鎴蜂綑棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
+ int tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
cdData.remainMoney = tpInt/100.0 ;
index += 4 ;
@@ -154,21 +160,27 @@
short index = ProtocolConstantV206V1.dataIndex + 1 ;
//绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
- int tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 4) ;
- cdData.totalAmount = tpInt/100.0 ;
+ long tpLong = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
+ cdData.totalAmount = tpLong/100.0 ;
index += 5 ;
//鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�8瀛楄妭浣庝綅鍦ㄥ墠楂樹綅鍦ㄥ悗銆�
+ if(ByteUtil.bytesIsAll0xFF(bs, index, 8)){
+ throw new Exception("IC鍗″彿鏁版嵁鏍煎紡閿欒锛�8瀛楄妭鍏ㄩ儴涓�0xFF锛岃垗寮冩暟鎹�") ;
+ }
cdData.icCardNo = GlParse.parseIcCardNo(bs, index) ;
index += 8 ;
//IC鍗″彿鏍煎紡锛�4瀛楄妭HEX鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
+ if(ByteUtil.bytesIsAll0xFF(bs, index, 4)){
+ throw new Exception("IC鍦板潃鏁版嵁鏍煎紡閿欒锛�4瀛楄妭鍏ㄩ儴涓�0xFF锛岃垗寮冩暟鎹�") ;
+ }
cdData.icCardAddr = ByteUtil.bytes2Hex_LE(bs, false, index, 4) ;
index += 4 ;
//鐢ㄦ按鎴蜂綑棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
- cdData.remainMoney = tpInt/100.0 ;
+ tpLong = ByteUtil.BCD2Long_LE(bs, index, index + 3) ;
+ cdData.remainMoney = tpLong/100.0 ;
index += 4 ;
//鐢ㄦ按鎴风敤姘村紑濮嬫椂闂达細6瀛楄妭BCD鐮侊紝椤哄簭鏄勾鏈堟棩鏃跺垎绉掞紝鍏朵腑鍏厓骞�=2000+骞淬��
@@ -180,17 +192,17 @@
index += 6 ;
//鐢ㄦ按鎴锋湰娆＄敤姘撮噺锛氱疮璁℃祦閲�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 4) ;
- cdData.thisAmount = tpInt/100.0 ;
+ tpLong = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
+ cdData.thisAmount = tpLong/100.0 ;
index += 5 ;
//鐢ㄦ按鎴锋湰娆℃秷璐归噾棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
- cdData.thisMoney = tpInt/100.0 ;
+ tpLong = ByteUtil.BCD2Long_LE(bs, index, index + 3) ;
+ cdData.thisMoney = tpLong/100.0 ;
index += 4 ;
//鐢ㄦ按鎴锋湰娆＄敤姘存椂闀匡細鐢ㄦ按鏃堕暱2瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999锛屽崟浣嶄负鍒嗛挓銆�
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
+ int tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
cdData.thisTime = tpInt;
index += 2 ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_83_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_83_Up.java
index 1b8ec30..1ea1bc0 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_83_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_83_Up.java
@@ -116,20 +116,25 @@
short index = ProtocolConstantV206V2.dataIndex + 1 ;
//绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99999999.99锛屽崟浣嶄负m3銆�
- int tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 4) ;
- cdData.totalAmount = tpInt/100.0 ;
+ long tpLong = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
+ cdData.totalAmount = tpLong/100.0 ;
index += 5 ;
//鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�8瀛楄妭浣庝綅鍦ㄥ墠楂樹綅鍦ㄥ悗銆�
- cdData.icCardNo = GlParse.parseIcCardNo(bs, index) ;
+ if(ByteUtil.bytesIsAll0xFF(bs, index, 8)){
+ throw new Exception("IC鍗″彿鏁版嵁鏍煎紡閿欒锛�8瀛楄妭鍏ㄩ儴涓�0xFF锛岃垗寮冩暟鎹�") ;
+ }cdData.icCardNo = GlParse.parseIcCardNo(bs, index) ;
index += 8 ;
//IC鍗″彿鏍煎紡锛�4瀛楄妭HEX鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
+ if(ByteUtil.bytesIsAll0xFF(bs, index, 4)){
+ throw new Exception("IC鍦板潃鏁版嵁鏍煎紡閿欒锛�4瀛楄妭鍏ㄩ儴涓�0xFF锛岃垗寮冩暟鎹�") ;
+ }
cdData.icCardAddr = ByteUtil.bytes2Hex_LE(bs, false, index, 4) ;
index += 4 ;
//鐢ㄦ按鎴蜂綑棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
+ int tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
cdData.remainMoney = tpInt/100.0 ;
index += 4 ;
@@ -154,21 +159,27 @@
short index = ProtocolConstantV206V2.dataIndex + 1 ;
//绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
- int tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 4) ;
- cdData.totalAmount = tpInt/100.0 ;
+ long tpLong = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
+ cdData.totalAmount = tpLong/100.0 ;
index += 5 ;
//鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�8瀛楄妭浣庝綅鍦ㄥ墠楂樹綅鍦ㄥ悗銆�
+ if(ByteUtil.bytesIsAll0xFF(bs, index, 8)){
+ throw new Exception("IC鍗″彿鏁版嵁鏍煎紡閿欒锛�8瀛楄妭鍏ㄩ儴涓�0xFF锛岃垗寮冩暟鎹�") ;
+ }
cdData.icCardNo = GlParse.parseIcCardNo(bs, index) ;
index += 8 ;
//IC鍗″彿鏍煎紡锛�4瀛楄妭HEX鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
+ if(ByteUtil.bytesIsAll0xFF(bs, index, 4)){
+ throw new Exception("IC鍦板潃鏁版嵁鏍煎紡閿欒锛�4瀛楄妭鍏ㄩ儴涓�0xFF锛岃垗寮冩暟鎹�") ;
+ }
cdData.icCardAddr = ByteUtil.bytes2Hex_LE(bs, false, index, 4) ;
index += 4 ;
//鐢ㄦ按鎴蜂綑棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
- cdData.remainMoney = tpInt/100.0 ;
+ tpLong = ByteUtil.BCD2Long_LE(bs, index, index + 3) ;
+ cdData.remainMoney = tpLong/100.0 ;
index += 4 ;
//鐢ㄦ按鎴风敤姘村紑濮嬫椂闂达細6瀛楄妭BCD鐮侊紝椤哄簭鏄勾鏈堟棩鏃跺垎绉掞紝鍏朵腑鍏厓骞�=2000+骞淬��
@@ -180,17 +191,17 @@
index += 6 ;
//鐢ㄦ按鎴锋湰娆＄敤姘撮噺锛氱疮璁℃祦閲�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 4) ;
- cdData.thisAmount = tpInt/100.0 ;
+ tpLong = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
+ cdData.thisAmount = tpLong/100.0 ;
index += 5 ;
//鐢ㄦ按鎴锋湰娆℃秷璐归噾棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
- cdData.thisMoney = tpInt/100.0 ;
+ tpLong = ByteUtil.BCD2Long_LE(bs, index, index + 3) ;
+ cdData.thisMoney = tpLong/100.0 ;
index += 4 ;
//鐢ㄦ按鎴锋湰娆＄敤姘存椂闀匡細鐢ㄦ按鏃堕暱2瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999锛屽崟浣嶄负鍒嗛挓銆�
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
+ int tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
cdData.thisTime = tpInt;
index += 2 ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java
index ac6a41c..1e71d09 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java
@@ -270,6 +270,24 @@
};
}
/**
+ * 0x01锛氬埛鍗″紑闃� => p206V1 1
+ * 0x02锛氫腑蹇冪珯寮�闃� => p206V1 3
+ * 0x08锛氱敤鎴稟pp杩滅▼寮�闃� => p206V1 3
+ * 0x0B锛氬贰妫�鍗″紑闃� => p206V1 11
+ * @param type
+ * @return
+ */
+ public static byte openType2P206V1(byte type){
+ return switch (type) {
+ case 1 -> (byte)1 ;
+ case 2 -> (byte)3 ;
+ case 8 -> (byte)3 ;
+ case 11 -> (byte)11 ;
+ default -> (byte)-1;
+ };
+ }
+
+ /**
* 寰楀埌鍏冲紑闃�绫诲瀷鍚嶇О
* 0x00:鍒峰崱闂�
* 0x01:骞冲彴鍏�
@@ -280,10 +298,10 @@
* 0x06:鍓╀綑姘撮噺涓嶈冻鍏�
* 0x07:鍓╀綑閲戦涓�0鍏�
* 0x08:寮�娉�/闃�鍚庣閬撴病鏈夋祦閲忓叧
- * 0x09:鎺夌數鍐嶄笂鐢靛叧锛�
- * 0x0a:姘磋〃鐬椂娴侀噺涓�0鍏筹紝
- * 0x0b:鍒峰崱寮�娉碉紝杩滅▼鍏炽��
- * 0x0c:鐢垫睜浣庣數鍘嬪叧銆�
+ * 0x09:鎺夌數鍐嶄笂鐢靛叧
+ * 0x0a:姘磋〃鐬椂娴侀噺涓�0鍏�
+ * 0x0b:鍒峰崱寮�娉碉紝杩滅▼鍏�
+ * 0x0c:鐢垫睜浣庣數鍘嬪叧
* @param type 瀛楄妭
* @return 鍚嶇О
*/
@@ -305,6 +323,37 @@
default -> "鏈煡";
};
}
+ /**
+ * 寰楀埌鍏冲紑闃�绫诲瀷鍚嶇О
+ * 0x00:鍒峰崱闂� => p206V1 2
+ * 0x01:骞冲彴鍏� => p206V1 4
+ * 0x02:APP鍏� => p206V1 4
+ * 0x03:闈炴硶鍗″叧 => p206V1 12
+ * 0x04:姘磋〃閫氳寮傚父鍏� => p206V1 6
+ * 0x05:鐢佃〃寮傚父鍏� => p206V1 6
+ * 0x06:鍓╀綑姘撮噺涓嶈冻鍏� => p206V1 5
+ * 0x07:鍓╀綑閲戦涓�0鍏� => p206V1 5
+ * 0x08:寮�娉�/闃�鍚庣閬撴病鏈夋祦閲忓叧 => p206V1 16
+ * 0x09:鎺夌數鍐嶄笂鐢靛叧锛� => p206V1 7
+ * 0x0a:姘磋〃鐬椂娴侀噺涓�0鍏筹紝 => p206V1 5
+ * 0x0b:鍒峰崱寮�娉碉紝杩滅▼鍏炽�� => p206V1 9
+ * 0x0c:鐢垫睜浣庣數鍘嬪叧銆� => p206V1 7
+ * @param type 瀛楄妭
+ * @return 鍚嶇О
+ */
+ public static byte closeType2P206V1(byte type){
+ return switch (type) {
+ case 0 -> (byte)2;
+ case 1,2 -> (byte)4;
+ case 3 -> (byte)12;
+ case 4,5 -> (byte)6;
+ case 6,7,10 -> (byte)5;
+ case 8 -> (byte)16;
+ case 9,12 -> (byte)7;
+ case 11 -> (byte)9;
+ default -> (byte)-1;
+ };
+ }
public static String ctrlDevType(String hex){
return switch (hex) {
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java
index e279612..cc155a8 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java
@@ -104,6 +104,8 @@
index ++ ;//褰撳墠鐢ㄦ按鏂瑰紡
cdData.opType = bs[index];
+ //杩涜鍏煎杞崲
+ cdData.opType = CommonV202404.openType2P206V1(cdData.opType) ;
index++ ;
cdData.icCardAddr = ByteUtil.bytes2Hex(bs, false, index, 4) ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java
index 26eb4b6..c767292 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java
@@ -94,11 +94,7 @@
bs[index] = cvo.projectNo.byteValue() ;
index ++ ;
- if(cvo.controllerType.equals("01")){
- bs[index] = (byte)0xF0 ;
- }else{
- bs[index] = (byte)0x00 ;
- }
+ GlCreate.createValveOrPump(cvo.controllerType, bs, index) ;
index ++ ;
GlCreate.createIcCardNo(cvo.icCardNo, bs, index);
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Down.java
index dc8c81a..fa482cf 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Down.java
@@ -73,11 +73,7 @@
bs[index] = cvo.projectNo.byteValue() ;
index ++ ;
- if(cvo.controllerType.equals("01")){
- bs[index] = (byte)0xF0 ;
- }else{
- bs[index] = (byte)0x00 ;
- }
+ GlCreate.createValveOrPump(cvo.controllerType, bs, index) ;
index ++ ;
GlCreate.createIcCardNo(cvo.icCardNo, bs, index);
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Up.java
index e5c444e..9d82d8e 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Up.java
@@ -48,7 +48,7 @@
if(para.data != null && para.data.getSubData() != null){
DataCd93_A3Vo subData = (DataCd93_A3Vo)((DataV202404)para.data.getSubData()).subData ;
//opResult ;//鍏虫车/闃�缁撴灉: 0x00:鎴愬姛 0x81:澶辫触
- callback.notify(new ValveStateInfo(subData.opResult.byteValue()==0?false:true));
+ callback.notify(new ValveStateInfo(subData.clResult.byteValue()==0?false:true));
}
return new MidResult[]{midRs} ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
index 60e7d69..49f7648 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
@@ -34,6 +34,21 @@
return bsHead ;
}
+
+ /**
+ * 0xf0闃�闂� 0x00姘存车
+ * @param controllerTypeByHex
+ * @param bs
+ * @param index
+ */
+ public static void createValveOrPump(String controllerTypeByHex, byte[] bs, int index){
+ if(controllerTypeByHex != null && controllerTypeByHex.equals("57")){
+ bs[index] = (byte)0x00 ;
+ }else{
+ bs[index] = (byte)0xF0 ;
+ }
+ }
+
/**
* 鐢熸垚鎺у埗鍣ㄥ湴鍧�
* 6瀛楄妭BCD鐮侊紙12浣嶈鏀垮尯鍒掞級 + 2瀛楄妭HEX
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java
index d03d85e..960178c 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java
@@ -1,5 +1,6 @@
package com.dy.common.mw.protocol.p206V202404.parse.global;
+import com.dy.common.mw.protocol.p206V202404.CommonV202404;
import com.dy.common.mw.protocol.p206V202404.ProtocolConstantV206V202404;
import com.dy.common.mw.protocol.p206V202404.upVos.*;
import com.dy.common.util.ByteUtil;
@@ -242,6 +243,8 @@
index ++ ;
cdData.clType = bs[index];
+ //杩涜鍏煎杞崲
+ cdData.clType = CommonV202404.closeType2P206V1(cdData.clType) ;
index++ ;
cdData.icCardAddr = ByteUtil.bytes2Hex(bs, false, index, 4) ;
@@ -299,10 +302,10 @@
cdData.projectNo = (int)bs[index];
index ++ ;
- cdData.opResult = bs[index];
+ cdData.clResult = bs[index];
index ++ ;
- cdData.opType = bs[index];
+ cdData.clType = bs[index];
index++ ;
cdData.icCardAddr = ByteUtil.bytes2Hex(bs, false, index, 4) ;
@@ -316,7 +319,7 @@
index += 8 ;
cdData.startDt = GlParse.parseRtuDt(bs, index) ;
- if(cdData.opResult == (byte)0x81){
+ if(cdData.clResult == (byte)0x81){
//澶辫触浜嗭紝涓嬮潰灏辨病鏈夋暟鎹簡
return ;
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd93_A3Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd93_A3Vo.java
index ece5865..80c266c 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd93_A3Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd93_A3Vo.java
@@ -11,8 +11,8 @@
public String controllerType;//鎺у埗鍣ㄧ被鍨�
public Integer projectNo ;//椤圭洰缂栧彿
- public Byte opResult ;//鍏虫车/闃�缁撴灉: 0x00:鎴愬姛 0x81:澶辫触
- public Byte opType ;//鍏虫车/闃�鏂瑰紡: 0x00:鍒峰崱闂� 0x01:骞冲彴鍏� 0x02:APP鍏� 0x03:闈炴硶鍗″叧 0x04:姘磋〃寮傚父鍏� 0x05:鐢佃〃寮傚父鍏� 0x06:鍓╀綑姘撮噺涓嶈冻鍏� 0x07:鍓╀綑閲戦涓嶈冻鍏� 0x08:寮�娉�/闃�鍚庣閬撴病鏈夋祦閲忓叧 0x09:鎺夌數鍐嶄笂鐢点��
+ public Byte clResult;//鍏虫车/闃�缁撴灉: 0x00:鎴愬姛 0x81:澶辫触
+ public Byte clType;//鍏虫车/闃�鏂瑰紡: 0x00:鍒峰崱闂� 0x01:骞冲彴鍏� 0x02:APP鍏� 0x03:闈炴硶鍗″叧 0x04:姘磋〃寮傚父鍏� 0x05:鐢佃〃寮傚父鍏� 0x06:鍓╀綑姘撮噺涓嶈冻鍏� 0x07:鍓╀綑閲戦涓嶈冻鍏� 0x08:寮�娉�/闃�鍚庣閬撴病鏈夋祦閲忓叧 0x09:鎺夌數鍐嶄笂鐢点��
public String icCardAddr ;//IC鍗″湴鍧�锛堣繙绋嬪叧闂椂涓�0锛�
public String icCardNo ;//IC鍗＄紪鍙凤紙17浣嶆暟瀛楋級
public String orderNo ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
@@ -43,10 +43,10 @@
sb.append(projectNo == null?"鏈煡":projectNo) ;
sb.append("\n") ;
sb.append(" 鍏虫车/闃�绫诲瀷 : ") ;
- sb.append(opType == null?"鏈煡":(opType.byteValue() == 0x00 ? "鍒峰崱":(opType.byteValue() == 0x01 ? "骞冲彴":(opType.byteValue() == 0x02 ? "APP":(opType.byteValue() == 0x03 ? "闈炴硶鍗�":(opType.byteValue() == 0x04 ? "姘磋〃寮傚父":(opType.byteValue() == 0x05 ? "鐢佃〃寮傚父":(opType.byteValue() == 0x06 ? "鍓╀綑姘撮噺涓嶈冻":(opType.byteValue() == 0x07 ? "鍓╀綑閲戦涓嶈冻":(opType.byteValue() == 0x08 ? "鏃犳祦閲�":(opType.byteValue() == 0x09 ? "鎺夌數鍐嶄笂鐢�":"鏈煡"))))))))))) ;
+ sb.append(clType == null?"鏈煡":(clType.byteValue() == 0x00 ? "鍒峰崱":(clType.byteValue() == 0x01 ? "骞冲彴":(clType.byteValue() == 0x02 ? "APP":(clType.byteValue() == 0x03 ? "闈炴硶鍗�":(clType.byteValue() == 0x04 ? "姘磋〃寮傚父":(clType.byteValue() == 0x05 ? "鐢佃〃寮傚父":(clType.byteValue() == 0x06 ? "鍓╀綑姘撮噺涓嶈冻":(clType.byteValue() == 0x07 ? "鍓╀綑閲戦涓嶈冻":(clType.byteValue() == 0x08 ? "鏃犳祦閲�":(clType.byteValue() == 0x09 ? "鎺夌數鍐嶄笂鐢�":"鏈煡"))))))))))) ;
sb.append("\n") ;
sb.append(" 鍏冲惎娉�/闃�缁撴灉 : ") ;
- sb.append(opResult == null?"鏈煡":(opResult.byteValue() == 0x01 ? "鎴愬姛":"澶辫触")) ;
+ sb.append(clResult == null?"鏈煡":(clResult.byteValue() == 0x01 ? "鎴愬姛":"澶辫触")) ;
sb.append("\n") ;
sb.append(" IC鍗″湴鍧� : ") ;
sb.append(icCardAddr == null?"鏈煡":icCardAddr) ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/HttpCallback.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/HttpCallback.java
new file mode 100644
index 0000000..96a1825
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/HttpCallback.java
@@ -0,0 +1,10 @@
+package com.dy.common.util;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/3/13 9:35
+ * @Description
+ */
+public interface HttpCallback {
+ void call(String statusCode, String charset, String body) ;
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-common-mw.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-common-mw.yml
new file mode 100644
index 0000000..b84935b
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-common-mw.yml
@@ -0,0 +1,30 @@
+common:
+ # 浠ヤ笅鏄腑闂翠欢搴旂敤
+ # 233鏈嶅姟鍣細
+ # ym: 8070 9070
+ # sp: 8073 9073
+ # test: 8072 9072
+ # mj: 8071 9071
+ # 121鏈嶅姟鍣細
+ # mq: 8100 9100
+ # yq: 8101 9101
+ # hlj: 8102 9102
+ # gz: 8103 9103
+ # lz: 8104 9104
+ # jc: 8105 9105
+ pipIrr_mw_webPort: 8100 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
+ pipIrr_mw_actutorPort: 9100 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
+
+ # 233鏈嶅姟鍣細
+ # ym: pipIrr_ym
+ # sp: pipIrr_sp
+ # test: pipIrr_test
+ # mj: pipIrr_mj
+ # 121鏈嶅姟鍣細
+ # mq: pipIrr_mq
+ # yq: pipIrr_yq
+ # hlj: pipIrr_hlj
+ # gz: pipIrr_gz
+ # lz: pipIrr_lz
+ # jc: pipIrr_jc
+ spring_datasource_url_dbname: pipIrr_mq
\ No newline at end of file
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web\050121\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..08b0b74
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+common:
+ # 233鏈嶅姟鍣細ym,mj,sp,test
+ # 121鏈嶅姟鍣細mq,yq,hlj,gz,lz,jc
+ spring_main_datasource_names: mq,yq,hlj,gz,lz,jc
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web\050233\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web\050233\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..919318c
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web\050233\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+common:
+ # 233鏈嶅姟鍣細ym,mj,sp,test
+ # 121鏈嶅姟鍣細mq,yq,hlj,gz,lz,jc
+ spring_main_datasource_names: ym,mj,sp,test
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web.yml
new file mode 100644
index 0000000..919318c
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web.yml
@@ -0,0 +1,4 @@
+common:
+ # 233鏈嶅姟鍣細ym,mj,sp,test
+ # 121鏈嶅姟鍣細mq,yq,hlj,gz,lz,jc
+ spring_main_datasource_names: ym,mj,sp,test
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-database\050\345\274\200\345\217\221\346\265\213\350\257\225---\345\215\225\346\225\260\346\215\256\345\272\223\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-database\050\345\274\200\345\217\221\346\265\213\350\257\225---\345\215\225\346\225\260\346\215\256\345\272\223\051.yml"
index 6debbc7..312803e 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-database\050\345\274\200\345\217\221\346\265\213\350\257\225---\345\215\225\346\225\260\346\215\256\345\272\223\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-database\050\345\274\200\345\217\221\346\265\213\350\257\225---\345\215\225\346\225\260\346\215\256\345\272\223\051.yml"
@@ -1,8 +1,6 @@
# 鏁版嵁婧愰厤缃�
spring:
#澶氭暟鎹簮闇�瑕侀厤缃�
- main:
- allow-bean-definition-overriding: true #璁剧疆涓簍rue鏃讹紝鍚庡畾涔夌殑bean浼氳鐩栦箣鍓嶅畾涔夌殑鐩稿悓鍚嶇О鐨刡ean
datasource: #閰嶇疆鏁版嵁婧�
#澶氫釜鏁版嵁婧愬悕绉板湪姝ら厤缃紝瑕佹眰涓巗pring銆俤atasource銆俒ym][sp][test]涓殑涓�鑷�
names: ym
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-gz.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-gz.yml
new file mode 100644
index 0000000..c07cb84
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-gz.yml
@@ -0,0 +1,69 @@
+# 鏁版嵁婧愰厤缃�
+spring:
+ datasource: #閰嶇疆鏁版嵁婧�
+ gz:
+ #name: ym
+ type: com.alibaba.druid.pool.DruidDataSource
+ driverClassName: com.mysql.cj.jdbc.Driver
+# url: jdbc:mysql://192.168.40.166:3306/pipIrr_gz?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql://8.130.130.233:3306/pipIrr_gz?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ url: jdbc:mysql://127.0.0.1:3306/pipIrr_gz?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ username: root
+ password: dysql,;.abc!@#
+ druid:
+ # 鏁版嵁婧愬悕绉帮細褰撳瓨鍦ㄥ涓暟鎹簮鏃讹紝璁剧疆鍚嶅瓧鍙互寰堟柟渚跨殑鏉ヨ繘琛屽尯鍒�,榛樿鑷姩鐢熸垚鍚嶇О锛屾牸寮忔槸锛�"DataSource-" + System.identityHashCode(this)
+ name: druid-mysql-gz
+ #閰嶇疆鍒濆鍖栧ぇ灏忋�佹渶灏忋�佹渶澶�
+ initialSize: 10
+ minIdle: 10
+ maxActive: 100
+ # 鑾峰彇杩炴帴鏃舵渶澶х瓑寰呮椂闂�,鍗曚綅姣銆傞厤缃簡maxWait涔嬪悗,缂虹渷鍚敤鍏钩閿�,骞跺彂鏁堢巼浼氭湁鎵�涓嬮檷,濡傛灉闇�瑕佸彲浠ラ�氳繃閰嶇疆useUnfairLock灞炴�т负true浣跨敤闈炲叕骞抽攣
+ maxWait: 60000
+ #閰嶇疆闂撮殧澶氫箙杩涜涓�娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆绉掋�� 榛樿鏄�60s锛屽お闀垮彲鑳戒細瀵艰嚧鏃犳硶鍙婃椂妫�娴嬪埌杩炴帴涓柇
+ timeBetweenEvictionRunsMillis: 60000
+ #閰嶇疆涓�涓繛鎺ュ湪杩炴帴姹犱腑鐨勬渶灏忕敓瀛樻椂闂淬�佹渶澶х敓瀛樻椂闂达紝瓒呰繃鏈�澶х敓瀛樻椂闂翠細琚Щ闄わ紝鍗曚綅姣銆�
+ minEvictableIdleTimeMillis: 300000
+ maxEvictableIdleTimeMillis: 900000
+ #鎺㈡椿銆侀獙璇侀摼鎺ユ湁鏁堟�х殑鏌ヨ锛屾柊鐗堟湰榛樿浣跨敤mysqlPing浠ｆ浛
+ #validation-query: select 1 #娉ㄩ噴鎺夛紝閲囩敤榛樿鐨刴ysqlPing
+ #閰嶇疆浠庤繛鎺ユ睜鑾峰彇杩炴帴鏃讹紝褰撹繛鎺ョ┖闂叉椂闂村ぇ浜巘imeBetweenEvictionRunsMillis鏃舵槸鍚︽鏌ヨ繛鎺ユ湁鏁堟�э紝true姣忔閮芥鏌ワ紱false涓嶆鏌ャ��
+ testWhileIdle: true
+ #閰嶇疆浠庤繛鎺ユ睜鑾峰彇杩炴帴鏃跺拰鍚戣繛鎺ユ睜褰掕繕杩炴帴鏃讹紝鏄惁妫�鏌ヨ繛鎺ユ湁鏁堟��
+ #姣忔鑾峰彇鎴栧綊杩樿繛鎺ラ兘妫�娴嬪お棰戠箒锛岄櫎闈炵壒鍒噸瑕佹垨缃戠粶鐗瑰埆涓嶅彲闈犵瓑鎯呭喌锛屽缓璁敤testWhileIdle + timeBetweenEvictionRunsMillis浠ｆ浛銆�-->
+ testOnBorrow: false
+ testOnReturn: false
+ #閰嶇疆鏄惁瀹氭湡鎺㈡椿銆佹帰娲婚棿闅�, 榛樿120s
+ keepAlive: true
+ #keepAliveBetweenTimeMillis must be greater than timeBetweenEvictionRunsMillis
+ keepAliveBetweenTimeMillis: 1200000
+ #閰嶇疆涓�涓繛鎺ユ渶澶т娇鐢ㄦ鏁帮紝閬垮厤闀挎椂闂翠娇鐢ㄧ浉鍚岃繛鎺ラ�犳垚鏈嶅姟鍣ㄧ璐熻浇涓嶅潎琛°��
+ phyMaxUseCount: 1000
+ #鏄惁缂撳瓨preparedStatement锛屼篃灏辨槸PSCache銆侾SCache瀵规敮鎸佹父鏍囩殑鏁版嵁搴撴�ц兘鎻愬崌宸ㄥぇ锛屾瘮濡傝oracle銆傚湪mysql涓嬪缓璁叧闂��
+ poolPreparedStatements: false
+ #瑕佸惎鐢≒SCache锛屽繀椤婚厤缃ぇ浜�0锛屽綋澶т簬0鏃讹紝poolPreparedStatements鑷姩瑙﹀彂淇敼涓簍rue銆傚湪Druid涓紝涓嶄細瀛樺湪Oracle涓婸SCache鍗犵敤鍐呭瓨杩囧鐨勯棶棰橈紝鍙互鎶婅繖涓暟鍊奸厤缃ぇ涓�浜涳紝姣斿璇�100
+ maxOpenPreparedStatements: -1
+ #鎸囧畾姣忎釜杩炴帴涓奝SCache鐨勫ぇ灏�
+ maxPoolPreparedStatementPerConnectionSize: 20
+ #灞炴�х被鍨嬫槸瀛楃涓诧紝閫氳繃鍒悕鐨勬柟寮忛厤缃墿灞曟彃浠讹紝甯哥敤鐨勬彃浠舵湁锛�
+ #鐩戞帶缁熻鐢ㄧ殑filter:stat锛屾棩蹇楃敤鐨刦ilter:log4j锛岄槻寰ql娉ㄥ叆鐨刦ilter:wall
+ #filters: stat,wall,config
+ filters: wall,config
+ webStatFilter:
+ # 娣诲姞杩囨护瑙勫垯
+ urlPattern: /*
+ # 蹇界暐杩囨护鏍煎紡
+ exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
+ statViewServlet:
+ # 璁剧疆ip鐧藉悕鍗�
+ # allow: 127.0.0.1
+ # 璁剧疆ip榛戝悕鍗曪紝浼樺厛绾ч珮浜庣櫧鍚嶅崟
+ deny:
+ # 璁剧疆鎺у埗鍙扮鐞嗙敤鎴�
+ # loginUsername: root
+ # loginPassword: root
+ # 鏄惁鍙互閲嶇疆鏁版嵁
+ resetEnable: false
+ # 寮�鍚痙ruid鐩戞帶椤甸潰
+ #enabled: true
+ enabled: false
+
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-hlj.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-hlj.yml
new file mode 100644
index 0000000..767b6b1
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-hlj.yml
@@ -0,0 +1,69 @@
+# 鏁版嵁婧愰厤缃�
+spring:
+ datasource: #閰嶇疆鏁版嵁婧�
+ hlj:
+ #name: ym
+ type: com.alibaba.druid.pool.DruidDataSource
+ driverClassName: com.mysql.cj.jdbc.Driver
+# url: jdbc:mysql://192.168.40.166:3306/pipIrr_hlj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql://8.130.130.233:3306/pipIrr_hlj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ url: jdbc:mysql://127.0.0.1:3306/pipIrr_hlj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ username: root
+ password: dysql,;.abc!@#
+ druid:
+ # 鏁版嵁婧愬悕绉帮細褰撳瓨鍦ㄥ涓暟鎹簮鏃讹紝璁剧疆鍚嶅瓧鍙互寰堟柟渚跨殑鏉ヨ繘琛屽尯鍒�,榛樿鑷姩鐢熸垚鍚嶇О锛屾牸寮忔槸锛�"DataSource-" + System.identityHashCode(this)
+ name: druid-mysql-hlj
+ #閰嶇疆鍒濆鍖栧ぇ灏忋�佹渶灏忋�佹渶澶�
+ initialSize: 10
+ minIdle: 10
+ maxActive: 100
+ # 鑾峰彇杩炴帴鏃舵渶澶х瓑寰呮椂闂�,鍗曚綅姣銆傞厤缃簡maxWait涔嬪悗,缂虹渷鍚敤鍏钩閿�,骞跺彂鏁堢巼浼氭湁鎵�涓嬮檷,濡傛灉闇�瑕佸彲浠ラ�氳繃閰嶇疆useUnfairLock灞炴�т负true浣跨敤闈炲叕骞抽攣
+ maxWait: 60000
+ #閰嶇疆闂撮殧澶氫箙杩涜涓�娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆绉掋�� 榛樿鏄�60s锛屽お闀垮彲鑳戒細瀵艰嚧鏃犳硶鍙婃椂妫�娴嬪埌杩炴帴涓柇
+ timeBetweenEvictionRunsMillis: 60000
+ #閰嶇疆涓�涓繛鎺ュ湪杩炴帴姹犱腑鐨勬渶灏忕敓瀛樻椂闂淬�佹渶澶х敓瀛樻椂闂达紝瓒呰繃鏈�澶х敓瀛樻椂闂翠細琚Щ闄わ紝鍗曚綅姣銆�
+ minEvictableIdleTimeMillis: 300000
+ maxEvictableIdleTimeMillis: 900000
+ #鎺㈡椿銆侀獙璇侀摼鎺ユ湁鏁堟�х殑鏌ヨ锛屾柊鐗堟湰榛樿浣跨敤mysqlPing浠ｆ浛
+ #validation-query: select 1 #娉ㄩ噴鎺夛紝閲囩敤榛樿鐨刴ysqlPing
+ #閰嶇疆浠庤繛鎺ユ睜鑾峰彇杩炴帴鏃讹紝褰撹繛鎺ョ┖闂叉椂闂村ぇ浜巘imeBetweenEvictionRunsMillis鏃舵槸鍚︽鏌ヨ繛鎺ユ湁鏁堟�э紝true姣忔閮芥鏌ワ紱false涓嶆鏌ャ��
+ testWhileIdle: true
+ #閰嶇疆浠庤繛鎺ユ睜鑾峰彇杩炴帴鏃跺拰鍚戣繛鎺ユ睜褰掕繕杩炴帴鏃讹紝鏄惁妫�鏌ヨ繛鎺ユ湁鏁堟��
+ #姣忔鑾峰彇鎴栧綊杩樿繛鎺ラ兘妫�娴嬪お棰戠箒锛岄櫎闈炵壒鍒噸瑕佹垨缃戠粶鐗瑰埆涓嶅彲闈犵瓑鎯呭喌锛屽缓璁敤testWhileIdle + timeBetweenEvictionRunsMillis浠ｆ浛銆�-->
+ testOnBorrow: false
+ testOnReturn: false
+ #閰嶇疆鏄惁瀹氭湡鎺㈡椿銆佹帰娲婚棿闅�, 榛樿120s
+ keepAlive: true
+ #keepAliveBetweenTimeMillis must be greater than timeBetweenEvictionRunsMillis
+ keepAliveBetweenTimeMillis: 1200000
+ #閰嶇疆涓�涓繛鎺ユ渶澶т娇鐢ㄦ鏁帮紝閬垮厤闀挎椂闂翠娇鐢ㄧ浉鍚岃繛鎺ラ�犳垚鏈嶅姟鍣ㄧ璐熻浇涓嶅潎琛°��
+ phyMaxUseCount: 1000
+ #鏄惁缂撳瓨preparedStatement锛屼篃灏辨槸PSCache銆侾SCache瀵规敮鎸佹父鏍囩殑鏁版嵁搴撴�ц兘鎻愬崌宸ㄥぇ锛屾瘮濡傝oracle銆傚湪mysql涓嬪缓璁叧闂��
+ poolPreparedStatements: false
+ #瑕佸惎鐢≒SCache锛屽繀椤婚厤缃ぇ浜�0锛屽綋澶т簬0鏃讹紝poolPreparedStatements鑷姩瑙﹀彂淇敼涓簍rue銆傚湪Druid涓紝涓嶄細瀛樺湪Oracle涓婸SCache鍗犵敤鍐呭瓨杩囧鐨勯棶棰橈紝鍙互鎶婅繖涓暟鍊奸厤缃ぇ涓�浜涳紝姣斿璇�100
+ maxOpenPreparedStatements: -1
+ #鎸囧畾姣忎釜杩炴帴涓奝SCache鐨勫ぇ灏�
+ maxPoolPreparedStatementPerConnectionSize: 20
+ #灞炴�х被鍨嬫槸瀛楃涓诧紝閫氳繃鍒悕鐨勬柟寮忛厤缃墿灞曟彃浠讹紝甯哥敤鐨勬彃浠舵湁锛�
+ #鐩戞帶缁熻鐢ㄧ殑filter:stat锛屾棩蹇楃敤鐨刦ilter:log4j锛岄槻寰ql娉ㄥ叆鐨刦ilter:wall
+ #filters: stat,wall,config
+ filters: wall,config
+ webStatFilter:
+ # 娣诲姞杩囨护瑙勫垯
+ urlPattern: /*
+ # 蹇界暐杩囨护鏍煎紡
+ exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
+ statViewServlet:
+ # 璁剧疆ip鐧藉悕鍗�
+ # allow: 127.0.0.1
+ # 璁剧疆ip榛戝悕鍗曪紝浼樺厛绾ч珮浜庣櫧鍚嶅崟
+ deny:
+ # 璁剧疆鎺у埗鍙扮鐞嗙敤鎴�
+ # loginUsername: root
+ # loginPassword: root
+ # 鏄惁鍙互閲嶇疆鏁版嵁
+ resetEnable: false
+ # 寮�鍚痙ruid鐩戞帶椤甸潰
+ #enabled: true
+ enabled: false
+
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-jc.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-jc.yml
new file mode 100644
index 0000000..068180f
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-jc.yml
@@ -0,0 +1,69 @@
+# 鏁版嵁婧愰厤缃�
+spring:
+ datasource: #閰嶇疆鏁版嵁婧�
+ jc:
+ #name: ym
+ type: com.alibaba.druid.pool.DruidDataSource
+ driverClassName: com.mysql.cj.jdbc.Driver
+# url: jdbc:mysql://192.168.40.166:3306/pipIrr_jc?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql://8.130.130.233:3306/pipIrr_jc?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ url: jdbc:mysql://127.0.0.1:3306/pipIrr_jc?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ username: root
+ password: dysql,;.abc!@#
+ druid:
+ # 鏁版嵁婧愬悕绉帮細褰撳瓨鍦ㄥ涓暟鎹簮鏃讹紝璁剧疆鍚嶅瓧鍙互寰堟柟渚跨殑鏉ヨ繘琛屽尯鍒�,榛樿鑷姩鐢熸垚鍚嶇О锛屾牸寮忔槸锛�"DataSource-" + System.identityHashCode(this)
+ name: druid-mysql-jc
+ #閰嶇疆鍒濆鍖栧ぇ灏忋�佹渶灏忋�佹渶澶�
+ initialSize: 10
+ minIdle: 10
+ maxActive: 100
+ # 鑾峰彇杩炴帴鏃舵渶澶х瓑寰呮椂闂�,鍗曚綅姣銆傞厤缃簡maxWait涔嬪悗,缂虹渷鍚敤鍏钩閿�,骞跺彂鏁堢巼浼氭湁鎵�涓嬮檷,濡傛灉闇�瑕佸彲浠ラ�氳繃閰嶇疆useUnfairLock灞炴�т负true浣跨敤闈炲叕骞抽攣
+ maxWait: 60000
+ #閰嶇疆闂撮殧澶氫箙杩涜涓�娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆绉掋�� 榛樿鏄�60s锛屽お闀垮彲鑳戒細瀵艰嚧鏃犳硶鍙婃椂妫�娴嬪埌杩炴帴涓柇
+ timeBetweenEvictionRunsMillis: 60000
+ #閰嶇疆涓�涓繛鎺ュ湪杩炴帴姹犱腑鐨勬渶灏忕敓瀛樻椂闂淬�佹渶澶х敓瀛樻椂闂达紝瓒呰繃鏈�澶х敓瀛樻椂闂翠細琚Щ闄わ紝鍗曚綅姣銆�
+ minEvictableIdleTimeMillis: 300000
+ maxEvictableIdleTimeMillis: 900000
+ #鎺㈡椿銆侀獙璇侀摼鎺ユ湁鏁堟�х殑鏌ヨ锛屾柊鐗堟湰榛樿浣跨敤mysqlPing浠ｆ浛
+ #validation-query: select 1 #娉ㄩ噴鎺夛紝閲囩敤榛樿鐨刴ysqlPing
+ #閰嶇疆浠庤繛鎺ユ睜鑾峰彇杩炴帴鏃讹紝褰撹繛鎺ョ┖闂叉椂闂村ぇ浜巘imeBetweenEvictionRunsMillis鏃舵槸鍚︽鏌ヨ繛鎺ユ湁鏁堟�э紝true姣忔閮芥鏌ワ紱false涓嶆鏌ャ��
+ testWhileIdle: true
+ #閰嶇疆浠庤繛鎺ユ睜鑾峰彇杩炴帴鏃跺拰鍚戣繛鎺ユ睜褰掕繕杩炴帴鏃讹紝鏄惁妫�鏌ヨ繛鎺ユ湁鏁堟��
+ #姣忔鑾峰彇鎴栧綊杩樿繛鎺ラ兘妫�娴嬪お棰戠箒锛岄櫎闈炵壒鍒噸瑕佹垨缃戠粶鐗瑰埆涓嶅彲闈犵瓑鎯呭喌锛屽缓璁敤testWhileIdle + timeBetweenEvictionRunsMillis浠ｆ浛銆�-->
+ testOnBorrow: false
+ testOnReturn: false
+ #閰嶇疆鏄惁瀹氭湡鎺㈡椿銆佹帰娲婚棿闅�, 榛樿120s
+ keepAlive: true
+ #keepAliveBetweenTimeMillis must be greater than timeBetweenEvictionRunsMillis
+ keepAliveBetweenTimeMillis: 1200000
+ #閰嶇疆涓�涓繛鎺ユ渶澶т娇鐢ㄦ鏁帮紝閬垮厤闀挎椂闂翠娇鐢ㄧ浉鍚岃繛鎺ラ�犳垚鏈嶅姟鍣ㄧ璐熻浇涓嶅潎琛°��
+ phyMaxUseCount: 1000
+ #鏄惁缂撳瓨preparedStatement锛屼篃灏辨槸PSCache銆侾SCache瀵规敮鎸佹父鏍囩殑鏁版嵁搴撴�ц兘鎻愬崌宸ㄥぇ锛屾瘮濡傝oracle銆傚湪mysql涓嬪缓璁叧闂��
+ poolPreparedStatements: false
+ #瑕佸惎鐢≒SCache锛屽繀椤婚厤缃ぇ浜�0锛屽綋澶т簬0鏃讹紝poolPreparedStatements鑷姩瑙﹀彂淇敼涓簍rue銆傚湪Druid涓紝涓嶄細瀛樺湪Oracle涓婸SCache鍗犵敤鍐呭瓨杩囧鐨勯棶棰橈紝鍙互鎶婅繖涓暟鍊奸厤缃ぇ涓�浜涳紝姣斿璇�100
+ maxOpenPreparedStatements: -1
+ #鎸囧畾姣忎釜杩炴帴涓奝SCache鐨勫ぇ灏�
+ maxPoolPreparedStatementPerConnectionSize: 20
+ #灞炴�х被鍨嬫槸瀛楃涓诧紝閫氳繃鍒悕鐨勬柟寮忛厤缃墿灞曟彃浠讹紝甯哥敤鐨勬彃浠舵湁锛�
+ #鐩戞帶缁熻鐢ㄧ殑filter:stat锛屾棩蹇楃敤鐨刦ilter:log4j锛岄槻寰ql娉ㄥ叆鐨刦ilter:wall
+ #filters: stat,wall,config
+ filters: wall,config
+ webStatFilter:
+ # 娣诲姞杩囨护瑙勫垯
+ urlPattern: /*
+ # 蹇界暐杩囨护鏍煎紡
+ exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
+ statViewServlet:
+ # 璁剧疆ip鐧藉悕鍗�
+ # allow: 127.0.0.1
+ # 璁剧疆ip榛戝悕鍗曪紝浼樺厛绾ч珮浜庣櫧鍚嶅崟
+ deny:
+ # 璁剧疆鎺у埗鍙扮鐞嗙敤鎴�
+ # loginUsername: root
+ # loginPassword: root
+ # 鏄惁鍙互閲嶇疆鏁版嵁
+ resetEnable: false
+ # 寮�鍚痙ruid鐩戞帶椤甸潰
+ #enabled: true
+ enabled: false
+
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-lz.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-lz.yml
new file mode 100644
index 0000000..ef29b81
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-lz.yml
@@ -0,0 +1,69 @@
+# 鏁版嵁婧愰厤缃�
+spring:
+ datasource: #閰嶇疆鏁版嵁婧�
+ lz:
+ #name: ym
+ type: com.alibaba.druid.pool.DruidDataSource
+ driverClassName: com.mysql.cj.jdbc.Driver
+# url: jdbc:mysql://192.168.40.166:3306/pipIrr_lz?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql://8.130.130.233:3306/pipIrr_lz?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ url: jdbc:mysql://127.0.0.1:3306/pipIrr_lz?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ username: root
+ password: dysql,;.abc!@#
+ druid:
+ # 鏁版嵁婧愬悕绉帮細褰撳瓨鍦ㄥ涓暟鎹簮鏃讹紝璁剧疆鍚嶅瓧鍙互寰堟柟渚跨殑鏉ヨ繘琛屽尯鍒�,榛樿鑷姩鐢熸垚鍚嶇О锛屾牸寮忔槸锛�"DataSource-" + System.identityHashCode(this)
+ name: druid-mysql-lz
+ #閰嶇疆鍒濆鍖栧ぇ灏忋�佹渶灏忋�佹渶澶�
+ initialSize: 10
+ minIdle: 10
+ maxActive: 100
+ # 鑾峰彇杩炴帴鏃舵渶澶х瓑寰呮椂闂�,鍗曚綅姣銆傞厤缃簡maxWait涔嬪悗,缂虹渷鍚敤鍏钩閿�,骞跺彂鏁堢巼浼氭湁鎵�涓嬮檷,濡傛灉闇�瑕佸彲浠ラ�氳繃閰嶇疆useUnfairLock灞炴�т负true浣跨敤闈炲叕骞抽攣
+ maxWait: 60000
+ #閰嶇疆闂撮殧澶氫箙杩涜涓�娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆绉掋�� 榛樿鏄�60s锛屽お闀垮彲鑳戒細瀵艰嚧鏃犳硶鍙婃椂妫�娴嬪埌杩炴帴涓柇
+ timeBetweenEvictionRunsMillis: 60000
+ #閰嶇疆涓�涓繛鎺ュ湪杩炴帴姹犱腑鐨勬渶灏忕敓瀛樻椂闂淬�佹渶澶х敓瀛樻椂闂达紝瓒呰繃鏈�澶х敓瀛樻椂闂翠細琚Щ闄わ紝鍗曚綅姣銆�
+ minEvictableIdleTimeMillis: 300000
+ maxEvictableIdleTimeMillis: 900000
+ #鎺㈡椿銆侀獙璇侀摼鎺ユ湁鏁堟�х殑鏌ヨ锛屾柊鐗堟湰榛樿浣跨敤mysqlPing浠ｆ浛
+ #validation-query: select 1 #娉ㄩ噴鎺夛紝閲囩敤榛樿鐨刴ysqlPing
+ #閰嶇疆浠庤繛鎺ユ睜鑾峰彇杩炴帴鏃讹紝褰撹繛鎺ョ┖闂叉椂闂村ぇ浜巘imeBetweenEvictionRunsMillis鏃舵槸鍚︽鏌ヨ繛鎺ユ湁鏁堟�э紝true姣忔閮芥鏌ワ紱false涓嶆鏌ャ��
+ testWhileIdle: true
+ #閰嶇疆浠庤繛鎺ユ睜鑾峰彇杩炴帴鏃跺拰鍚戣繛鎺ユ睜褰掕繕杩炴帴鏃讹紝鏄惁妫�鏌ヨ繛鎺ユ湁鏁堟��
+ #姣忔鑾峰彇鎴栧綊杩樿繛鎺ラ兘妫�娴嬪お棰戠箒锛岄櫎闈炵壒鍒噸瑕佹垨缃戠粶鐗瑰埆涓嶅彲闈犵瓑鎯呭喌锛屽缓璁敤testWhileIdle + timeBetweenEvictionRunsMillis浠ｆ浛銆�-->
+ testOnBorrow: false
+ testOnReturn: false
+ #閰嶇疆鏄惁瀹氭湡鎺㈡椿銆佹帰娲婚棿闅�, 榛樿120s
+ keepAlive: true
+ #keepAliveBetweenTimeMillis must be greater than timeBetweenEvictionRunsMillis
+ keepAliveBetweenTimeMillis: 1200000
+ #閰嶇疆涓�涓繛鎺ユ渶澶т娇鐢ㄦ鏁帮紝閬垮厤闀挎椂闂翠娇鐢ㄧ浉鍚岃繛鎺ラ�犳垚鏈嶅姟鍣ㄧ璐熻浇涓嶅潎琛°��
+ phyMaxUseCount: 1000
+ #鏄惁缂撳瓨preparedStatement锛屼篃灏辨槸PSCache銆侾SCache瀵规敮鎸佹父鏍囩殑鏁版嵁搴撴�ц兘鎻愬崌宸ㄥぇ锛屾瘮濡傝oracle銆傚湪mysql涓嬪缓璁叧闂��
+ poolPreparedStatements: false
+ #瑕佸惎鐢≒SCache锛屽繀椤婚厤缃ぇ浜�0锛屽綋澶т簬0鏃讹紝poolPreparedStatements鑷姩瑙﹀彂淇敼涓簍rue銆傚湪Druid涓紝涓嶄細瀛樺湪Oracle涓婸SCache鍗犵敤鍐呭瓨杩囧鐨勯棶棰橈紝鍙互鎶婅繖涓暟鍊奸厤缃ぇ涓�浜涳紝姣斿璇�100
+ maxOpenPreparedStatements: -1
+ #鎸囧畾姣忎釜杩炴帴涓奝SCache鐨勫ぇ灏�
+ maxPoolPreparedStatementPerConnectionSize: 20
+ #灞炴�х被鍨嬫槸瀛楃涓诧紝閫氳繃鍒悕鐨勬柟寮忛厤缃墿灞曟彃浠讹紝甯哥敤鐨勬彃浠舵湁锛�
+ #鐩戞帶缁熻鐢ㄧ殑filter:stat锛屾棩蹇楃敤鐨刦ilter:log4j锛岄槻寰ql娉ㄥ叆鐨刦ilter:wall
+ #filters: stat,wall,config
+ filters: wall,config
+ webStatFilter:
+ # 娣诲姞杩囨护瑙勫垯
+ urlPattern: /*
+ # 蹇界暐杩囨护鏍煎紡
+ exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
+ statViewServlet:
+ # 璁剧疆ip鐧藉悕鍗�
+ # allow: 127.0.0.1
+ # 璁剧疆ip榛戝悕鍗曪紝浼樺厛绾ч珮浜庣櫧鍚嶅崟
+ deny:
+ # 璁剧疆鎺у埗鍙扮鐞嗙敤鎴�
+ # loginUsername: root
+ # loginPassword: root
+ # 鏄惁鍙互閲嶇疆鏁版嵁
+ resetEnable: false
+ # 寮�鍚痙ruid鐩戞帶椤甸潰
+ #enabled: true
+ enabled: false
+
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-yq.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-yq.yml
new file mode 100644
index 0000000..d16ad9b
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-yq.yml
@@ -0,0 +1,69 @@
+# 鏁版嵁婧愰厤缃�
+spring:
+ datasource: #閰嶇疆鏁版嵁婧�
+ yq:
+ #name: ym
+ type: com.alibaba.druid.pool.DruidDataSource
+ driverClassName: com.mysql.cj.jdbc.Driver
+# url: jdbc:mysql://192.168.40.166:3306/pipIrr_yq?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql://8.130.130.233:3306/pipIrr_yq?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ url: jdbc:mysql://127.0.0.1:3306/pipIrr_yq?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ username: root
+ password: dysql,;.abc!@#
+ druid:
+ # 鏁版嵁婧愬悕绉帮細褰撳瓨鍦ㄥ涓暟鎹簮鏃讹紝璁剧疆鍚嶅瓧鍙互寰堟柟渚跨殑鏉ヨ繘琛屽尯鍒�,榛樿鑷姩鐢熸垚鍚嶇О锛屾牸寮忔槸锛�"DataSource-" + System.identityHashCode(this)
+ name: druid-mysql-yq
+ #閰嶇疆鍒濆鍖栧ぇ灏忋�佹渶灏忋�佹渶澶�
+ initialSize: 10
+ minIdle: 10
+ maxActive: 100
+ # 鑾峰彇杩炴帴鏃舵渶澶х瓑寰呮椂闂�,鍗曚綅姣銆傞厤缃簡maxWait涔嬪悗,缂虹渷鍚敤鍏钩閿�,骞跺彂鏁堢巼浼氭湁鎵�涓嬮檷,濡傛灉闇�瑕佸彲浠ラ�氳繃閰嶇疆useUnfairLock灞炴�т负true浣跨敤闈炲叕骞抽攣
+ maxWait: 60000
+ #閰嶇疆闂撮殧澶氫箙杩涜涓�娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆绉掋�� 榛樿鏄�60s锛屽お闀垮彲鑳戒細瀵艰嚧鏃犳硶鍙婃椂妫�娴嬪埌杩炴帴涓柇
+ timeBetweenEvictionRunsMillis: 60000
+ #閰嶇疆涓�涓繛鎺ュ湪杩炴帴姹犱腑鐨勬渶灏忕敓瀛樻椂闂淬�佹渶澶х敓瀛樻椂闂达紝瓒呰繃鏈�澶х敓瀛樻椂闂翠細琚Щ闄わ紝鍗曚綅姣銆�
+ minEvictableIdleTimeMillis: 300000
+ maxEvictableIdleTimeMillis: 900000
+ #鎺㈡椿銆侀獙璇侀摼鎺ユ湁鏁堟�х殑鏌ヨ锛屾柊鐗堟湰榛樿浣跨敤mysqlPing浠ｆ浛
+ #validation-query: select 1 #娉ㄩ噴鎺夛紝閲囩敤榛樿鐨刴ysqlPing
+ #閰嶇疆浠庤繛鎺ユ睜鑾峰彇杩炴帴鏃讹紝褰撹繛鎺ョ┖闂叉椂闂村ぇ浜巘imeBetweenEvictionRunsMillis鏃舵槸鍚︽鏌ヨ繛鎺ユ湁鏁堟�э紝true姣忔閮芥鏌ワ紱false涓嶆鏌ャ��
+ testWhileIdle: true
+ #閰嶇疆浠庤繛鎺ユ睜鑾峰彇杩炴帴鏃跺拰鍚戣繛鎺ユ睜褰掕繕杩炴帴鏃讹紝鏄惁妫�鏌ヨ繛鎺ユ湁鏁堟��
+ #姣忔鑾峰彇鎴栧綊杩樿繛鎺ラ兘妫�娴嬪お棰戠箒锛岄櫎闈炵壒鍒噸瑕佹垨缃戠粶鐗瑰埆涓嶅彲闈犵瓑鎯呭喌锛屽缓璁敤testWhileIdle + timeBetweenEvictionRunsMillis浠ｆ浛銆�-->
+ testOnBorrow: false
+ testOnReturn: false
+ #閰嶇疆鏄惁瀹氭湡鎺㈡椿銆佹帰娲婚棿闅�, 榛樿120s
+ keepAlive: true
+ #keepAliveBetweenTimeMillis must be greater than timeBetweenEvictionRunsMillis
+ keepAliveBetweenTimeMillis: 1200000
+ #閰嶇疆涓�涓繛鎺ユ渶澶т娇鐢ㄦ鏁帮紝閬垮厤闀挎椂闂翠娇鐢ㄧ浉鍚岃繛鎺ラ�犳垚鏈嶅姟鍣ㄧ璐熻浇涓嶅潎琛°��
+ phyMaxUseCount: 1000
+ #鏄惁缂撳瓨preparedStatement锛屼篃灏辨槸PSCache銆侾SCache瀵规敮鎸佹父鏍囩殑鏁版嵁搴撴�ц兘鎻愬崌宸ㄥぇ锛屾瘮濡傝oracle銆傚湪mysql涓嬪缓璁叧闂��
+ poolPreparedStatements: false
+ #瑕佸惎鐢≒SCache锛屽繀椤婚厤缃ぇ浜�0锛屽綋澶т簬0鏃讹紝poolPreparedStatements鑷姩瑙﹀彂淇敼涓簍rue銆傚湪Druid涓紝涓嶄細瀛樺湪Oracle涓婸SCache鍗犵敤鍐呭瓨杩囧鐨勯棶棰橈紝鍙互鎶婅繖涓暟鍊奸厤缃ぇ涓�浜涳紝姣斿璇�100
+ maxOpenPreparedStatements: -1
+ #鎸囧畾姣忎釜杩炴帴涓奝SCache鐨勫ぇ灏�
+ maxPoolPreparedStatementPerConnectionSize: 20
+ #灞炴�х被鍨嬫槸瀛楃涓诧紝閫氳繃鍒悕鐨勬柟寮忛厤缃墿灞曟彃浠讹紝甯哥敤鐨勬彃浠舵湁锛�
+ #鐩戞帶缁熻鐢ㄧ殑filter:stat锛屾棩蹇楃敤鐨刦ilter:log4j锛岄槻寰ql娉ㄥ叆鐨刦ilter:wall
+ #filters: stat,wall,config
+ filters: wall,config
+ webStatFilter:
+ # 娣诲姞杩囨护瑙勫垯
+ urlPattern: /*
+ # 蹇界暐杩囨护鏍煎紡
+ exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
+ statViewServlet:
+ # 璁剧疆ip鐧藉悕鍗�
+ # allow: 127.0.0.1
+ # 璁剧疆ip榛戝悕鍗曪紝浼樺厛绾ч珮浜庣櫧鍚嶅崟
+ deny:
+ # 璁剧疆鎺у埗鍙扮鐞嗙敤鎴�
+ # loginUsername: root
+ # loginPassword: root
+ # 鏄惁鍙互閲嶇疆鏁版嵁
+ resetEnable: false
+ # 寮�鍚痙ruid鐩戞帶椤甸潰
+ #enabled: true
+ enabled: false
+
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database.yml
index 9445737..640e5a8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-database.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database.yml
@@ -1,8 +1,6 @@
# 鏁版嵁婧愰厤缃�
spring:
#澶氭暟鎹簮闇�瑕侀厤缃�
- main:
- allow-bean-definition-overriding: true #璁剧疆涓簍rue鏃讹紝鍚庡畾涔夌殑bean浼氳鐩栦箣鍓嶅畾涔夌殑鐩稿悓鍚嶇О鐨刡ean
datasource: #閰嶇疆鏁版嵁婧�
#澶氫釜鏁版嵁婧愬悕绉板湪姝ら厤缃紝瑕佹眰涓巗pring銆俤atasource銆俒ym][sp][test]涓殑涓�鑷�
- names: ym,mj,sp,test,mq
+ names: ${common.spring_main_datasource_names}
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 7e9473f..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,4 +1,6 @@
spring:
+ main:
+ allow-bean-definition-overriding: true #璁剧疆涓簍rue鏃讹紝鍚庡畾涔夌殑bean浼氳鐩栦箣鍓嶅畾涔夌殑鐩稿悓鍚嶇О鐨刡ean
servlet:
multipart:
# 鍓嶇涓婁紶鏂囦欢锛岄檺鍒跺崟涓枃浠剁殑澶у皬鍜岄檺鍒舵墍鏈夋枃浠剁殑澶у皬
@@ -331,15 +333,30 @@
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"
#鎺ユ敹閫氫俊涓棿浠舵秷鎭腑蹇冩秷鎭殑鍦板潃
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mj\346\242\205\346\261\237\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mj\346\242\205\346\261\237\347\263\273\347\273\237\051.yml"
deleted file mode 100644
index 6dc9732..0000000
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mj\346\242\205\346\261\237\347\263\273\347\273\237\051.yml"
+++ /dev/null
@@ -1,423 +0,0 @@
-spring:
- 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
- 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 涓嶅啀搴旂敤锛屾敼涓篜rintSqlInterceptor鎷︽埅鍣ㄨ緭鍑簊ql鏃ュ織锛屼笅闈rint-sql椤归厤缃�
- print-sql: false # 杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞�
- #寮�鍚┘宄皍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: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
- dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
- nginx:
- root: D:/apps/pipIrr/nginx-1.27.0
- webPort: 54321
- webFilePort: 64321
- mw:
- webPort: 8071 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
- actutorPort: 9071 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪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
- # 2023-10-24鏂板锛岀敤浜庢墽琛屼复鏃朵换鍔★紝渚嬪鍒犻櫎鏁版嵁搴撲腑涓婁簺鍑洪敊鐨勬暟鎹�
- temp:
- webPort: 8099
- actutorPort: 9099
- idSuffix: 98
-
- # 鍒嗗竷寮弚eb鏂囦欢绯荤粺
- 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: ${pipIrr.nginx.root}/html/webfiles/
- relativePath: webFile1
- hashStart: 0
- hashEnd: 5461
- 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/
- relativePath: webFile2
- hashStart: 5462
- hashEnd: 10923
- 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.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.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.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.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.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.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.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.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.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/
- relativePath: webFile12
- hashStart: 60078
- hashEnd: 65535
- restUrl: http://127.0.0.1:${pipIrr.file12.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鎴栧煙鍚�
-
-#椤圭洰缂栧彿
-#projectCode:
-# ym: 100
-# sp: 101
-
-#椤圭洰閰嶇疆
-project:
- #椤圭洰缂栫爜
- projectNo: 10
- #鎺у埗鍣ㄧ被鍨�
- controllerType: 57
- #榛樿琛屾斂鍖哄垝缂栫爜锛堝ぉ娲�-澶╂触甯�-姝︽竻鍖�-浜花宸ヤ笟鍥�-澶х鑺傛按锛�
- divisionCode: 120114403100
-
-
-#閫氳涓棿浠剁浉鍏抽厤缃�
-#protocol: DYJS_2023,DYJS_2024
-mw:
- #鍛戒护鍙戦�侀�氫俊涓棿浠跺湴鍧�
- ym:
- url: "http://127.0.0.1:8070"
- comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
- 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"
- #Rtu杩滅▼鍛戒护缁撴灉鍥炶皟鍦板潃
- rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
- #鎺ユ敹閫氫俊涓棿浠舵秷鎭腑蹇冩秷鎭殑鍦板潃
- 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涓墍鏈夊瓧姣嶉兘灏忓啓
-tokennofilter:
- urls:
- - /sso/sso
- - /remote/comRes/receive
- - /remote/msCenter/receive
- - /remote/rtuUpgradeStateReceiver/receive
- - /remote/websocket
- - /wx/comRes/receive
- - /app/captcha/get
- - /file/file #web鍒嗗竷寮忔枃浠剁郴缁�
- - /file/fm #web鍒嗗竷寮忔枃浠剁郴缁�
-
-#鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
-auto-statistics:
- startHour: 0 #寮�濮嬪皬鏃讹紝蹇呴』鏄�0鐐规垨涔嬪悗锛屽彇鍊艰寖鍥存槸0~5锛屽惁StatisticsListener涓嚜鍔ㄨ缃垚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
- mj:
- enable: true #鏄惁鍚敤
- robot:
- url: https://oapi.dingtalk.com/robot/send
- access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
- secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
- at-all: true
- mobile: 18602657034
- mq:
- 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:
- 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\050mq\346\260\221\345\213\244\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mq\346\260\221\345\213\244\347\263\273\347\273\237\051.yml"
deleted file mode 100644
index a054371..0000000
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mq\346\260\221\345\213\244\347\263\273\347\273\237\051.yml"
+++ /dev/null
@@ -1,423 +0,0 @@
-spring:
- 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
- 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 涓嶅啀搴旂敤锛屾敼涓篜rintSqlInterceptor鎷︽埅鍣ㄨ緭鍑簊ql鏃ュ織锛屼笅闈rint-sql椤归厤缃�
- print-sql: false # 杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞�
- #寮�鍚┘宄皍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: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
- dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
- nginx:
- root: D:/apps/pipIrr/nginx-1.27.0
- webPort: 54321
- webFilePort: 64321
- mw:
- webPort: 8100 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
- actutorPort: 9100 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪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
- # 2023-10-24鏂板锛岀敤浜庢墽琛屼复鏃朵换鍔★紝渚嬪鍒犻櫎鏁版嵁搴撲腑涓婁簺鍑洪敊鐨勬暟鎹�
- temp:
- webPort: 8099
- actutorPort: 9099
- idSuffix: 98
-
- # 鍒嗗竷寮弚eb鏂囦欢绯荤粺
- 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: ${pipIrr.nginx.root}/html/webfiles/
- relativePath: webFile1
- hashStart: 0
- hashEnd: 5461
- 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/
- relativePath: webFile2
- hashStart: 5462
- hashEnd: 10923
- 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.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.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.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.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.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.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.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.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.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/
- relativePath: webFile12
- hashStart: 60078
- hashEnd: 65535
- restUrl: http://127.0.0.1:${pipIrr.file12.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鎴栧煙鍚�
-
-#椤圭洰缂栧彿
-#projectCode:
-# ym: 100
-# sp: 101
-
-#椤圭洰閰嶇疆
-project:
- #椤圭洰缂栫爜
- projectNo: 10
- #鎺у埗鍣ㄧ被鍨�
- controllerType: 57
- #榛樿琛屾斂鍖哄垝缂栫爜锛堝ぉ娲�-澶╂触甯�-姝︽竻鍖�-浜花宸ヤ笟鍥�-澶х鑺傛按锛�
- divisionCode: 120114403100
-
-
-#閫氳涓棿浠剁浉鍏抽厤缃�
-#protocol: DYJS_2023,DYJS_2024
-mw:
- #鍛戒护鍙戦�侀�氫俊涓棿浠跺湴鍧�
- ym:
- url: "http://127.0.0.1:8070"
- comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
- 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"
- #Rtu杩滅▼鍛戒护缁撴灉鍥炶皟鍦板潃
- rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
- #鎺ユ敹閫氫俊涓棿浠舵秷鎭腑蹇冩秷鎭殑鍦板潃
- 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涓墍鏈夊瓧姣嶉兘灏忓啓
-tokennofilter:
- urls:
- - /sso/sso
- - /remote/comRes/receive
- - /remote/msCenter/receive
- - /remote/rtuUpgradeStateReceiver/receive
- - /remote/websocket
- - /wx/comRes/receive
- - /app/captcha/get
- - /file/file #web鍒嗗竷寮忔枃浠剁郴缁�
- - /file/fm #web鍒嗗竷寮忔枃浠剁郴缁�
-
-#鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
-auto-statistics:
- startHour: 0 #寮�濮嬪皬鏃讹紝蹇呴』鏄�0鐐规垨涔嬪悗锛屽彇鍊艰寖鍥存槸0~5锛屽惁StatisticsListener涓嚜鍔ㄨ缃垚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
- mj:
- enable: true #鏄惁鍚敤
- robot:
- url: https://oapi.dingtalk.com/robot/send
- access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
- secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
- at-all: true
- mobile: 18602657034
- mq:
- 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:
- 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\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"
deleted file mode 100644
index 88d1599..0000000
--- "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"
+++ /dev/null
@@ -1,423 +0,0 @@
-spring:
- 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
- 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 涓嶅啀搴旂敤锛屾敼涓篜rintSqlInterceptor鎷︽埅鍣ㄨ緭鍑簊ql鏃ュ織锛屼笅闈rint-sql椤归厤缃�
- print-sql: false # 杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞�
- #寮�鍚┘宄皍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: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
- dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
- nginx:
- root: D:/apps/pipIrr/nginx-1.27.0
- webPort: 54321
- webFilePort: 64321
- mw:
- webPort: 8073 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
- actutorPort: 9073 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪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
- # 2023-10-24鏂板锛岀敤浜庢墽琛屼复鏃朵换鍔★紝渚嬪鍒犻櫎鏁版嵁搴撲腑涓婁簺鍑洪敊鐨勬暟鎹�
- temp:
- webPort: 8099
- actutorPort: 9099
- idSuffix: 98
-
- # 鍒嗗竷寮弚eb鏂囦欢绯荤粺
- 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: ${pipIrr.nginx.root}/html/webfiles/
- relativePath: webFile1
- hashStart: 0
- hashEnd: 5461
- 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/
- relativePath: webFile2
- hashStart: 5462
- hashEnd: 10923
- 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.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.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.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.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.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.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.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.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.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/
- relativePath: webFile12
- hashStart: 60078
- hashEnd: 65535
- restUrl: http://127.0.0.1:${pipIrr.file12.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鎴栧煙鍚�
-
-#椤圭洰缂栧彿
-#projectCode:
-# ym: 100
-# sp: 101
-
-#椤圭洰閰嶇疆
-project:
- #椤圭洰缂栫爜
- projectNo: 10
- #鎺у埗鍣ㄧ被鍨�
- controllerType: 57
- #榛樿琛屾斂鍖哄垝缂栫爜锛堝ぉ娲�-澶╂触甯�-姝︽竻鍖�-浜花宸ヤ笟鍥�-澶х鑺傛按锛�
- divisionCode: 120114403100
-
-
-#閫氳涓棿浠剁浉鍏抽厤缃�
-#protocol: DYJS_2023,DYJS_2024
-mw:
- #鍛戒护鍙戦�侀�氫俊涓棿浠跺湴鍧�
- ym:
- url: "http://127.0.0.1:8070"
- comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
- 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"
- #Rtu杩滅▼鍛戒护缁撴灉鍥炶皟鍦板潃
- rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
- #鎺ユ敹閫氫俊涓棿浠舵秷鎭腑蹇冩秷鎭殑鍦板潃
- 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涓墍鏈夊瓧姣嶉兘灏忓啓
-tokennofilter:
- urls:
- - /sso/sso
- - /remote/comRes/receive
- - /remote/msCenter/receive
- - /remote/rtuUpgradeStateReceiver/receive
- - /remote/websocket
- - /wx/comRes/receive
- - /app/captcha/get
- - /file/file #web鍒嗗竷寮忔枃浠剁郴缁�
- - /file/fm #web鍒嗗竷寮忔枃浠剁郴缁�
-
-#鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
-auto-statistics:
- startHour: 0 #寮�濮嬪皬鏃讹紝蹇呴』鏄�0鐐规垨涔嬪悗锛屽彇鍊艰寖鍥存槸0~5锛屽惁StatisticsListener涓嚜鍔ㄨ缃垚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
- mj:
- enable: true #鏄惁鍚敤
- robot:
- url: https://oapi.dingtalk.com/robot/send
- access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
- secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
- at-all: true
- mobile: 18602657034
- mq:
- 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:
- 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\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"
deleted file mode 100644
index 422f3ae..0000000
--- "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"
+++ /dev/null
@@ -1,423 +0,0 @@
-spring:
- 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
- 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 涓嶅啀搴旂敤锛屾敼涓篜rintSqlInterceptor鎷︽埅鍣ㄨ緭鍑簊ql鏃ュ織锛屼笅闈rint-sql椤归厤缃�
- print-sql: false # 杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞�
- #寮�鍚┘宄皍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: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
- dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
- nginx:
- root: D:/apps/pipIrr/nginx-1.27.0
- webPort: 54321
- webFilePort: 64321
- mw:
- webPort: 8072 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
- actutorPort: 9072 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪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
- # 2023-10-24鏂板锛岀敤浜庢墽琛屼复鏃朵换鍔★紝渚嬪鍒犻櫎鏁版嵁搴撲腑涓婁簺鍑洪敊鐨勬暟鎹�
- temp:
- webPort: 8099
- actutorPort: 9099
- idSuffix: 98
-
- # 鍒嗗竷寮弚eb鏂囦欢绯荤粺
- 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: ${pipIrr.nginx.root}/html/webfiles/
- relativePath: webFile1
- hashStart: 0
- hashEnd: 5461
- 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/
- relativePath: webFile2
- hashStart: 5462
- hashEnd: 10923
- 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.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.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.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.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.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.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.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.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.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/
- relativePath: webFile12
- hashStart: 60078
- hashEnd: 65535
- restUrl: http://127.0.0.1:${pipIrr.file12.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鎴栧煙鍚�
-
-#椤圭洰缂栧彿
-#projectCode:
-# ym: 100
-# sp: 101
-
-#椤圭洰閰嶇疆
-project:
- #椤圭洰缂栫爜
- projectNo: 10
- #鎺у埗鍣ㄧ被鍨�
- controllerType: 57
- #榛樿琛屾斂鍖哄垝缂栫爜锛堝ぉ娲�-澶╂触甯�-姝︽竻鍖�-浜花宸ヤ笟鍥�-澶х鑺傛按锛�
- divisionCode: 120114403100
-
-
-#閫氳涓棿浠剁浉鍏抽厤缃�
-#protocol: DYJS_2023,DYJS_2024
-mw:
- #鍛戒护鍙戦�侀�氫俊涓棿浠跺湴鍧�
- ym:
- url: "http://127.0.0.1:8070"
- comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
- 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"
- #Rtu杩滅▼鍛戒护缁撴灉鍥炶皟鍦板潃
- rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
- #鎺ユ敹閫氫俊涓棿浠舵秷鎭腑蹇冩秷鎭殑鍦板潃
- 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涓墍鏈夊瓧姣嶉兘灏忓啓
-tokennofilter:
- urls:
- - /sso/sso
- - /remote/comRes/receive
- - /remote/msCenter/receive
- - /remote/rtuUpgradeStateReceiver/receive
- - /remote/websocket
- - /wx/comRes/receive
- - /app/captcha/get
- - /file/file #web鍒嗗竷寮忔枃浠剁郴缁�
- - /file/fm #web鍒嗗竷寮忔枃浠剁郴缁�
-
-#鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
-auto-statistics:
- startHour: 0 #寮�濮嬪皬鏃讹紝蹇呴』鏄�0鐐规垨涔嬪悗锛屽彇鍊艰寖鍥存槸0~5锛屽惁StatisticsListener涓嚜鍔ㄨ缃垚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
- mj:
- enable: true #鏄惁鍚敤
- robot:
- url: https://oapi.dingtalk.com/robot/send
- access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
- secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
- at-all: true
- mobile: 18602657034
- mq:
- 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:
- 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\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"
deleted file mode 100644
index ae76e9e..0000000
--- "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"
+++ /dev/null
@@ -1,423 +0,0 @@
-spring:
- 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
- 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 涓嶅啀搴旂敤锛屾敼涓篜rintSqlInterceptor鎷︽埅鍣ㄨ緭鍑簊ql鏃ュ織锛屼笅闈rint-sql椤归厤缃�
- print-sql: false # 杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞�
- #寮�鍚┘宄皍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: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
- dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
- nginx:
- root: D:/apps/pipIrr/nginx-1.27.0
- webPort: 54321
- webFilePort: 64321
- 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
- # 2023-10-24鏂板锛岀敤浜庢墽琛屼复鏃朵换鍔★紝渚嬪鍒犻櫎鏁版嵁搴撲腑涓婁簺鍑洪敊鐨勬暟鎹�
- temp:
- webPort: 8099
- actutorPort: 9099
- idSuffix: 98
-
- # 鍒嗗竷寮弚eb鏂囦欢绯荤粺
- 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: ${pipIrr.nginx.root}/html/webfiles/
- relativePath: webFile1
- hashStart: 0
- hashEnd: 5461
- 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/
- relativePath: webFile2
- hashStart: 5462
- hashEnd: 10923
- 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.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.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.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.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.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.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.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.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.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/
- relativePath: webFile12
- hashStart: 60078
- hashEnd: 65535
- restUrl: http://127.0.0.1:${pipIrr.file12.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鎴栧煙鍚�
-
-#椤圭洰缂栧彿
-#projectCode:
-# ym: 100
-# sp: 101
-
-#椤圭洰閰嶇疆
-project:
- #椤圭洰缂栫爜
- projectNo: 10
- #鎺у埗鍣ㄧ被鍨�
- controllerType: 57
- #榛樿琛屾斂鍖哄垝缂栫爜锛堝ぉ娲�-澶╂触甯�-姝︽竻鍖�-浜花宸ヤ笟鍥�-澶х鑺傛按锛�
- divisionCode: 120114403100
-
-
-#閫氳涓棿浠剁浉鍏抽厤缃�
-#protocol: DYJS_2023,DYJS_2024
-mw:
- #鍛戒护鍙戦�侀�氫俊涓棿浠跺湴鍧�
- ym:
- url: "http://127.0.0.1:8070"
- comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
- 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"
- #Rtu杩滅▼鍛戒护缁撴灉鍥炶皟鍦板潃
- rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
- #鎺ユ敹閫氫俊涓棿浠舵秷鎭腑蹇冩秷鎭殑鍦板潃
- 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涓墍鏈夊瓧姣嶉兘灏忓啓
-tokennofilter:
- urls:
- - /sso/sso
- - /remote/comRes/receive
- - /remote/msCenter/receive
- - /remote/rtuUpgradeStateReceiver/receive
- - /remote/websocket
- - /wx/comRes/receive
- - /app/captcha/get
- - /file/file #web鍒嗗竷寮忔枃浠剁郴缁�
- - /file/fm #web鍒嗗竷寮忔枃浠剁郴缁�
-
-#鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
-auto-statistics:
- startHour: 0 #寮�濮嬪皬鏃讹紝蹇呴』鏄�0鐐规垨涔嬪悗锛屽彇鍊艰寖鍥存槸0~5锛屽惁StatisticsListener涓嚜鍔ㄨ缃垚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
- mj:
- enable: true #鏄惁鍚敤
- robot:
- url: https://oapi.dingtalk.com/robot/send
- access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
- secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
- at-all: true
- mobile: 18602657034
- mq:
- 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:
- 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 7e9473f..2fffebe 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -1,4 +1,6 @@
spring:
+ main:
+ allow-bean-definition-overriding: true #璁剧疆涓簍rue鏃讹紝鍚庡畾涔夌殑bean浼氳鐩栦箣鍓嶅畾涔夌殑鐩稿悓鍚嶇О鐨刡ean
servlet:
multipart:
# 鍓嶇涓婁紶鏂囦欢锛岄檺鍒跺崟涓枃浠剁殑澶у皬鍜岄檺鍒舵墍鏈夋枃浠剁殑澶у皬
@@ -86,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 #鐧诲綍鐢ㄦ埛缂撳瓨鍙紦瀛樼敤鎴风殑鏈�澶у��
@@ -204,8 +206,8 @@
hashStart: 0
hashEnd: 5461
restUrl: http://127.0.0.1:${pipIrr.file1.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鎴栧煙鍚�
+ 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/
@@ -213,8 +215,8 @@
hashStart: 5462
hashEnd: 10923
restUrl: http://127.0.0.1:${pipIrr.file2.webPort}/file
- 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鎴栧煙鍚�
+ 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/
@@ -222,8 +224,8 @@
hashStart: 10924
hashEnd: 16385
restUrl: http://127.0.0.1:${pipIrr.file3.webPort}/file
- 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鎴栧煙鍚�
+ 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/
@@ -231,8 +233,8 @@
hashStart: 16386
hashEnd: 21847
restUrl: http://127.0.0.1:${pipIrr.file4.webPort}/file
- 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鎴栧煙鍚�
+ 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/
@@ -240,8 +242,8 @@
hashStart: 21848
hashEnd: 27309
restUrl: http://127.0.0.1:${pipIrr.file5.webPort}/file
- 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鎴栧煙鍚�
+ 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/
@@ -249,8 +251,8 @@
hashStart: 27310
hashEnd: 32767
restUrl: http://127.0.0.1:${pipIrr.file6.webPort}/file
- 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鎴栧煙鍚�
+ 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/
@@ -258,8 +260,8 @@
hashStart: 32768
hashEnd: 38229
restUrl: http://127.0.0.1:${pipIrr.file7.webPort}/file
- 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鎴栧煙鍚�
+ 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/
@@ -267,8 +269,8 @@
hashStart: 38230
hashEnd: 43691
restUrl: http://127.0.0.1:${pipIrr.file8.webPort}/file
- 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鎴栧煙鍚�
+ 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/
@@ -276,8 +278,8 @@
hashStart: 43692
hashEnd: 49153
restUrl: http://127.0.0.1:${pipIrr.file9.webPort}/file
- 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鎴栧煙鍚�
+ 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/
@@ -285,8 +287,8 @@
hashStart: 49154
hashEnd: 54615
restUrl: http://127.0.0.1:${pipIrr.file10.webPort}/file
- 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鎴栧煙鍚�
+ 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/
@@ -294,8 +296,8 @@
hashStart: 54616
hashEnd: 60077
restUrl: http://127.0.0.1:${pipIrr.file11.webPort}/file
- 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鎴栧煙鍚�
+ 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/
@@ -303,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/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ 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:
@@ -331,15 +333,30 @@
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"
#鎺ユ敹閫氫俊涓棿浠舵秷鎭腑蹇冩秷鎭殑鍦板潃
@@ -370,7 +387,7 @@
#閽夐拤娑堟伅鎺ㄩ��
dingtalk:
ym:
- enable: true #鏄惁鍚敤
+ enable: false #鏄惁鍚敤
robot:
url: https://oapi.dingtalk.com/robot/send
access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
@@ -378,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
@@ -394,7 +403,7 @@
at-all: true
mobile: 18602657034
sp:
- enable: true #鏄惁鍚敤
+ enable: false #鏄惁鍚敤
robot:
url: https://oapi.dingtalk.com/robot/send
access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
@@ -402,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
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/init-config\050121\346\234\215\345\212\241\345\231\250\051.xml" "b/pipIrr-platform/pipIrr-global/src/main/resources/init-config\050121\346\234\215\345\212\241\345\231\250\051.xml"
new file mode 100644
index 0000000..3d1fb9a
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/init-config\050121\346\234\215\345\212\241\345\231\250\051.xml"
@@ -0,0 +1,384 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config>
+ <orgs>
+ <!-- 澶氫釜缁勭粐锛岀敤缂栧彿鍖哄垎锛岀紪鍙蜂粠1寮�濮嬶紝enable琛ㄧず鏄惁鍚敤 -->
+ <org1 tag="mq" name="姘戝嫟" enable="true">
+ <districts>
+ <province name="鐢樿們鐪�" num="62" level="0">
+ <city name="姝﹀▉甯�" num="06" level="1">
+ <country name="姘戝嫟鍘�" num="21" level="2" />
+ </city>
+ </province>
+ </districts>
+ <dictionaries>
+ <dict code="icProtocol" title="IC鍗″崗璁�" valueType="2">
+ <dictItem>
+ <!-- 闈冲缓浼熺増鏈琁C鍗″崗璁� 鍗′腑缂栧彿宸茬粡鍔犻暱锛堜笌鐜嬫睙娴风増鏈竴鑷达級锛屼笌绾�佺増鏈崗璁笉鍚� -->
+ <item1 dictCode="icProtocol" value="icP202203" name="鑰佸崱鍗忚" status="1" sort="0" />
+ <!-- 鐜嬫睙娴风増鏈琁C鍗″崗璁� -->
+ <item2 dictCode="icProtocol" value="icP202404" name="鏂板崱鍗忚" status="0" sort="1" />
+ </dictItem>
+ </dict>
+ </dictionaries>
+ <user name="瓒呯骇绠＄悊鍛�" phone="admin" password="dyyjy" supperAdmin="1" />
+ <payments>
+ <item1 name="鐜伴噾"/>
+ <item2 name="POS鏈�"/>
+ <item3 name="閾惰杞处"/>
+ </payments>
+ <settings>
+ <item1 item_name="lng" item_value="103.09122920036317" remarks="缁忓害"/>
+ <item2 item_name="lat" item_value="38.62387375005241" remarks="绾害"/>
+ <item3 item_name="zoomMp" item_value="12" remarks="鎵嬫満鍦板浘缂╂斁绾у埆"/>
+ <item4 item_name="zoomPc" item_value="19" remarks="PC鏈哄湴鍥剧缉鏀剧骇鍒�"/>
+ <item5 item_name="projectName" item_value="楂樻晥鏅烘収绠＄亴寰亴浜戞湇鍔＄鐞嗗钩鍙�" remarks="椤圭洰鍚嶇О"/>
+ </settings>
+ <waterTypes>
+ <item1 typeName="鐏屾簤鐢ㄦ按"/>
+ <item2 typeName="宸ヤ笟鐢ㄦ按"/>
+ <item3 typeName="鐢熸椿鐢ㄦ按"/>
+ <item4 typeName="鍏绘畺鐢ㄦ按"/>
+ <item5 typeName="缁垮寲鐢ㄦ按"/>
+ </waterTypes>
+ <waterPrice price="0.90" />
+ <irrigateProfile>
+ <item1 defaultValue = "10" unit = "2" sort = "1" type = "1"/>
+ <item2 defaultValue = "20" unit = "2" sort = "2" type = "1" />
+ <item3 defaultValue = "1" unit = "1" sort = "3" type = "1"/>
+ <item4 defaultValue = "2" unit = "1" sort = "4" type = "1"/>
+ <item5 defaultValue = "20" unit = "3" sort = "1" type = "2"/>
+ <item6 defaultValue = "30" unit = "3" sort = "2" type = "2"/>
+ <item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/>
+ <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
+ </irrigateProfile>
+ <rechargeProfile>
+ <item1 rechargeAmount = "50" sort = "1"/>
+ <item2 rechargeAmount = "100" sort = "2" />
+ <item3 rechargeAmount = "200" sort = "3"/>
+ <item4 rechargeAmount = "300" sort = "4"/>
+ <item5 rechargeAmount = "500" sort = "5"/>
+ <item6 rechargeAmount = "1000" sort = "6"/>
+ </rechargeProfile>
+ <taskType>
+ <item1 typeName="璁惧瀹夎"/>
+ <item2 typeName="璁惧缁翠慨"/>
+ <item3 typeName="璁惧淇濆吇"/>
+ </taskType>
+ </org1>
+ <org2 tag="yq" name="寤跺簡" enable="true">
+ <districts>
+ <province name="鍖椾含甯�" num="11" level="0">
+ <city name="鍖椾含甯�" num="01" level="1">
+ <country name="寤跺簡鍖�" num="19" level="2" />
+ </city>
+ </province>
+ </districts>
+ <dictionaries>
+ <dict code="icProtocol" title="IC鍗″崗璁�" valueType="2">
+ <dictItem>
+ <!-- 闈冲缓浼熺増鏈琁C鍗″崗璁� 鍗′腑缂栧彿宸茬粡鍔犻暱锛堜笌鐜嬫睙娴风増鏈竴鑷达級锛屼笌绾�佺増鏈崗璁笉鍚� -->
+ <item1 dictCode="icProtocol" value="icP202203" name="鑰佸崱鍗忚" status="1" sort="0" />
+ <!-- 鐜嬫睙娴风増鏈琁C鍗″崗璁� -->
+ <item2 dictCode="icProtocol" value="icP202404" name="鏂板崱鍗忚" status="0" sort="1" />
+ </dictItem>
+ </dict>
+ </dictionaries>
+ <user name="瓒呯骇绠＄悊鍛�" phone="admin" password="dyyjy" supperAdmin="1" />
+ <payments>
+ <item1 name="鐜伴噾"/>
+ <item2 name="POS鏈�"/>
+ <item3 name="閾惰杞处"/>
+ </payments>
+ <settings>
+ <item1 item_name="lng" item_value="115.96875071525575" remarks="缁忓害"/>
+ <item2 item_name="lat" item_value="40.45565885043379" remarks="绾害"/>
+ <item3 item_name="zoomMp" item_value="12" remarks="鎵嬫満鍦板浘缂╂斁绾у埆"/>
+ <item4 item_name="zoomPc" item_value="19" remarks="PC鏈哄湴鍥剧缉鏀剧骇鍒�"/>
+ <item5 item_name="projectName" item_value="楂樻晥鏅烘収绠＄亴寰亴浜戞湇鍔＄鐞嗗钩鍙�" remarks="椤圭洰鍚嶇О"/>
+ </settings>
+ <waterTypes>
+ <item1 typeName="鐏屾簤鐢ㄦ按"/>
+ <item2 typeName="宸ヤ笟鐢ㄦ按"/>
+ <item3 typeName="鐢熸椿鐢ㄦ按"/>
+ <item4 typeName="鍏绘畺鐢ㄦ按"/>
+ <item5 typeName="缁垮寲鐢ㄦ按"/>
+ </waterTypes>
+ <waterPrice price="0.90" />
+ <irrigateProfile>
+ <item1 defaultValue = "10" unit = "2" sort = "1" type = "1"/>
+ <item2 defaultValue = "20" unit = "2" sort = "2" type = "1" />
+ <item3 defaultValue = "1" unit = "1" sort = "3" type = "1"/>
+ <item4 defaultValue = "2" unit = "1" sort = "4" type = "1"/>
+ <item5 defaultValue = "20" unit = "3" sort = "1" type = "2"/>
+ <item6 defaultValue = "30" unit = "3" sort = "2" type = "2"/>
+ <item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/>
+ <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
+ </irrigateProfile>
+ <rechargeProfile>
+ <item1 rechargeAmount = "50" sort = "1"/>
+ <item2 rechargeAmount = "100" sort = "2" />
+ <item3 rechargeAmount = "200" sort = "3"/>
+ <item4 rechargeAmount = "300" sort = "4"/>
+ <item5 rechargeAmount = "500" sort = "5"/>
+ <item6 rechargeAmount = "1000" sort = "6"/>
+ </rechargeProfile>
+ <taskType>
+ <item1 typeName="璁惧瀹夎"/>
+ <item2 typeName="璁惧缁翠慨"/>
+ <item3 typeName="璁惧淇濆吇"/>
+ </taskType>
+ </org2>
+ <org3 tag="hlj" name="榛戦緳姹�" enable="true">
+ <districts>
+ <province name="榛戦緳姹熺渷" num="23" level="0">
+ <city name="鍦板競" num="06" level="1">
+ <country name="鍖哄幙" num="24" level="2" />
+ </city>
+ </province>
+ </districts>
+ <dictionaries>
+ <dict code="icProtocol" title="IC鍗″崗璁�" valueType="2">
+ <dictItem>
+ <!-- 闈冲缓浼熺増鏈琁C鍗″崗璁� 鍗′腑缂栧彿宸茬粡鍔犻暱锛堜笌鐜嬫睙娴风増鏈竴鑷达級锛屼笌绾�佺増鏈崗璁笉鍚� -->
+ <item1 dictCode="icProtocol" value="icP202203" name="鑰佸崱鍗忚" status="1" sort="0" />
+ <!-- 鐜嬫睙娴风増鏈琁C鍗″崗璁� -->
+ <item2 dictCode="icProtocol" value="icP202404" name="鏂板崱鍗忚" status="0" sort="1" />
+ </dictItem>
+ </dict>
+ </dictionaries>
+ <user name="瓒呯骇绠＄悊鍛�" phone="admin" password="dyyjy" supperAdmin="1" />
+ <payments>
+ <item1 name="鐜伴噾"/>
+ <item2 name="POS鏈�"/>
+ <item3 name="閾惰杞处"/>
+ </payments>
+ <settings>
+ <item1 item_name="lng" item_value="126.56593322753908" remarks="缁忓害"/>
+ <item2 item_name="lat" item_value="45.78421494658246" remarks="绾害"/>
+ <item3 item_name="zoomMp" item_value="12" remarks="鎵嬫満鍦板浘缂╂斁绾у埆"/>
+ <item4 item_name="zoomPc" item_value="19" remarks="PC鏈哄湴鍥剧缉鏀剧骇鍒�"/>
+ <item5 item_name="projectName" item_value="楂樻晥鏅烘収绠＄亴寰亴浜戞湇鍔＄鐞嗗钩鍙�" remarks="椤圭洰鍚嶇О"/>
+ </settings>
+ <waterTypes>
+ <item1 typeName="鐏屾簤鐢ㄦ按"/>
+ <item2 typeName="宸ヤ笟鐢ㄦ按"/>
+ <item3 typeName="鐢熸椿鐢ㄦ按"/>
+ <item4 typeName="鍏绘畺鐢ㄦ按"/>
+ <item5 typeName="缁垮寲鐢ㄦ按"/>
+ </waterTypes>
+ <waterPrice price="0.90" />
+ <irrigateProfile>
+ <item1 defaultValue = "10" unit = "2" sort = "1" type = "1"/>
+ <item2 defaultValue = "20" unit = "2" sort = "2" type = "1" />
+ <item3 defaultValue = "1" unit = "1" sort = "3" type = "1"/>
+ <item4 defaultValue = "2" unit = "1" sort = "4" type = "1"/>
+ <item5 defaultValue = "20" unit = "3" sort = "1" type = "2"/>
+ <item6 defaultValue = "30" unit = "3" sort = "2" type = "2"/>
+ <item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/>
+ <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
+ </irrigateProfile>
+ <rechargeProfile>
+ <item1 rechargeAmount = "50" sort = "1"/>
+ <item2 rechargeAmount = "100" sort = "2" />
+ <item3 rechargeAmount = "200" sort = "3"/>
+ <item4 rechargeAmount = "300" sort = "4"/>
+ <item5 rechargeAmount = "500" sort = "5"/>
+ <item6 rechargeAmount = "1000" sort = "6"/>
+ </rechargeProfile>
+ <taskType>
+ <item1 typeName="璁惧瀹夎"/>
+ <item2 typeName="璁惧缁翠慨"/>
+ <item3 typeName="璁惧淇濆吇"/>
+ </taskType>
+ </org3>
+ <org4 tag="gz" name="鐢樺窞" enable="true">
+ <districts>
+ <province name="鐢樿們鐪�" num="62" level="0">
+ <city name="寮犳帠甯�" num="07" level="1">
+ <country name="鐢樺窞鍖�" num="02" level="2" />
+ </city>
+ </province>
+ </districts>
+ <dictionaries>
+ <dict code="icProtocol" title="IC鍗″崗璁�" valueType="2">
+ <dictItem>
+ <!-- 闈冲缓浼熺増鏈琁C鍗″崗璁� 鍗′腑缂栧彿宸茬粡鍔犻暱锛堜笌鐜嬫睙娴风増鏈竴鑷达級锛屼笌绾�佺増鏈崗璁笉鍚� -->
+ <item1 dictCode="icProtocol" value="icP202203" name="鑰佸崱鍗忚" status="1" sort="0" />
+ <!-- 鐜嬫睙娴风増鏈琁C鍗″崗璁� -->
+ <item2 dictCode="icProtocol" value="icP202404" name="鏂板崱鍗忚" status="0" sort="1" />
+ </dictItem>
+ </dict>
+ </dictionaries>
+ <user name="瓒呯骇绠＄悊鍛�" phone="admin" password="dyyjy" supperAdmin="1" />
+ <payments>
+ <item1 name="鐜伴噾"/>
+ <item2 name="POS鏈�"/>
+ <item3 name="閾惰杞处"/>
+ </payments>
+ <settings>
+ <item1 item_name="lng" item_value="100.41364431381226" remarks="缁忓害"/>
+ <item2 item_name="lat" item_value="38.94326819677022" remarks="绾害"/>
+ <item3 item_name="zoomMp" item_value="12" remarks="鎵嬫満鍦板浘缂╂斁绾у埆"/>
+ <item4 item_name="zoomPc" item_value="19" remarks="PC鏈哄湴鍥剧缉鏀剧骇鍒�"/>
+ <item5 item_name="projectName" item_value="楂樻晥鏅烘収绠＄亴寰亴浜戞湇鍔＄鐞嗗钩鍙�" remarks="椤圭洰鍚嶇О"/>
+ </settings>
+ <waterTypes>
+ <item1 typeName="鐏屾簤鐢ㄦ按"/>
+ <item2 typeName="宸ヤ笟鐢ㄦ按"/>
+ <item3 typeName="鐢熸椿鐢ㄦ按"/>
+ <item4 typeName="鍏绘畺鐢ㄦ按"/>
+ <item5 typeName="缁垮寲鐢ㄦ按"/>
+ </waterTypes>
+ <waterPrice price="0.90" />
+ <irrigateProfile>
+ <item1 defaultValue = "10" unit = "2" sort = "1" type = "1"/>
+ <item2 defaultValue = "20" unit = "2" sort = "2" type = "1" />
+ <item3 defaultValue = "1" unit = "1" sort = "3" type = "1"/>
+ <item4 defaultValue = "2" unit = "1" sort = "4" type = "1"/>
+ <item5 defaultValue = "20" unit = "3" sort = "1" type = "2"/>
+ <item6 defaultValue = "30" unit = "3" sort = "2" type = "2"/>
+ <item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/>
+ <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
+ </irrigateProfile>
+ <rechargeProfile>
+ <item1 rechargeAmount = "50" sort = "1"/>
+ <item2 rechargeAmount = "100" sort = "2" />
+ <item3 rechargeAmount = "200" sort = "3"/>
+ <item4 rechargeAmount = "300" sort = "4"/>
+ <item5 rechargeAmount = "500" sort = "5"/>
+ <item6 rechargeAmount = "1000" sort = "6"/>
+ </rechargeProfile>
+ <taskType>
+ <item1 typeName="璁惧瀹夎"/>
+ <item2 typeName="璁惧缁翠慨"/>
+ <item3 typeName="璁惧淇濆吇"/>
+ </taskType>
+ </org4>
+ <org4 tag="lz" name="鍑夊窞" enable="true">
+ <districts>
+ <province name="鐢樿們鐪�" num="62" level="0">
+ <city name="姝﹀▉甯�" num="06" level="1">
+ <country name="鍑夊窞鍖�" num="02" level="2" />
+ </city>
+ </province>
+ </districts>
+ <dictionaries>
+ <dict code="icProtocol" title="IC鍗″崗璁�" valueType="2">
+ <dictItem>
+ <!-- 闈冲缓浼熺増鏈琁C鍗″崗璁� 鍗′腑缂栧彿宸茬粡鍔犻暱锛堜笌鐜嬫睙娴风増鏈竴鑷达級锛屼笌绾�佺増鏈崗璁笉鍚� -->
+ <item1 dictCode="icProtocol" value="icP202203" name="鑰佸崱鍗忚" status="1" sort="0" />
+ <!-- 鐜嬫睙娴风増鏈琁C鍗″崗璁� -->
+ <item2 dictCode="icProtocol" value="icP202404" name="鏂板崱鍗忚" status="0" sort="1" />
+ </dictItem>
+ </dict>
+ </dictionaries>
+ <user name="瓒呯骇绠＄悊鍛�" phone="admin" password="dyyjy" supperAdmin="1" />
+ <payments>
+ <item1 name="鐜伴噾"/>
+ <item2 name="POS鏈�"/>
+ <item3 name="閾惰杞处"/>
+ </payments>
+ <settings>
+ <item1 item_name="lng" item_value="102.61985778808594" remarks="缁忓害"/>
+ <item2 item_name="lat" item_value="37.93533677500249" remarks="绾害"/>
+ <item3 item_name="zoomMp" item_value="12" remarks="鎵嬫満鍦板浘缂╂斁绾у埆"/>
+ <item4 item_name="zoomPc" item_value="19" remarks="PC鏈哄湴鍥剧缉鏀剧骇鍒�"/>
+ <item5 item_name="projectName" item_value="楂樻晥鏅烘収绠＄亴寰亴浜戞湇鍔＄鐞嗗钩鍙�" remarks="椤圭洰鍚嶇О"/>
+ </settings>
+ <waterTypes>
+ <item1 typeName="鐏屾簤鐢ㄦ按"/>
+ <item2 typeName="宸ヤ笟鐢ㄦ按"/>
+ <item3 typeName="鐢熸椿鐢ㄦ按"/>
+ <item4 typeName="鍏绘畺鐢ㄦ按"/>
+ <item5 typeName="缁垮寲鐢ㄦ按"/>
+ </waterTypes>
+ <waterPrice price="0.90" />
+ <irrigateProfile>
+ <item1 defaultValue = "10" unit = "2" sort = "1" type = "1"/>
+ <item2 defaultValue = "20" unit = "2" sort = "2" type = "1" />
+ <item3 defaultValue = "1" unit = "1" sort = "3" type = "1"/>
+ <item4 defaultValue = "2" unit = "1" sort = "4" type = "1"/>
+ <item5 defaultValue = "20" unit = "3" sort = "1" type = "2"/>
+ <item6 defaultValue = "30" unit = "3" sort = "2" type = "2"/>
+ <item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/>
+ <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
+ </irrigateProfile>
+ <rechargeProfile>
+ <item1 rechargeAmount = "50" sort = "1"/>
+ <item2 rechargeAmount = "100" sort = "2" />
+ <item3 rechargeAmount = "200" sort = "3"/>
+ <item4 rechargeAmount = "300" sort = "4"/>
+ <item5 rechargeAmount = "500" sort = "5"/>
+ <item6 rechargeAmount = "1000" sort = "6"/>
+ </rechargeProfile>
+ <taskType>
+ <item1 typeName="璁惧瀹夎"/>
+ <item2 typeName="璁惧缁翠慨"/>
+ <item3 typeName="璁惧淇濆吇"/>
+ </taskType>
+ </org4>
+ <org5 tag="jc" name="閲戝窛" enable="true">
+ <districts>
+ <province name="鐢樿們鐪�" num="62" level="0">
+ <city name="閲戞槍甯�" num="03" level="1">
+ <country name="閲戝窛鍖�" num="02" level="2" />
+ </city>
+ </province>
+ </districts>
+ <dictionaries>
+ <dict code="icProtocol" title="IC鍗″崗璁�" valueType="2">
+ <dictItem>
+ <!-- 闈冲缓浼熺増鏈琁C鍗″崗璁� 鍗′腑缂栧彿宸茬粡鍔犻暱锛堜笌鐜嬫睙娴风増鏈竴鑷达級锛屼笌绾�佺増鏈崗璁笉鍚� -->
+ <item1 dictCode="icProtocol" value="icP202203" name="鑰佸崱鍗忚" status="1" sort="0" />
+ <!-- 鐜嬫睙娴风増鏈琁C鍗″崗璁� -->
+ <item2 dictCode="icProtocol" value="icP202404" name="鏂板崱鍗忚" status="0" sort="1" />
+ </dictItem>
+ </dict>
+ </dictionaries>
+ <user name="瓒呯骇绠＄悊鍛�" phone="admin" password="dyyjy" supperAdmin="1" />
+ <payments>
+ <item1 name="鐜伴噾"/>
+ <item2 name="POS鏈�"/>
+ <item3 name="閾惰杞处"/>
+ </payments>
+ <settings>
+ <item1 item_name="lng" item_value="102.17924594879152" remarks="缁忓害"/>
+ <item2 item_name="lat" item_value="38.51321605740297" remarks="绾害"/>
+ <item3 item_name="zoomMp" item_value="12" remarks="鎵嬫満鍦板浘缂╂斁绾у埆"/>
+ <item4 item_name="zoomPc" item_value="19" remarks="PC鏈哄湴鍥剧缉鏀剧骇鍒�"/>
+ <item5 item_name="projectName" item_value="楂樻晥鏅烘収绠＄亴寰亴浜戞湇鍔＄鐞嗗钩鍙�" remarks="椤圭洰鍚嶇О"/>
+ </settings>
+ <waterTypes>
+ <item1 typeName="鐏屾簤鐢ㄦ按"/>
+ <item2 typeName="宸ヤ笟鐢ㄦ按"/>
+ <item3 typeName="鐢熸椿鐢ㄦ按"/>
+ <item4 typeName="鍏绘畺鐢ㄦ按"/>
+ <item5 typeName="缁垮寲鐢ㄦ按"/>
+ </waterTypes>
+ <waterPrice price="0.90" />
+ <irrigateProfile>
+ <item1 defaultValue = "10" unit = "2" sort = "1" type = "1"/>
+ <item2 defaultValue = "20" unit = "2" sort = "2" type = "1" />
+ <item3 defaultValue = "1" unit = "1" sort = "3" type = "1"/>
+ <item4 defaultValue = "2" unit = "1" sort = "4" type = "1"/>
+ <item5 defaultValue = "20" unit = "3" sort = "1" type = "2"/>
+ <item6 defaultValue = "30" unit = "3" sort = "2" type = "2"/>
+ <item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/>
+ <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
+ </irrigateProfile>
+ <rechargeProfile>
+ <item1 rechargeAmount = "50" sort = "1"/>
+ <item2 rechargeAmount = "100" sort = "2" />
+ <item3 rechargeAmount = "200" sort = "3"/>
+ <item4 rechargeAmount = "300" sort = "4"/>
+ <item5 rechargeAmount = "500" sort = "5"/>
+ <item6 rechargeAmount = "1000" sort = "6"/>
+ </rechargeProfile>
+ <taskType>
+ <item1 typeName="璁惧瀹夎"/>
+ <item2 typeName="璁惧缁翠慨"/>
+ <item3 typeName="璁惧淇濆吇"/>
+ </taskType>
+ </org5>
+ </orgs>
+</config>
\ No newline at end of file
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/init-config\050233\346\234\215\345\212\241\345\231\250\051.xml" "b/pipIrr-platform/pipIrr-global/src/main/resources/init-config\050233\346\234\215\345\212\241\345\231\250\051.xml"
new file mode 100644
index 0000000..a8b54fa
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/init-config\050233\346\234\215\345\212\241\345\231\250\051.xml"
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config>
+ <orgs>
+ <!-- 澶氫釜缁勭粐锛岀敤缂栧彿鍖哄垎锛岀紪鍙蜂粠1寮�濮嬶紝enable琛ㄧず鏄惁鍚敤 -->
+ <org1 tag="ym" name="鍏冭皨" enable="true">
+ <districts>
+ <province name="浜戝崡鐪�" num="53" level="0">
+ <city name="妤氶泟褰濇棌鑷不宸�" num="23" level="1">
+ <country name="鍏冭皨鍘�" num="28" level="2" />
+ </city>
+ </province>
+ </districts>
+ <dictionaries>
+ <dict code="icProtocol" title="IC鍗″崗璁�" valueType="2">
+ <dictItem>
+ <!-- 闈冲缓浼熺増鏈琁C鍗″崗璁� 鍗′腑缂栧彿宸茬粡鍔犻暱锛堜笌鐜嬫睙娴风増鏈竴鑷达級锛屼笌绾�佺増鏈崗璁笉鍚� -->
+ <item1 dictCode="icProtocol" value="icP202203" name="鑰佸崱鍗忚" status="1" sort="0" />
+ <!-- 鐜嬫睙娴风増鏈琁C鍗″崗璁� -->
+ <item2 dictCode="icProtocol" value="icP202404" name="鏂板崱鍗忚" status="0" sort="1" />
+ </dictItem>
+ </dict>
+ </dictionaries>
+ <user name="瓒呯骇绠＄悊鍛�" phone="admin" password="dyyjy" supperAdmin="1" />
+ <payments>
+ <item1 name="鐜伴噾"/>
+ <item2 name="POS鏈�"/>
+ <item3 name="閾惰杞处"/>
+ </payments>
+ <settings>
+ <item1 item_name="lng" item_value="101.89878161146011" remarks="缁忓害"/>
+ <item2 item_name="lat" item_value="25.673963608371185" remarks="绾害"/>
+ <item3 item_name="zoomMp" item_value="12" remarks="鎵嬫満鍦板浘缂╂斁绾у埆"/>
+ <item4 item_name="zoomPc" item_value="19" remarks="PC鏈哄湴鍥剧缉鏀剧骇鍒�"/>
+ <item5 item_name="projectName" item_value="楂樻晥鏅烘収绠＄亴寰亴浜戞湇鍔＄鐞嗗钩鍙�" remarks="椤圭洰鍚嶇О"/>
+ </settings>
+ <waterTypes>
+ <item1 typeName="鐏屾簤鐢ㄦ按"/>
+ <item2 typeName="宸ヤ笟鐢ㄦ按"/>
+ <item3 typeName="鐢熸椿鐢ㄦ按"/>
+ <item4 typeName="鍏绘畺鐢ㄦ按"/>
+ <item5 typeName="缁垮寲鐢ㄦ按"/>
+ </waterTypes>
+ <waterPrice price="0.90" />
+ <irrigateProfile>
+ <item1 defaultValue = "10" unit = "2" sort = "1" type = "1"/>
+ <item2 defaultValue = "20" unit = "2" sort = "2" type = "1" />
+ <item3 defaultValue = "1" unit = "1" sort = "3" type = "1"/>
+ <item4 defaultValue = "2" unit = "1" sort = "4" type = "1"/>
+ <item5 defaultValue = "20" unit = "3" sort = "1" type = "2"/>
+ <item6 defaultValue = "30" unit = "3" sort = "2" type = "2"/>
+ <item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/>
+ <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
+ </irrigateProfile>
+ <rechargeProfile>
+ <item1 rechargeAmount = "50" sort = "1"/>
+ <item2 rechargeAmount = "100" sort = "2" />
+ <item3 rechargeAmount = "200" sort = "3"/>
+ <item4 rechargeAmount = "300" sort = "4"/>
+ <item5 rechargeAmount = "500" sort = "5"/>
+ <item6 rechargeAmount = "1000" sort = "6"/>
+ </rechargeProfile>
+ <taskType>
+ <item1 typeName="璁惧瀹夎"/>
+ <item2 typeName="璁惧缁翠慨"/>
+ <item3 typeName="璁惧淇濆吇"/>
+ </taskType>
+ </org1>
+ <org2 tag="mj" name="姊呮睙" enable="true">
+ <districts>
+ <province name="姹熻タ鐪�" num="36" level="0">
+ <city name="璧ｅ窞甯�" num="07" level="1">
+ <country name="瀹侀兘鍘�" num="30" level="2" />
+ </city>
+ </province>
+ </districts>
+ <dictionaries>
+ <dict code="icProtocol" title="IC鍗″崗璁�" valueType="2">
+ <dictItem>
+ <!-- 闈冲缓浼熺増鏈琁C鍗″崗璁� 鍗′腑缂栧彿宸茬粡鍔犻暱锛堜笌鐜嬫睙娴风増鏈竴鑷达級锛屼笌绾�佺増鏈崗璁笉鍚� -->
+ <item1 dictCode="icProtocol" value="icP202203" name="鑰佸崱鍗忚" status="1" sort="0" />
+ <!-- 鐜嬫睙娴风増鏈琁C鍗″崗璁� -->
+ <item2 dictCode="icProtocol" value="icP202404" name="鏂板崱鍗忚" status="0" sort="1" />
+ </dictItem>
+ </dict>
+ </dictionaries>
+ <user name="瓒呯骇绠＄悊鍛�" phone="admin" password="dyyjy" supperAdmin="1" />
+ <payments>
+ <item1 name="鐜伴噾"/>
+ <item2 name="POS鏈�"/>
+ <item3 name="閾惰杞处"/>
+ </payments>
+ <settings>
+ <item1 item_name="lng" item_value="116.00433826446535" remarks="缁忓害"/>
+ <item2 item_name="lat" item_value="26.473821341291966" remarks="绾害"/>
+ <item3 item_name="zoomMp" item_value="12" remarks="鎵嬫満鍦板浘缂╂斁绾у埆"/>
+ <item4 item_name="zoomPc" item_value="19" remarks="PC鏈哄湴鍥剧缉鏀剧骇鍒�"/>
+ <item5 item_name="projectName" item_value="楂樻晥鏅烘収绠＄亴寰亴浜戞湇鍔＄鐞嗗钩鍙�" remarks="椤圭洰鍚嶇О"/>
+ </settings>
+ <waterTypes>
+ <item1 typeName="鐏屾簤鐢ㄦ按"/>
+ <item2 typeName="宸ヤ笟鐢ㄦ按"/>
+ <item3 typeName="鐢熸椿鐢ㄦ按"/>
+ <item4 typeName="鍏绘畺鐢ㄦ按"/>
+ <item5 typeName="缁垮寲鐢ㄦ按"/>
+ </waterTypes>
+ <waterPrice price="0.90" />
+ <irrigateProfile>
+ <item1 defaultValue = "10" unit = "2" sort = "1" type = "1"/>
+ <item2 defaultValue = "20" unit = "2" sort = "2" type = "1" />
+ <item3 defaultValue = "1" unit = "1" sort = "3" type = "1"/>
+ <item4 defaultValue = "2" unit = "1" sort = "4" type = "1"/>
+ <item5 defaultValue = "20" unit = "3" sort = "1" type = "2"/>
+ <item6 defaultValue = "30" unit = "3" sort = "2" type = "2"/>
+ <item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/>
+ <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
+ </irrigateProfile>
+ <rechargeProfile>
+ <item1 rechargeAmount = "50" sort = "1"/>
+ <item2 rechargeAmount = "100" sort = "2" />
+ <item3 rechargeAmount = "200" sort = "3"/>
+ <item4 rechargeAmount = "300" sort = "4"/>
+ <item5 rechargeAmount = "500" sort = "5"/>
+ <item6 rechargeAmount = "1000" sort = "6"/>
+ </rechargeProfile>
+ <taskType>
+ <item1 typeName="璁惧瀹夎"/>
+ <item2 typeName="璁惧缁翠慨"/>
+ <item3 typeName="璁惧淇濆吇"/>
+ </taskType>
+ </org2>
+ <org3 tag="sp" name="娌欑洏" enable="true">
+ <districts>
+ <province name="鐢樿們鐪�" num="62" level="0">
+ <city name="閰掓硥甯�" num="09" level="1">
+ <country name="鑲冨窞鍖�" num="02" level="2" />
+ </city>
+ </province>
+ </districts>
+ <dictionaries>
+ <dict code="icProtocol" title="IC鍗″崗璁�" valueType="2">
+ <dictItem>
+ <!-- 闈冲缓浼熺増鏈琁C鍗″崗璁� 鍗′腑缂栧彿宸茬粡鍔犻暱锛堜笌鐜嬫睙娴风増鏈竴鑷达級锛屼笌绾�佺増鏈崗璁笉鍚� -->
+ <item1 dictCode="icProtocol" value="icP202203" name="鑰佸崱鍗忚" status="1" sort="0" />
+ <!-- 鐜嬫睙娴风増鏈琁C鍗″崗璁� -->
+ <item2 dictCode="icProtocol" value="icP202404" name="鏂板崱鍗忚" status="0" sort="1" />
+ </dictItem>
+ </dict>
+ </dictionaries>
+ <user name="瓒呯骇绠＄悊鍛�" phone="admin" password="admin" supperAdmin="1" />
+ <payments>
+ <item1 name="鐜伴噾"/>
+ <item2 name="POS鏈�"/>
+ <item3 name="閾惰杞处"/>
+ </payments>
+ <settings>
+ <item1 item_name="lng" item_value="101.87345" remarks="缁忓害"/>
+ <item2 item_name="lat" item_value="25.70424" remarks="绾害"/>
+ <item3 item_name="zoomMp" item_value="12" remarks="鎵嬫満鍦板浘缂╂斁绾у埆"/>
+ <item4 item_name="zoomPc" item_value="19" remarks="PC鏈哄湴鍥剧缉鏀剧骇鍒�"/>
+ <item5 item_name="projectName" item_value="楂樻晥鏅烘収绠＄亴寰亴浜戞湇鍔＄鐞嗗钩鍙�" remarks="椤圭洰鍚嶇О"/>
+ </settings>
+ <waterTypes>
+ <item1 typeName="鐏屾簤鐢ㄦ按"/>
+ <item2 typeName="宸ヤ笟鐢ㄦ按"/>
+ <item3 typeName="鐢熸椿鐢ㄦ按"/>
+ <item4 typeName="鍏绘畺鐢ㄦ按"/>
+ <item5 typeName="缁垮寲鐢ㄦ按"/>
+ </waterTypes>
+ <waterPrice price="0.90" />
+ <irrigateProfile>
+ <item1 defaultValue = "10" unit = "2" sort = "1" type = "1"/>
+ <item2 defaultValue = "20" unit = "2" sort = "2" type = "1" />
+ <item3 defaultValue = "1" unit = "1" sort = "3" type = "1"/>
+ <item4 defaultValue = "2" unit = "1" sort = "4" type = "1"/>
+ <item5 defaultValue = "20" unit = "3" sort = "1" type = "2"/>
+ <item6 defaultValue = "30" unit = "3" sort = "2" type = "2"/>
+ <item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/>
+ <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
+ </irrigateProfile>
+ <rechargeProfile>
+ <item1 rechargeAmount = "50" sort = "1"/>
+ <item2 rechargeAmount = "100" sort = "2" />
+ <item3 rechargeAmount = "200" sort = "3"/>
+ <item4 rechargeAmount = "300" sort = "4"/>
+ <item5 rechargeAmount = "500" sort = "5"/>
+ <item6 rechargeAmount = "1000" sort = "6"/>
+ </rechargeProfile>
+ <taskType>
+ <item1 typeName="璁惧瀹夎"/>
+ <item2 typeName="璁惧缁翠慨"/>
+ <item3 typeName="璁惧淇濆吇"/>
+ </taskType>
+ </org3>
+ <org4 tag="test" name="娴嬭瘯" enable="true">
+ <districts>
+ <province name="澶╂触甯�" num="12" level="0">
+ <city name="甯傝緰鍖�" num="01" level="1">
+ <country name="姝︽竻鍖�" num="14" level="2" />
+ </city>
+ </province>
+ </districts>
+ <dictionaries>
+ <dict code="icProtocol" title="IC鍗″崗璁�" valueType="2">
+ <dictItem>
+ <!-- 闈冲缓浼熺増鏈琁C鍗″崗璁� 鍗′腑缂栧彿宸茬粡鍔犻暱锛堜笌鐜嬫睙娴风増鏈竴鑷达級锛屼笌绾�佺増鏈崗璁笉鍚� -->
+ <item1 dictCode="icProtocol" value="icP202203" name="鑰佸崱鍗忚" status="1" sort="0" />
+ <!-- 鐜嬫睙娴风増鏈琁C鍗″崗璁� -->
+ <item2 dictCode="icProtocol" value="icP202404" name="鏂板崱鍗忚" status="0" sort="1" />
+ </dictItem>
+ </dict>
+ </dictionaries>
+ <user name="瓒呯骇绠＄悊鍛�" phone="admin" password="admin" supperAdmin="1" />
+ <payments>
+ <item1 name="鐜伴噾"/>
+ <item2 name="POS鏈�"/>
+ <item3 name="閾惰杞处"/>
+ </payments>
+ <settings>
+ <item1 item_name="lng" item_value="101.87345" remarks="缁忓害"/>
+ <item2 item_name="lat" item_value="25.70424" remarks="绾害"/>
+ <item3 item_name="zoomMp" item_value="12" remarks="鎵嬫満鍦板浘缂╂斁绾у埆"/>
+ <item4 item_name="zoomPc" item_value="19" remarks="PC鏈哄湴鍥剧缉鏀剧骇鍒�"/>
+ <item5 item_name="projectName" item_value="楂樻晥鏅烘収绠＄亴寰亴浜戞湇鍔＄鐞嗗钩鍙�" remarks="椤圭洰鍚嶇О"/>
+ </settings>
+ <waterTypes>
+ <item1 typeName="鐏屾簤鐢ㄦ按"/>
+ <item2 typeName="宸ヤ笟鐢ㄦ按"/>
+ <item3 typeName="鐢熸椿鐢ㄦ按"/>
+ <item4 typeName="鍏绘畺鐢ㄦ按"/>
+ <item5 typeName="缁垮寲鐢ㄦ按"/>
+ </waterTypes>
+ <waterPrice price="0.90" />
+ <irrigateProfile>
+ <item1 defaultValue = "10" unit = "2" sort = "1" type = "1"/>
+ <item2 defaultValue = "20" unit = "2" sort = "2" type = "1" />
+ <item3 defaultValue = "1" unit = "1" sort = "3" type = "1"/>
+ <item4 defaultValue = "2" unit = "1" sort = "4" type = "1"/>
+ <item5 defaultValue = "20" unit = "3" sort = "1" type = "2"/>
+ <item6 defaultValue = "30" unit = "3" sort = "2" type = "2"/>
+ <item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/>
+ <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
+ </irrigateProfile>
+ <rechargeProfile>
+ <item1 rechargeAmount = "50" sort = "1"/>
+ <item2 rechargeAmount = "100" sort = "2" />
+ <item3 rechargeAmount = "200" sort = "3"/>
+ <item4 rechargeAmount = "300" sort = "4"/>
+ <item5 rechargeAmount = "500" sort = "5"/>
+ <item6 rechargeAmount = "1000" sort = "6"/>
+ </rechargeProfile>
+ <taskType>
+ <item1 typeName="璁惧瀹夎"/>
+ <item2 typeName="璁惧缁翠慨"/>
+ <item3 typeName="璁惧淇濆吇"/>
+ </taskType>
+ </org4>
+ <org5 tag="mq" name="姘戝嫟" enable="true">
+ <districts>
+ <province name="鐢樿們鐪�" num="62" level="0">
+ <city name="姝﹀▉甯�" num="06" level="1">
+ <country name="姘戝嫟鍘�" num="21" level="2" />
+ </city>
+ </province>
+ </districts>
+ <dictionaries>
+ <dict code="icProtocol" title="IC鍗″崗璁�" valueType="2">
+ <dictItem>
+ <!-- 闈冲缓浼熺増鏈琁C鍗″崗璁� 鍗′腑缂栧彿宸茬粡鍔犻暱锛堜笌鐜嬫睙娴风増鏈竴鑷达級锛屼笌绾�佺増鏈崗璁笉鍚� -->
+ <item1 dictCode="icProtocol" value="icP202203" name="鑰佸崱鍗忚" status="1" sort="0" />
+ <!-- 鐜嬫睙娴风増鏈琁C鍗″崗璁� -->
+ <item2 dictCode="icProtocol" value="icP202404" name="鏂板崱鍗忚" status="0" sort="1" />
+ </dictItem>
+ </dict>
+ </dictionaries>
+ <user name="瓒呯骇绠＄悊鍛�" phone="admin" password="dyyjy" supperAdmin="1" />
+ <payments>
+ <item1 name="鐜伴噾"/>
+ <item2 name="POS鏈�"/>
+ <item3 name="閾惰杞处"/>
+ </payments>
+ <settings>
+ <item1 item_name="lng" item_value="103.09122920036317" remarks="缁忓害"/>
+ <item2 item_name="lat" item_value="38.62387375005241" remarks="绾害"/>
+ <item3 item_name="zoomMp" item_value="12" remarks="鎵嬫満鍦板浘缂╂斁绾у埆"/>
+ <item4 item_name="zoomPc" item_value="19" remarks="PC鏈哄湴鍥剧缉鏀剧骇鍒�"/>
+ <item5 item_name="projectName" item_value="楂樻晥鏅烘収绠＄亴寰亴浜戞湇鍔＄鐞嗗钩鍙�" remarks="椤圭洰鍚嶇О"/>
+ </settings>
+ <waterTypes>
+ <item1 typeName="鐏屾簤鐢ㄦ按"/>
+ <item2 typeName="宸ヤ笟鐢ㄦ按"/>
+ <item3 typeName="鐢熸椿鐢ㄦ按"/>
+ <item4 typeName="鍏绘畺鐢ㄦ按"/>
+ <item5 typeName="缁垮寲鐢ㄦ按"/>
+ </waterTypes>
+ <waterPrice price="0.90" />
+ <irrigateProfile>
+ <item1 defaultValue = "10" unit = "2" sort = "1" type = "1"/>
+ <item2 defaultValue = "20" unit = "2" sort = "2" type = "1" />
+ <item3 defaultValue = "1" unit = "1" sort = "3" type = "1"/>
+ <item4 defaultValue = "2" unit = "1" sort = "4" type = "1"/>
+ <item5 defaultValue = "20" unit = "3" sort = "1" type = "2"/>
+ <item6 defaultValue = "30" unit = "3" sort = "2" type = "2"/>
+ <item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/>
+ <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
+ </irrigateProfile>
+ <rechargeProfile>
+ <item1 rechargeAmount = "50" sort = "1"/>
+ <item2 rechargeAmount = "100" sort = "2" />
+ <item3 rechargeAmount = "200" sort = "3"/>
+ <item4 rechargeAmount = "300" sort = "4"/>
+ <item5 rechargeAmount = "500" sort = "5"/>
+ <item6 rechargeAmount = "1000" sort = "6"/>
+ </rechargeProfile>
+ <taskType>
+ <item1 typeName="璁惧瀹夎"/>
+ <item2 typeName="璁惧缁翠慨"/>
+ <item3 typeName="璁惧淇濆吇"/>
+ </taskType>
+ </org5>
+ </orgs>
+</config>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/msCenter/TestMsResource.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/msCenter/TestMsResource.java
index 5521116..0e1eefa 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/msCenter/TestMsResource.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/msCenter/TestMsResource.java
@@ -13,7 +13,7 @@
@Component
public class TestMsResource {
- // 璁剧疆瀹氭椂鍗佺涓�娆�
+ // 璁剧疆瀹氭椂N绉掍竴娆�
@Scheduled(cron = "0/4 * * * * ?")
public void test1() throws Exception {
MsObj msObj = new MsObj() ;
@@ -29,7 +29,7 @@
}
- // 璁剧疆瀹氭椂鍗佺涓�娆�
+ // 璁剧疆瀹氭椂N绉掍竴娆�
@Scheduled(cron = "0/6 * * * * ?")
public void test2() throws Exception {
MsObj msObj = new MsObj() ;
@@ -44,7 +44,7 @@
MsCenterUnit.getInstance().pushMs(msObj);
}
- // 璁剧疆瀹氭椂鍗佺涓�娆�
+ // 璁剧疆瀹氭椂N绉掍竴娆�
@Scheduled(cron = "0/10 * * * * ?")
public void test3() throws Exception {
MsObj msObj = new MsObj() ;
diff --git "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database\050mj\346\242\205\346\261\237\051.yml" "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database\050mj\346\242\205\346\261\237\051.yml"
deleted file mode 100644
index f845cb9..0000000
--- "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database\050mj\346\242\205\346\261\237\051.yml"
+++ /dev/null
@@ -1,17 +0,0 @@
-# 鏁版嵁婧愰厤缃�
-spring:
- datasource: #閰嶇疆鏁版嵁婧�
- type: com.alibaba.druid.pool.DruidDataSource
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/pipIrr_mj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
- username: root
- password: dysql,;.abc!@#
- druid:
- #鏁版嵁婧愬悕绉帮細褰撳瓨鍦ㄥ涓暟鎹簮鏃讹紝璁剧疆鍚嶅瓧鍙互寰堟柟渚跨殑鏉ヨ繘琛屽尯鍒�,榛樿鑷姩鐢熸垚鍚嶇О锛屾牸寮忔槸锛�"DataSource-" + System.identityHashCode(this)
- #name: name: druid-mysql-mw-rtu 鍗曟暟鎹簮涓嶈捣浣滅敤锛屾墍浠ユ敞閲婃帀
- #閰嶇疆鍒濆鍖栧ぇ灏忋�佹渶灏忋�佹渶澶�
- initialSize: 10
- minIdle: 10
- maxActive: 200
- # 鑾峰彇杩炴帴鏃舵渶澶х瓑寰呮椂闂�,鍗曚綅姣銆傞厤缃簡maxWait涔嬪悗,缂虹渷鍚敤鍏钩閿�,骞跺彂鏁堢巼浼氭湁鎵�涓嬮檷,濡傛灉闇�瑕佸彲浠ラ�氳繃閰嶇疆useUnfairLock灞炴�т负true浣跨敤闈炲叕骞抽攣
- maxWait: 60000
diff --git "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database\050mq\346\260\221\345\213\244\051.yml" "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database\050mq\346\260\221\345\213\244\051.yml"
deleted file mode 100644
index f5a2a65..0000000
--- "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database\050mq\346\260\221\345\213\244\051.yml"
+++ /dev/null
@@ -1,17 +0,0 @@
-# 鏁版嵁婧愰厤缃�
-spring:
- datasource: #閰嶇疆鏁版嵁婧�
- type: com.alibaba.druid.pool.DruidDataSource
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/pipIrr_mq?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
- username: root
- password: dysql,;.abc!@#
- druid:
- #鏁版嵁婧愬悕绉帮細褰撳瓨鍦ㄥ涓暟鎹簮鏃讹紝璁剧疆鍚嶅瓧鍙互寰堟柟渚跨殑鏉ヨ繘琛屽尯鍒�,榛樿鑷姩鐢熸垚鍚嶇О锛屾牸寮忔槸锛�"DataSource-" + System.identityHashCode(this)
- #name: name: druid-mysql-mw-rtu 鍗曟暟鎹簮涓嶈捣浣滅敤锛屾墍浠ユ敞閲婃帀
- #閰嶇疆鍒濆鍖栧ぇ灏忋�佹渶灏忋�佹渶澶�
- initialSize: 10
- minIdle: 10
- maxActive: 200
- # 鑾峰彇杩炴帴鏃舵渶澶х瓑寰呮椂闂�,鍗曚綅姣銆傞厤缃簡maxWait涔嬪悗,缂虹渷鍚敤鍏钩閿�,骞跺彂鏁堢巼浼氭湁鎵�涓嬮檷,濡傛灉闇�瑕佸彲浠ラ�氳繃閰嶇疆useUnfairLock灞炴�т负true浣跨敤闈炲叕骞抽攣
- maxWait: 60000
diff --git "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database\050sp\346\262\231\347\233\230\051.yml" "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database\050sp\346\262\231\347\233\230\051.yml"
deleted file mode 100644
index 1a96fda..0000000
--- "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database\050sp\346\262\231\347\233\230\051.yml"
+++ /dev/null
@@ -1,17 +0,0 @@
-# 鏁版嵁婧愰厤缃�
-spring:
- datasource: #閰嶇疆鏁版嵁婧�
- type: com.alibaba.druid.pool.DruidDataSource
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
- username: root
- password: dysql,;.abc!@#
- druid:
- #鏁版嵁婧愬悕绉帮細褰撳瓨鍦ㄥ涓暟鎹簮鏃讹紝璁剧疆鍚嶅瓧鍙互寰堟柟渚跨殑鏉ヨ繘琛屽尯鍒�,榛樿鑷姩鐢熸垚鍚嶇О锛屾牸寮忔槸锛�"DataSource-" + System.identityHashCode(this)
- #name: name: druid-mysql-mw-rtu 鍗曟暟鎹簮涓嶈捣浣滅敤锛屾墍浠ユ敞閲婃帀
- #閰嶇疆鍒濆鍖栧ぇ灏忋�佹渶灏忋�佹渶澶�
- initialSize: 10
- minIdle: 10
- maxActive: 200
- # 鑾峰彇杩炴帴鏃舵渶澶х瓑寰呮椂闂�,鍗曚綅姣銆傞厤缃簡maxWait涔嬪悗,缂虹渷鍚敤鍏钩閿�,骞跺彂鏁堢巼浼氭湁鎵�涓嬮檷,濡傛灉闇�瑕佸彲浠ラ�氳繃閰嶇疆useUnfairLock灞炴�т负true浣跨敤闈炲叕骞抽攣
- maxWait: 60000
diff --git "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database\050test\346\265\213\350\257\225\051.yml" "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database\050test\346\265\213\350\257\225\051.yml"
deleted file mode 100644
index aea6689..0000000
--- "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database\050test\346\265\213\350\257\225\051.yml"
+++ /dev/null
@@ -1,17 +0,0 @@
-# 鏁版嵁婧愰厤缃�
-spring:
- datasource: #閰嶇疆鏁版嵁婧�
- type: com.alibaba.druid.pool.DruidDataSource
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/pipIrr_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
- username: root
- password: dysql,;.abc!@#
- druid:
- #鏁版嵁婧愬悕绉帮細褰撳瓨鍦ㄥ涓暟鎹簮鏃讹紝璁剧疆鍚嶅瓧鍙互寰堟柟渚跨殑鏉ヨ繘琛屽尯鍒�,榛樿鑷姩鐢熸垚鍚嶇О锛屾牸寮忔槸锛�"DataSource-" + System.identityHashCode(this)
- #name: name: druid-mysql-mw-rtu 鍗曟暟鎹簮涓嶈捣浣滅敤锛屾墍浠ユ敞閲婃帀
- #閰嶇疆鍒濆鍖栧ぇ灏忋�佹渶灏忋�佹渶澶�
- initialSize: 10
- minIdle: 10
- maxActive: 200
- # 鑾峰彇杩炴帴鏃舵渶澶х瓑寰呮椂闂�,鍗曚綅姣銆傞厤缃簡maxWait涔嬪悗,缂虹渷鍚敤鍏钩閿�,骞跺彂鏁堢巼浼氭湁鎵�涓嬮檷,濡傛灉闇�瑕佸彲浠ラ�氳繃閰嶇疆useUnfairLock灞炴�т负true浣跨敤闈炲叕骞抽攣
- maxWait: 60000
diff --git "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database\050ym\345\205\203\350\260\213\051.yml" "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database\050ym\345\205\203\350\260\213\051.yml"
deleted file mode 100644
index 37760be..0000000
--- "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database\050ym\345\205\203\350\260\213\051.yml"
+++ /dev/null
@@ -1,17 +0,0 @@
-# 鏁版嵁婧愰厤缃�
-spring:
- datasource: #閰嶇疆鏁版嵁婧�
- type: com.alibaba.druid.pool.DruidDataSource
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
- username: root
- password: dysql,;.abc!@#
- druid:
- #鏁版嵁婧愬悕绉帮細褰撳瓨鍦ㄥ涓暟鎹簮鏃讹紝璁剧疆鍚嶅瓧鍙互寰堟柟渚跨殑鏉ヨ繘琛屽尯鍒�,榛樿鑷姩鐢熸垚鍚嶇О锛屾牸寮忔槸锛�"DataSource-" + System.identityHashCode(this)
- #name: name: druid-mysql-mw-rtu 鍗曟暟鎹簮涓嶈捣浣滅敤锛屾墍浠ユ敞閲婃帀
- #閰嶇疆鍒濆鍖栧ぇ灏忋�佹渶灏忋�佹渶澶�
- initialSize: 10
- minIdle: 10
- maxActive: 200
- # 鑾峰彇杩炴帴鏃舵渶澶х瓑寰呮椂闂�,鍗曚綅姣銆傞厤缃簡maxWait涔嬪悗,缂虹渷鍚敤鍏钩閿�,骞跺彂鏁堢巼浼氭湁鎵�涓嬮檷,濡傛灉闇�瑕佸彲浠ラ�氳繃閰嶇疆useUnfairLock灞炴�т负true浣跨敤闈炲叕骞抽攣
- maxWait: 60000
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml
index 190fcb6..d9ef8b1 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml
@@ -3,8 +3,7 @@
datasource: #閰嶇疆鏁版嵁婧�
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
- # url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
- url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ url: jdbc:mysql://127.0.0.1:3306/${common.spring_datasource_url_dbname}?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
username: root
password: dysql,;.abc!@#
druid:
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application.yml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application.yml
index f45a73c..1a5dd5b 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application.yml
@@ -3,10 +3,12 @@
console: UTF-8
config:
classpath: log4j2.yml
-
spring:
+ devtools:
+ livereload:
+ enabled: false
profiles:
- include: global, database
+ include: common-mw, global, database
#actutor鐨剋eb绔彛
management:
diff --git "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050gz\347\224\230\345\267\236\051.xml" "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050gz\347\224\230\345\267\236\051.xml"
new file mode 100644
index 0000000..2e7813a
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050gz\347\224\230\345\267\236\051.xml"
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config>
+ <server name="閫氫俊涓棿浠�" showStartInfo="true" company="http://www.dyjs.com"/>
+ <!--
+ 鍩烘湰閰嶇疆
+ orgTag 鏈烘瀯tag(瀵瑰簲鏈烘瀯tag,鍜屾暟鎹簮鍚庣紑)
+ isLowPower: 鏄惁涓轰綆鍔熻��
+ onlyDealRtus:鍙鐞嗘寚瀹歊TU鍦板潃璁惧锛屽叾浠栬澶囨暟鎹涪寮冿紝澶氫釜RTU鍦板潃鐢ㄨ嫳鏂囬�楀彿闅斿紑锛�
+ onlyOneProtocol锛氬湪鏀寔澶氶�氫俊鍗忚鏃讹紝鍙湁RTU涓婄嚎浜嗭紝鎵嶈兘璇嗗埆鍑鸿RTU瀹為檯鐢ㄧ殑閫氫俊鍗忚锛岃繘鑰岀敤姝ゅ崗璁В鏋愪笂琛屾暟鎹強鏋勯�犱笅琛屽懡浠ゃ��
+ 濡傛灉RTU鏈浘涓婄嚎锛堥�氫俊涓棿浠跺惎鍔ㄥ悗璇TU鏈浘涓婄嚎锛夛紝閭ｄ箞鍦ㄥ悜瀹冨彂閫佷笅琛屽懡浠ゆ椂锛屼笉鑳藉垽鏂嚭鍏堕噰鐢ㄧ殑鍗忚锛屼篃涓嶈兘鏋勯�犲懡浠わ紝灏ゅ叾鏄綆鍔熻�楁儏鍐典笅锛屼笉涓婄嚎鏄甯哥幇璞°��
+ 褰撳彧鏈変竴涓崗璁儏鍐典笅锛屽湪RTU鏈浘涓婄嚎鏃讹紝涔熻兘鐢ㄦ鍗忚鏋勯�犲懡浠ゅ苟缂撳瓨涓嬫潵锛屽挨鍏堕�傚悎浣庡姛鑰楁儏鍐点��
+ onlyOneProtocol=true: 閫氫俊涓棿浠跺綋鍓嶅彧鏈変竴涓崗璁�
+ downComandMaxResendTimes: 涓嬭鍛戒护鍏佽鍙戦�佺殑鏈�澶ф鏁癤锛屽嵆鍏佽閲嶅彂X-1
+ commandSendInterval: 閽堝涓�涓猂TU锛屼笅鍙戝懡浠ょ殑鏃堕棿闂撮殧(绉�)
+ fastCommandSendInterval: 閽堝涓�涓猂TU锛屼笅鍙戝揩閫熷懡浠わ紙濡傚崌绾у懡浠わ級鐨勬椂闂撮棿闅�(姣)锛屾閰嶇疆浣滅敤鍔涘彈涓嬮潰閰嶇疆椤筶astUpDataTimeLive闄愬埗
+ cacheWaitResultTimeout: 鍛戒护宸茬粡鍙戦�佽揪鏈�澶ф鏁帮紝浠嶆湭鏀跺埌鍛戒护缁撴灉锛岄渶瑕佸湪缂撳瓨缁х画绛夊緟锛屽叾绛夊緟鏈�澶ф椂闀�(绉�)锛屾湰绯荤粺RTU锛屽浜庡紑鍏虫车鍛戒护锛屽叾鍏堟墽琛屽紑鍏虫车鎶ワ紝鐒跺悗鍐嶈繘琛屽懡浠ゅ簲绛旓紝鎵�浠ユ鍊� 瑕佸ぇ涓�浜�
+ offLineCacheTimeout: 涓嶅湪绾跨紦瀛樼殑鍛戒护鏈�澶х紦瀛樻椂闀�(绉�)
+ lastUpDataTimeLive: TCP涓婅鏁版嵁鏃跺埢缂撳瓨鏃堕暱(姣)锛屽綋杈惧埌鏃堕暱鏃讹紝TCP涓婅鏁版嵁鏃跺埢琚竻绌猴紝閲囩敤TCP涓婅鏁版嵁鏃跺埢鐩殑鏄紝闃绘涓婅鏁版嵁鍚屾椂涓嬪彂鏁版嵁锛屽洜涓篟TU澶勭悊涓嶈繃鏉�
+ dbDataIdSuffix锛氭暟鎹簱鏁版嵁id鐢熸垚鍣ㄧ殑id鍚庣紑锛�0鏄粯璁ょ殑鍚庣紑锛屼竴鑸瑆eb绯荤粺搴旂敤锛屾暟鎹腑闂翠欢id鍚庣紑澶т簬绛変簬1
+ cacheUpDownDataWarnCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鎶ヨ閲忥紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
+ cacheUpDownDataMaxCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鏈�澶у�硷紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
+ disconnectedByNoUpDataMinutes锛氭病鏈変笂琛屾暟鎹殑鍒嗛挓鏁帮紝杈惧埌杩欎釜鍒嗛挓鏁帮紝璁や负RTU鏂綉浜嗭紝鍙栧�艰寖鍥存槸2-100
+ workReportDealOneByTimes: 宸ヤ綔鎶ュお棰戠箒锛孨娆′笂鎶ュ鐞�1娆★紝鍙栧�艰寖鍥存槸1-100
+ intakeAlarmLossMinValue: 瑙﹀彂鍙戦�侀拤閽夋姤璀︽秷鎭殑鍙栨按鍙ｆ棩婕忔崯閲忕殑鏈�灏忓�硷紙鍖呮嫭浣嗛櫎0.0澶栵級锛堝皬鏁帮級
+ sendDingDingAlarmMsInterval: 鏈夋姤璀﹀彂鐢熸椂锛屽悜閽夐拤鍙戦�佹秷鎭殑闂撮殧鏃堕暱锛堝垎閽燂級
+ -->
+ <base
+ orgTag="gz"
+ isLowPower="false"
+ onlyDealRtus=""
+ onlyOneProtocol="false"
+ downComandMaxResendTimes="1"
+ commandSendInterval="3"
+ fastCommandSendInterval="500"
+ cacheWaitResultTimeout="120"
+ offLineCacheTimeout="86400"
+ lastUpDataTimeLive="500"
+ dbDataIdSuffix="0"
+ cacheUpDownDataWarnCount="100000"
+ cacheUpDownDataMaxCount="110000"
+ disconnectedByNoUpDataMinutes="3"
+ workReportDealOneByTimes="1"
+ intakeAlarmLossMinValue="1.0"
+ sendDingDingAlarmMsInterval="60"
+ />
+
+ <!--
+ 2024-08-22 姝ら厤缃殏鏃舵湭搴旂敤
+ centerAddr: 涓績鍦板潃锛屽綋鍓嶏紝centerAddr鏈敤鍒�
+ synchroRtuClock: 鏄惁瀵筊TU鏍℃椂
+ synchroRtuClockTimepieces锛氬綋RTU涓庢湇鍔″櫒鏃堕挓鐩稿樊涓�瀹氭绉掞紙閰嶇疆鏂囦欢鏄閽燂級鍚庯紝杩涜鏍℃椂
+ -->
+ <protocol
+ centerAddr="1"
+ synchroRtuClock="true"
+ synchroRtuClockTimepieces="300000"
+ />
+
+ <!-- RTU 娑堟伅涓績
+ enable: 妯″潡鏄惁鍚姩
+ notifyInterval: 娑堟伅閫氱煡闂撮殧锛堢锛�
+ -->
+ <msCenter enable="true"
+ notifyInterval="5"
+ />
+
+ <!-- RTU 杞欢鍗囩骇
+ enable: 妯″潡鏄惁鍚姩
+ openNoUpgrade: 闃�寮�锛堟车寮�锛変笉鎵ц鍗囩骇
+ lastOpenMaxGoOn: 闃�寮�锛堟车寮�锛夌姸鎬佽缃互鏉ユ寔缁渶闀挎椂闂达紙绉掗挓锛夛紝瓒呰繃杩欎釜鏃堕棿璁や负鐘舵�佹棤鏁堬紙杩欎釜鏃堕暱鍙栧喅浜庡伐浣滄姤闂撮殧锛�
+ noOneRtuUpgradeMaxDuration锛氬崌绾т换鍔¤缃悗锛屾棤涓�璁惧鍗囩骇鏈�澶ф椂闀匡紙绉掞級锛岃秴杩囪繖涓椂闀匡紝璁や负鍗囩骇浠诲姟瀹屾垚锛屽彇鍊艰寖鍥存槸5鍒嗛挓~60鍒嗛挓
+ runningAndIdleDuration锛歳tu鍗囩骇鍚姩鍚庤繘鍏ュ崌绾т腑鐘舵�侊紝浣嗘煇绉嶆儏鍐典笅RTU涓嶅啀閫氫俊浜嗭紝涓�鐩村浜庣瓑寰呯姸鎬侊紝绛夊緟杈惧埌涓�瀹氭椂闀匡紙绉掞紝涓�鑸笌noOneRtuUpgradeMaxDuration鐩哥瓑锛夎涓哄崌绾уけ璐ワ紙涓�鍖呮鎴栧鍖呮锛夛紝鍙栧�艰寖鍥存槸5鍒嗛挓~60鍒嗛挓
+ failTryTimes锛氬崌绾уけ璐ュ悗锛堥拡瀵圭殑鏄湪绾胯繘琛屼簡鍗囩骇涓嬪彂鍛戒护锛夛紝閲嶆柊鍋胯瘯鍗囩骇娆℃暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉閲嶆柊鍋胯瘯鍗囩骇
+ ugMaxRtuAtOnce锛氫负浜嗙紦瑙ｉ�氫俊涓棿浠剁殑鍘嬪姏锛屽悓鏃舵敮鎸佸崌绾х殑RTU鍙版暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉鍙楅檺鍒�
+ rtuOffLineWaitDuration: rtu绂荤嚎锛岀瓑寰呭叾鍗囩骇鐨勬椂闀匡紙绉掞級锛岃秴杩囪繖涓椂闂达紝璁剧疆鍏跺崌绾уけ璐ワ紝涓旇缃崌绾т换鍔″畬鎴�
+ notifyStateInterval: 鍗囩骇鐘舵�侀�氱煡闂撮殧锛堢锛�
+ notifyTimesAfterOver: 鍗囩骇缁撴潫鍚庯紝鍐嶅悜web鏈嶅姟绯荤粺閫氱煡鐘舵�佺殑娆℃暟
+ -->
+ <upgrade enable="true"
+ openNoUpgrade="true"
+ lastOpenMaxGoOn="1800"
+ noOneRtuUpgradeMaxDuration="1200"
+ runningAndIdleDuration="1200"
+ failTryTimes="2"
+ ugMaxRtuAtOnce="5000"
+ rtuOffLineWaitDuration="1800"
+ notifyStateInterval="2"
+ notifyTimesAfterOver="1"
+ />
+
+
+ <!--
+ 鏀寔妯″潡
+ 鐭伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐ｇ敤鏃惰緝鐭殑宸ヤ綔浠诲姟
+ short_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟涓烘墍鏈塁PU鏍告暟+1锛坰hort姹犱笌long姹犲悇鍒嗕竴鍗婏級锛岃嫢涓�-1锛屼笉鍙楅檺鍒� 锛岃缃负0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ short_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ short_freeTimeout锛� 绾跨▼鏁扮┖闂叉椂闀匡紝鑻ユ睜涓嚎绋嬫暟閲忓ぇ浜巑inThread锛屼笖鏈夌殑绾跨▼绌洪棽鏃堕暱瓒呰繃freeTimeout锛屽垯娓呴櫎璇ョ嚎绋嬶紝涓轰簡涓嶆竻闄わ紝鎶妋inThread涓巑axThread璁剧疆鐩哥瓑
+ short_busyTimeout锛氱嚎绋嬩笉闂存柇宸ヤ綔鏃堕暱锛堝崟浣嶄负绉�)瓒呮椂闄愶紝璁や负绾跨▼宸茬粡浜嗗穿婧冿紝灏嗗己鍒舵竻闄わ紝鐭伐浣滄椂闀胯缃负5绉�
+ 闀垮伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐ｇ敤鏃惰緝闀跨殑宸ヤ綔浠诲姟锛屼緥濡傛暟鎹簱瀛樺彇鎿嶄綔
+ long_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟涓烘墍鏈塁PU鏍告暟+1锛坰hort姹犱笌long姹犲悇鍒嗕竴鍗婏級锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ long_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ long_freeTimeout锛� 绾跨▼鏁扮┖闂叉椂闀匡紝鑻ユ睜涓嚎绋嬫暟閲忓ぇ浜巑inThread锛屼笖鏈夌殑绾跨▼绌洪棽鏃堕暱瓒呰繃freeTimeout锛屽垯娓呴櫎璇ョ嚎绋�
+ long_busyTimeout锛氱嚎绋嬩笉闂存柇宸ヤ綔鏃堕暱锛堝崟浣嶄负绉�)瓒呮椂闄愶紝鑻ヤ负-1锛屼笉鍙楅檺鍒�
+ enableThreadPool锛氭槸鍚﹀惎鐢ㄧ嚎绋嬫睜
+ -->
+ <support
+ short_maxThread="6"
+ short_minThread="6"
+ short_freeTimeout="60"
+ short_busyTimeout="5"
+ long_maxThread="6"
+ long_minThread="6"
+ long_freeTimeout="60"
+ long_busyTimeout="-1"
+ enableThreadPool="true"
+ />
+
+ <!--
+ 璧勬簮妯″潡
+ rtuLogDir锛歊TU鏃ュ織鏂囦欢瀛樺偍鐩綍(鐩稿鐩綍)
+ rtuLogFileMaxSize锛歊TU鏃ュ織鏂囦欢鏈�澶у瓧鑺傛暟(B)
+ rtuLogFileMaxCount锛歊TU鏃ュ織鏂囦欢鏈�澶ф枃浠舵暟
+ monitorInterval锛歊tu鐘舵�佺洃瑙嗛棿闅�(鍒嗛挓)
+ saveDbInterval锛歊tu鐘舵�佸瓨鏁版嵁搴撻棿闅�(鍒嗛挓)
+ -->
+ <resource
+ rtuLogDir="rtuLogs/"
+ rtuLogFileMaxSize="1000000"
+ rtuLogFileMaxCount="3"
+ monitorInterval="2"
+ saveDbInterval="10"
+ />
+
+
+ <!--
+ 2024-08-22 姝ら厤缃殏鏃舵湭搴旂敤
+ port锛歳mi鏈嶅姟绔彛鍙�
+ context锛歳mi鏈嶅姟涓婁笅鏂�
+ -->
+ <rmi enable="true"
+ port="65400"
+ context="rtuMw"
+ />
+
+ <!--
+ coreInterval锛氫富绾跨▼姣忔鎵ц闂撮殧鏃堕暱锛堟绉掞級
+ queueWarnSize: 缂撳瓨闃熷垪鑺傜偣鏁拌鍛婃暟閲�
+ queueMaxSize: 缂撳瓨闃熷垪鑺傜偣鏁版渶澶ф暟閲�
+ -->
+ <core
+ coreInterval="100"
+ queueWarnSize="100000"
+ queueMaxSize="300000"
+ />
+
+ <!--
+ port锛氱鍙�
+ processors锛� Mina IO 澶勭悊涓婁笅琛屾暟鎹殑绾跨▼鏁帮紝涓�鑸槸CPU鎬绘牳鏁�+1
+ idle: 鍙戝憜鏃堕暱锛堢锛�
+ -->
+ <tcp enable="true"
+ port="60103"
+ processors="3"
+ idle="10"
+ />
+
+</config>
\ No newline at end of file
diff --git "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050hlj\351\273\221\351\276\231\346\261\237\051.xml" "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050hlj\351\273\221\351\276\231\346\261\237\051.xml"
new file mode 100644
index 0000000..89fdf25
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050hlj\351\273\221\351\276\231\346\261\237\051.xml"
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config>
+ <server name="閫氫俊涓棿浠�" showStartInfo="true" company="http://www.dyjs.com"/>
+ <!--
+ 鍩烘湰閰嶇疆
+ orgTag 鏈烘瀯tag(瀵瑰簲鏈烘瀯tag,鍜屾暟鎹簮鍚庣紑)
+ isLowPower: 鏄惁涓轰綆鍔熻��
+ onlyDealRtus:鍙鐞嗘寚瀹歊TU鍦板潃璁惧锛屽叾浠栬澶囨暟鎹涪寮冿紝澶氫釜RTU鍦板潃鐢ㄨ嫳鏂囬�楀彿闅斿紑锛�
+ onlyOneProtocol锛氬湪鏀寔澶氶�氫俊鍗忚鏃讹紝鍙湁RTU涓婄嚎浜嗭紝鎵嶈兘璇嗗埆鍑鸿RTU瀹為檯鐢ㄧ殑閫氫俊鍗忚锛岃繘鑰岀敤姝ゅ崗璁В鏋愪笂琛屾暟鎹強鏋勯�犱笅琛屽懡浠ゃ��
+ 濡傛灉RTU鏈浘涓婄嚎锛堥�氫俊涓棿浠跺惎鍔ㄥ悗璇TU鏈浘涓婄嚎锛夛紝閭ｄ箞鍦ㄥ悜瀹冨彂閫佷笅琛屽懡浠ゆ椂锛屼笉鑳藉垽鏂嚭鍏堕噰鐢ㄧ殑鍗忚锛屼篃涓嶈兘鏋勯�犲懡浠わ紝灏ゅ叾鏄綆鍔熻�楁儏鍐典笅锛屼笉涓婄嚎鏄甯哥幇璞°��
+ 褰撳彧鏈変竴涓崗璁儏鍐典笅锛屽湪RTU鏈浘涓婄嚎鏃讹紝涔熻兘鐢ㄦ鍗忚鏋勯�犲懡浠ゅ苟缂撳瓨涓嬫潵锛屽挨鍏堕�傚悎浣庡姛鑰楁儏鍐点��
+ onlyOneProtocol=true: 閫氫俊涓棿浠跺綋鍓嶅彧鏈変竴涓崗璁�
+ downComandMaxResendTimes: 涓嬭鍛戒护鍏佽鍙戦�佺殑鏈�澶ф鏁癤锛屽嵆鍏佽閲嶅彂X-1
+ commandSendInterval: 閽堝涓�涓猂TU锛屼笅鍙戝懡浠ょ殑鏃堕棿闂撮殧(绉�)
+ fastCommandSendInterval: 閽堝涓�涓猂TU锛屼笅鍙戝揩閫熷懡浠わ紙濡傚崌绾у懡浠わ級鐨勬椂闂撮棿闅�(姣)锛屾閰嶇疆浣滅敤鍔涘彈涓嬮潰閰嶇疆椤筶astUpDataTimeLive闄愬埗
+ cacheWaitResultTimeout: 鍛戒护宸茬粡鍙戦�佽揪鏈�澶ф鏁帮紝浠嶆湭鏀跺埌鍛戒护缁撴灉锛岄渶瑕佸湪缂撳瓨缁х画绛夊緟锛屽叾绛夊緟鏈�澶ф椂闀�(绉�)锛屾湰绯荤粺RTU锛屽浜庡紑鍏虫车鍛戒护锛屽叾鍏堟墽琛屽紑鍏虫车鎶ワ紝鐒跺悗鍐嶈繘琛屽懡浠ゅ簲绛旓紝鎵�浠ユ鍊� 瑕佸ぇ涓�浜�
+ offLineCacheTimeout: 涓嶅湪绾跨紦瀛樼殑鍛戒护鏈�澶х紦瀛樻椂闀�(绉�)
+ lastUpDataTimeLive: TCP涓婅鏁版嵁鏃跺埢缂撳瓨鏃堕暱(姣)锛屽綋杈惧埌鏃堕暱鏃讹紝TCP涓婅鏁版嵁鏃跺埢琚竻绌猴紝閲囩敤TCP涓婅鏁版嵁鏃跺埢鐩殑鏄紝闃绘涓婅鏁版嵁鍚屾椂涓嬪彂鏁版嵁锛屽洜涓篟TU澶勭悊涓嶈繃鏉�
+ dbDataIdSuffix锛氭暟鎹簱鏁版嵁id鐢熸垚鍣ㄧ殑id鍚庣紑锛�0鏄粯璁ょ殑鍚庣紑锛屼竴鑸瑆eb绯荤粺搴旂敤锛屾暟鎹腑闂翠欢id鍚庣紑澶т簬绛変簬1
+ cacheUpDownDataWarnCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鎶ヨ閲忥紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
+ cacheUpDownDataMaxCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鏈�澶у�硷紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
+ disconnectedByNoUpDataMinutes锛氭病鏈変笂琛屾暟鎹殑鍒嗛挓鏁帮紝杈惧埌杩欎釜鍒嗛挓鏁帮紝璁や负RTU鏂綉浜嗭紝鍙栧�艰寖鍥存槸2-100
+ workReportDealOneByTimes: 宸ヤ綔鎶ュお棰戠箒锛孨娆′笂鎶ュ鐞�1娆★紝鍙栧�艰寖鍥存槸1-100
+ intakeAlarmLossMinValue: 瑙﹀彂鍙戦�侀拤閽夋姤璀︽秷鎭殑鍙栨按鍙ｆ棩婕忔崯閲忕殑鏈�灏忓�硷紙鍖呮嫭浣嗛櫎0.0澶栵級锛堝皬鏁帮級
+ sendDingDingAlarmMsInterval: 鏈夋姤璀﹀彂鐢熸椂锛屽悜閽夐拤鍙戦�佹秷鎭殑闂撮殧鏃堕暱锛堝垎閽燂級
+ -->
+ <base
+ orgTag="hlj"
+ isLowPower="false"
+ onlyDealRtus=""
+ onlyOneProtocol="false"
+ downComandMaxResendTimes="1"
+ commandSendInterval="3"
+ fastCommandSendInterval="500"
+ cacheWaitResultTimeout="120"
+ offLineCacheTimeout="86400"
+ lastUpDataTimeLive="500"
+ dbDataIdSuffix="0"
+ cacheUpDownDataWarnCount="100000"
+ cacheUpDownDataMaxCount="110000"
+ disconnectedByNoUpDataMinutes="3"
+ workReportDealOneByTimes="1"
+ intakeAlarmLossMinValue="1.0"
+ sendDingDingAlarmMsInterval="60"
+ />
+
+ <!--
+ 2024-08-22 姝ら厤缃殏鏃舵湭搴旂敤
+ centerAddr: 涓績鍦板潃锛屽綋鍓嶏紝centerAddr鏈敤鍒�
+ synchroRtuClock: 鏄惁瀵筊TU鏍℃椂
+ synchroRtuClockTimepieces锛氬綋RTU涓庢湇鍔″櫒鏃堕挓鐩稿樊涓�瀹氭绉掞紙閰嶇疆鏂囦欢鏄閽燂級鍚庯紝杩涜鏍℃椂
+ -->
+ <protocol
+ centerAddr="1"
+ synchroRtuClock="true"
+ synchroRtuClockTimepieces="300000"
+ />
+
+ <!-- RTU 娑堟伅涓績
+ enable: 妯″潡鏄惁鍚姩
+ notifyInterval: 娑堟伅閫氱煡闂撮殧锛堢锛�
+ -->
+ <msCenter enable="true"
+ notifyInterval="5"
+ />
+
+ <!-- RTU 杞欢鍗囩骇
+ enable: 妯″潡鏄惁鍚姩
+ openNoUpgrade: 闃�寮�锛堟车寮�锛変笉鎵ц鍗囩骇
+ lastOpenMaxGoOn: 闃�寮�锛堟车寮�锛夌姸鎬佽缃互鏉ユ寔缁渶闀挎椂闂达紙绉掗挓锛夛紝瓒呰繃杩欎釜鏃堕棿璁や负鐘舵�佹棤鏁堬紙杩欎釜鏃堕暱鍙栧喅浜庡伐浣滄姤闂撮殧锛�
+ noOneRtuUpgradeMaxDuration锛氬崌绾т换鍔¤缃悗锛屾棤涓�璁惧鍗囩骇鏈�澶ф椂闀匡紙绉掞級锛岃秴杩囪繖涓椂闀匡紝璁や负鍗囩骇浠诲姟瀹屾垚锛屽彇鍊艰寖鍥存槸5鍒嗛挓~60鍒嗛挓
+ runningAndIdleDuration锛歳tu鍗囩骇鍚姩鍚庤繘鍏ュ崌绾т腑鐘舵�侊紝浣嗘煇绉嶆儏鍐典笅RTU涓嶅啀閫氫俊浜嗭紝涓�鐩村浜庣瓑寰呯姸鎬侊紝绛夊緟杈惧埌涓�瀹氭椂闀匡紙绉掞紝涓�鑸笌noOneRtuUpgradeMaxDuration鐩哥瓑锛夎涓哄崌绾уけ璐ワ紙涓�鍖呮鎴栧鍖呮锛夛紝鍙栧�艰寖鍥存槸5鍒嗛挓~60鍒嗛挓
+ failTryTimes锛氬崌绾уけ璐ュ悗锛堥拡瀵圭殑鏄湪绾胯繘琛屼簡鍗囩骇涓嬪彂鍛戒护锛夛紝閲嶆柊鍋胯瘯鍗囩骇娆℃暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉閲嶆柊鍋胯瘯鍗囩骇
+ ugMaxRtuAtOnce锛氫负浜嗙紦瑙ｉ�氫俊涓棿浠剁殑鍘嬪姏锛屽悓鏃舵敮鎸佸崌绾х殑RTU鍙版暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉鍙楅檺鍒�
+ rtuOffLineWaitDuration: rtu绂荤嚎锛岀瓑寰呭叾鍗囩骇鐨勬椂闀匡紙绉掞級锛岃秴杩囪繖涓椂闂达紝璁剧疆鍏跺崌绾уけ璐ワ紝涓旇缃崌绾т换鍔″畬鎴�
+ notifyStateInterval: 鍗囩骇鐘舵�侀�氱煡闂撮殧锛堢锛�
+ notifyTimesAfterOver: 鍗囩骇缁撴潫鍚庯紝鍐嶅悜web鏈嶅姟绯荤粺閫氱煡鐘舵�佺殑娆℃暟
+ -->
+ <upgrade enable="true"
+ openNoUpgrade="true"
+ lastOpenMaxGoOn="1800"
+ noOneRtuUpgradeMaxDuration="1200"
+ runningAndIdleDuration="1200"
+ failTryTimes="2"
+ ugMaxRtuAtOnce="5000"
+ rtuOffLineWaitDuration="1800"
+ notifyStateInterval="2"
+ notifyTimesAfterOver="1"
+ />
+
+
+ <!--
+ 鏀寔妯″潡
+ 鐭伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐ｇ敤鏃惰緝鐭殑宸ヤ綔浠诲姟
+ short_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟涓烘墍鏈塁PU鏍告暟+1锛坰hort姹犱笌long姹犲悇鍒嗕竴鍗婏級锛岃嫢涓�-1锛屼笉鍙楅檺鍒� 锛岃缃负0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ short_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ short_freeTimeout锛� 绾跨▼鏁扮┖闂叉椂闀匡紝鑻ユ睜涓嚎绋嬫暟閲忓ぇ浜巑inThread锛屼笖鏈夌殑绾跨▼绌洪棽鏃堕暱瓒呰繃freeTimeout锛屽垯娓呴櫎璇ョ嚎绋嬶紝涓轰簡涓嶆竻闄わ紝鎶妋inThread涓巑axThread璁剧疆鐩哥瓑
+ short_busyTimeout锛氱嚎绋嬩笉闂存柇宸ヤ綔鏃堕暱锛堝崟浣嶄负绉�)瓒呮椂闄愶紝璁や负绾跨▼宸茬粡浜嗗穿婧冿紝灏嗗己鍒舵竻闄わ紝鐭伐浣滄椂闀胯缃负5绉�
+ 闀垮伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐ｇ敤鏃惰緝闀跨殑宸ヤ綔浠诲姟锛屼緥濡傛暟鎹簱瀛樺彇鎿嶄綔
+ long_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟涓烘墍鏈塁PU鏍告暟+1锛坰hort姹犱笌long姹犲悇鍒嗕竴鍗婏級锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ long_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ long_freeTimeout锛� 绾跨▼鏁扮┖闂叉椂闀匡紝鑻ユ睜涓嚎绋嬫暟閲忓ぇ浜巑inThread锛屼笖鏈夌殑绾跨▼绌洪棽鏃堕暱瓒呰繃freeTimeout锛屽垯娓呴櫎璇ョ嚎绋�
+ long_busyTimeout锛氱嚎绋嬩笉闂存柇宸ヤ綔鏃堕暱锛堝崟浣嶄负绉�)瓒呮椂闄愶紝鑻ヤ负-1锛屼笉鍙楅檺鍒�
+ enableThreadPool锛氭槸鍚﹀惎鐢ㄧ嚎绋嬫睜
+ -->
+ <support
+ short_maxThread="6"
+ short_minThread="6"
+ short_freeTimeout="60"
+ short_busyTimeout="5"
+ long_maxThread="6"
+ long_minThread="6"
+ long_freeTimeout="60"
+ long_busyTimeout="-1"
+ enableThreadPool="true"
+ />
+
+ <!--
+ 璧勬簮妯″潡
+ rtuLogDir锛歊TU鏃ュ織鏂囦欢瀛樺偍鐩綍(鐩稿鐩綍)
+ rtuLogFileMaxSize锛歊TU鏃ュ織鏂囦欢鏈�澶у瓧鑺傛暟(B)
+ rtuLogFileMaxCount锛歊TU鏃ュ織鏂囦欢鏈�澶ф枃浠舵暟
+ monitorInterval锛歊tu鐘舵�佺洃瑙嗛棿闅�(鍒嗛挓)
+ saveDbInterval锛歊tu鐘舵�佸瓨鏁版嵁搴撻棿闅�(鍒嗛挓)
+ -->
+ <resource
+ rtuLogDir="rtuLogs/"
+ rtuLogFileMaxSize="1000000"
+ rtuLogFileMaxCount="3"
+ monitorInterval="2"
+ saveDbInterval="10"
+ />
+
+
+ <!--
+ 2024-08-22 姝ら厤缃殏鏃舵湭搴旂敤
+ port锛歳mi鏈嶅姟绔彛鍙�
+ context锛歳mi鏈嶅姟涓婁笅鏂�
+ -->
+ <rmi enable="true"
+ port="65400"
+ context="rtuMw"
+ />
+
+ <!--
+ coreInterval锛氫富绾跨▼姣忔鎵ц闂撮殧鏃堕暱锛堟绉掞級
+ queueWarnSize: 缂撳瓨闃熷垪鑺傜偣鏁拌鍛婃暟閲�
+ queueMaxSize: 缂撳瓨闃熷垪鑺傜偣鏁版渶澶ф暟閲�
+ -->
+ <core
+ coreInterval="100"
+ queueWarnSize="100000"
+ queueMaxSize="300000"
+ />
+
+ <!--
+ port锛氱鍙�
+ processors锛� Mina IO 澶勭悊涓婁笅琛屾暟鎹殑绾跨▼鏁帮紝涓�鑸槸CPU鎬绘牳鏁�+1
+ idle: 鍙戝憜鏃堕暱锛堢锛�
+ -->
+ <tcp enable="true"
+ port="60102"
+ processors="3"
+ idle="10"
+ />
+
+</config>
\ No newline at end of file
diff --git "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050jc\351\207\221\345\267\235\051.xml" "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050jc\351\207\221\345\267\235\051.xml"
new file mode 100644
index 0000000..5c473f0
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050jc\351\207\221\345\267\235\051.xml"
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config>
+ <server name="閫氫俊涓棿浠�" showStartInfo="true" company="http://www.dyjs.com"/>
+ <!--
+ 鍩烘湰閰嶇疆
+ orgTag 鏈烘瀯tag(瀵瑰簲鏈烘瀯tag,鍜屾暟鎹簮鍚庣紑)
+ isLowPower: 鏄惁涓轰綆鍔熻��
+ onlyDealRtus:鍙鐞嗘寚瀹歊TU鍦板潃璁惧锛屽叾浠栬澶囨暟鎹涪寮冿紝澶氫釜RTU鍦板潃鐢ㄨ嫳鏂囬�楀彿闅斿紑锛�
+ onlyOneProtocol锛氬湪鏀寔澶氶�氫俊鍗忚鏃讹紝鍙湁RTU涓婄嚎浜嗭紝鎵嶈兘璇嗗埆鍑鸿RTU瀹為檯鐢ㄧ殑閫氫俊鍗忚锛岃繘鑰岀敤姝ゅ崗璁В鏋愪笂琛屾暟鎹強鏋勯�犱笅琛屽懡浠ゃ��
+ 濡傛灉RTU鏈浘涓婄嚎锛堥�氫俊涓棿浠跺惎鍔ㄥ悗璇TU鏈浘涓婄嚎锛夛紝閭ｄ箞鍦ㄥ悜瀹冨彂閫佷笅琛屽懡浠ゆ椂锛屼笉鑳藉垽鏂嚭鍏堕噰鐢ㄧ殑鍗忚锛屼篃涓嶈兘鏋勯�犲懡浠わ紝灏ゅ叾鏄綆鍔熻�楁儏鍐典笅锛屼笉涓婄嚎鏄甯哥幇璞°��
+ 褰撳彧鏈変竴涓崗璁儏鍐典笅锛屽湪RTU鏈浘涓婄嚎鏃讹紝涔熻兘鐢ㄦ鍗忚鏋勯�犲懡浠ゅ苟缂撳瓨涓嬫潵锛屽挨鍏堕�傚悎浣庡姛鑰楁儏鍐点��
+ onlyOneProtocol=true: 閫氫俊涓棿浠跺綋鍓嶅彧鏈変竴涓崗璁�
+ downComandMaxResendTimes: 涓嬭鍛戒护鍏佽鍙戦�佺殑鏈�澶ф鏁癤锛屽嵆鍏佽閲嶅彂X-1
+ commandSendInterval: 閽堝涓�涓猂TU锛屼笅鍙戝懡浠ょ殑鏃堕棿闂撮殧(绉�)
+ fastCommandSendInterval: 閽堝涓�涓猂TU锛屼笅鍙戝揩閫熷懡浠わ紙濡傚崌绾у懡浠わ級鐨勬椂闂撮棿闅�(姣)锛屾閰嶇疆浣滅敤鍔涘彈涓嬮潰閰嶇疆椤筶astUpDataTimeLive闄愬埗
+ cacheWaitResultTimeout: 鍛戒护宸茬粡鍙戦�佽揪鏈�澶ф鏁帮紝浠嶆湭鏀跺埌鍛戒护缁撴灉锛岄渶瑕佸湪缂撳瓨缁х画绛夊緟锛屽叾绛夊緟鏈�澶ф椂闀�(绉�)锛屾湰绯荤粺RTU锛屽浜庡紑鍏虫车鍛戒护锛屽叾鍏堟墽琛屽紑鍏虫车鎶ワ紝鐒跺悗鍐嶈繘琛屽懡浠ゅ簲绛旓紝鎵�浠ユ鍊� 瑕佸ぇ涓�浜�
+ offLineCacheTimeout: 涓嶅湪绾跨紦瀛樼殑鍛戒护鏈�澶х紦瀛樻椂闀�(绉�)
+ lastUpDataTimeLive: TCP涓婅鏁版嵁鏃跺埢缂撳瓨鏃堕暱(姣)锛屽綋杈惧埌鏃堕暱鏃讹紝TCP涓婅鏁版嵁鏃跺埢琚竻绌猴紝閲囩敤TCP涓婅鏁版嵁鏃跺埢鐩殑鏄紝闃绘涓婅鏁版嵁鍚屾椂涓嬪彂鏁版嵁锛屽洜涓篟TU澶勭悊涓嶈繃鏉�
+ dbDataIdSuffix锛氭暟鎹簱鏁版嵁id鐢熸垚鍣ㄧ殑id鍚庣紑锛�0鏄粯璁ょ殑鍚庣紑锛屼竴鑸瑆eb绯荤粺搴旂敤锛屾暟鎹腑闂翠欢id鍚庣紑澶т簬绛変簬1
+ cacheUpDownDataWarnCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鎶ヨ閲忥紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
+ cacheUpDownDataMaxCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鏈�澶у�硷紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
+ disconnectedByNoUpDataMinutes锛氭病鏈変笂琛屾暟鎹殑鍒嗛挓鏁帮紝杈惧埌杩欎釜鍒嗛挓鏁帮紝璁や负RTU鏂綉浜嗭紝鍙栧�艰寖鍥存槸2-100
+ workReportDealOneByTimes: 宸ヤ綔鎶ュお棰戠箒锛孨娆′笂鎶ュ鐞�1娆★紝鍙栧�艰寖鍥存槸1-100
+ intakeAlarmLossMinValue: 瑙﹀彂鍙戦�侀拤閽夋姤璀︽秷鎭殑鍙栨按鍙ｆ棩婕忔崯閲忕殑鏈�灏忓�硷紙鍖呮嫭浣嗛櫎0.0澶栵級锛堝皬鏁帮級
+ sendDingDingAlarmMsInterval: 鏈夋姤璀﹀彂鐢熸椂锛屽悜閽夐拤鍙戦�佹秷鎭殑闂撮殧鏃堕暱锛堝垎閽燂級
+ -->
+ <base
+ orgTag="jc"
+ isLowPower="false"
+ onlyDealRtus=""
+ onlyOneProtocol="false"
+ downComandMaxResendTimes="1"
+ commandSendInterval="3"
+ fastCommandSendInterval="500"
+ cacheWaitResultTimeout="120"
+ offLineCacheTimeout="86400"
+ lastUpDataTimeLive="500"
+ dbDataIdSuffix="0"
+ cacheUpDownDataWarnCount="100000"
+ cacheUpDownDataMaxCount="110000"
+ disconnectedByNoUpDataMinutes="3"
+ workReportDealOneByTimes="1"
+ intakeAlarmLossMinValue="1.0"
+ sendDingDingAlarmMsInterval="60"
+ />
+
+ <!--
+ 2024-08-22 姝ら厤缃殏鏃舵湭搴旂敤
+ centerAddr: 涓績鍦板潃锛屽綋鍓嶏紝centerAddr鏈敤鍒�
+ synchroRtuClock: 鏄惁瀵筊TU鏍℃椂
+ synchroRtuClockTimepieces锛氬綋RTU涓庢湇鍔″櫒鏃堕挓鐩稿樊涓�瀹氭绉掞紙閰嶇疆鏂囦欢鏄閽燂級鍚庯紝杩涜鏍℃椂
+ -->
+ <protocol
+ centerAddr="1"
+ synchroRtuClock="true"
+ synchroRtuClockTimepieces="300000"
+ />
+
+ <!-- RTU 娑堟伅涓績
+ enable: 妯″潡鏄惁鍚姩
+ notifyInterval: 娑堟伅閫氱煡闂撮殧锛堢锛�
+ -->
+ <msCenter enable="true"
+ notifyInterval="5"
+ />
+
+ <!-- RTU 杞欢鍗囩骇
+ enable: 妯″潡鏄惁鍚姩
+ openNoUpgrade: 闃�寮�锛堟车寮�锛変笉鎵ц鍗囩骇
+ lastOpenMaxGoOn: 闃�寮�锛堟车寮�锛夌姸鎬佽缃互鏉ユ寔缁渶闀挎椂闂达紙绉掗挓锛夛紝瓒呰繃杩欎釜鏃堕棿璁や负鐘舵�佹棤鏁堬紙杩欎釜鏃堕暱鍙栧喅浜庡伐浣滄姤闂撮殧锛�
+ noOneRtuUpgradeMaxDuration锛氬崌绾т换鍔¤缃悗锛屾棤涓�璁惧鍗囩骇鏈�澶ф椂闀匡紙绉掞級锛岃秴杩囪繖涓椂闀匡紝璁や负鍗囩骇浠诲姟瀹屾垚锛屽彇鍊艰寖鍥存槸5鍒嗛挓~60鍒嗛挓
+ runningAndIdleDuration锛歳tu鍗囩骇鍚姩鍚庤繘鍏ュ崌绾т腑鐘舵�侊紝浣嗘煇绉嶆儏鍐典笅RTU涓嶅啀閫氫俊浜嗭紝涓�鐩村浜庣瓑寰呯姸鎬侊紝绛夊緟杈惧埌涓�瀹氭椂闀匡紙绉掞紝涓�鑸笌noOneRtuUpgradeMaxDuration鐩哥瓑锛夎涓哄崌绾уけ璐ワ紙涓�鍖呮鎴栧鍖呮锛夛紝鍙栧�艰寖鍥存槸5鍒嗛挓~60鍒嗛挓
+ failTryTimes锛氬崌绾уけ璐ュ悗锛堥拡瀵圭殑鏄湪绾胯繘琛屼簡鍗囩骇涓嬪彂鍛戒护锛夛紝閲嶆柊鍋胯瘯鍗囩骇娆℃暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉閲嶆柊鍋胯瘯鍗囩骇
+ ugMaxRtuAtOnce锛氫负浜嗙紦瑙ｉ�氫俊涓棿浠剁殑鍘嬪姏锛屽悓鏃舵敮鎸佸崌绾х殑RTU鍙版暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉鍙楅檺鍒�
+ rtuOffLineWaitDuration: rtu绂荤嚎锛岀瓑寰呭叾鍗囩骇鐨勬椂闀匡紙绉掞級锛岃秴杩囪繖涓椂闂达紝璁剧疆鍏跺崌绾уけ璐ワ紝涓旇缃崌绾т换鍔″畬鎴�
+ notifyStateInterval: 鍗囩骇鐘舵�侀�氱煡闂撮殧锛堢锛�
+ notifyTimesAfterOver: 鍗囩骇缁撴潫鍚庯紝鍐嶅悜web鏈嶅姟绯荤粺閫氱煡鐘舵�佺殑娆℃暟
+ -->
+ <upgrade enable="true"
+ openNoUpgrade="true"
+ lastOpenMaxGoOn="1800"
+ noOneRtuUpgradeMaxDuration="1200"
+ runningAndIdleDuration="1200"
+ failTryTimes="2"
+ ugMaxRtuAtOnce="5000"
+ rtuOffLineWaitDuration="1800"
+ notifyStateInterval="2"
+ notifyTimesAfterOver="1"
+ />
+
+
+ <!--
+ 鏀寔妯″潡
+ 鐭伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐ｇ敤鏃惰緝鐭殑宸ヤ綔浠诲姟
+ short_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟涓烘墍鏈塁PU鏍告暟+1锛坰hort姹犱笌long姹犲悇鍒嗕竴鍗婏級锛岃嫢涓�-1锛屼笉鍙楅檺鍒� 锛岃缃负0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ short_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ short_freeTimeout锛� 绾跨▼鏁扮┖闂叉椂闀匡紝鑻ユ睜涓嚎绋嬫暟閲忓ぇ浜巑inThread锛屼笖鏈夌殑绾跨▼绌洪棽鏃堕暱瓒呰繃freeTimeout锛屽垯娓呴櫎璇ョ嚎绋嬶紝涓轰簡涓嶆竻闄わ紝鎶妋inThread涓巑axThread璁剧疆鐩哥瓑
+ short_busyTimeout锛氱嚎绋嬩笉闂存柇宸ヤ綔鏃堕暱锛堝崟浣嶄负绉�)瓒呮椂闄愶紝璁や负绾跨▼宸茬粡浜嗗穿婧冿紝灏嗗己鍒舵竻闄わ紝鐭伐浣滄椂闀胯缃负5绉�
+ 闀垮伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐ｇ敤鏃惰緝闀跨殑宸ヤ綔浠诲姟锛屼緥濡傛暟鎹簱瀛樺彇鎿嶄綔
+ long_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟涓烘墍鏈塁PU鏍告暟+1锛坰hort姹犱笌long姹犲悇鍒嗕竴鍗婏級锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ long_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ long_freeTimeout锛� 绾跨▼鏁扮┖闂叉椂闀匡紝鑻ユ睜涓嚎绋嬫暟閲忓ぇ浜巑inThread锛屼笖鏈夌殑绾跨▼绌洪棽鏃堕暱瓒呰繃freeTimeout锛屽垯娓呴櫎璇ョ嚎绋�
+ long_busyTimeout锛氱嚎绋嬩笉闂存柇宸ヤ綔鏃堕暱锛堝崟浣嶄负绉�)瓒呮椂闄愶紝鑻ヤ负-1锛屼笉鍙楅檺鍒�
+ enableThreadPool锛氭槸鍚﹀惎鐢ㄧ嚎绋嬫睜
+ -->
+ <support
+ short_maxThread="6"
+ short_minThread="6"
+ short_freeTimeout="60"
+ short_busyTimeout="5"
+ long_maxThread="6"
+ long_minThread="6"
+ long_freeTimeout="60"
+ long_busyTimeout="-1"
+ enableThreadPool="true"
+ />
+
+ <!--
+ 璧勬簮妯″潡
+ rtuLogDir锛歊TU鏃ュ織鏂囦欢瀛樺偍鐩綍(鐩稿鐩綍)
+ rtuLogFileMaxSize锛歊TU鏃ュ織鏂囦欢鏈�澶у瓧鑺傛暟(B)
+ rtuLogFileMaxCount锛歊TU鏃ュ織鏂囦欢鏈�澶ф枃浠舵暟
+ monitorInterval锛歊tu鐘舵�佺洃瑙嗛棿闅�(鍒嗛挓)
+ saveDbInterval锛歊tu鐘舵�佸瓨鏁版嵁搴撻棿闅�(鍒嗛挓)
+ -->
+ <resource
+ rtuLogDir="rtuLogs/"
+ rtuLogFileMaxSize="1000000"
+ rtuLogFileMaxCount="3"
+ monitorInterval="2"
+ saveDbInterval="10"
+ />
+
+
+ <!--
+ 2024-08-22 姝ら厤缃殏鏃舵湭搴旂敤
+ port锛歳mi鏈嶅姟绔彛鍙�
+ context锛歳mi鏈嶅姟涓婁笅鏂�
+ -->
+ <rmi enable="true"
+ port="65400"
+ context="rtuMw"
+ />
+
+ <!--
+ coreInterval锛氫富绾跨▼姣忔鎵ц闂撮殧鏃堕暱锛堟绉掞級
+ queueWarnSize: 缂撳瓨闃熷垪鑺傜偣鏁拌鍛婃暟閲�
+ queueMaxSize: 缂撳瓨闃熷垪鑺傜偣鏁版渶澶ф暟閲�
+ -->
+ <core
+ coreInterval="100"
+ queueWarnSize="100000"
+ queueMaxSize="300000"
+ />
+
+ <!--
+ port锛氱鍙�
+ processors锛� Mina IO 澶勭悊涓婁笅琛屾暟鎹殑绾跨▼鏁帮紝涓�鑸槸CPU鎬绘牳鏁�+1
+ idle: 鍙戝憜鏃堕暱锛堢锛�
+ -->
+ <tcp enable="true"
+ port="60105"
+ processors="3"
+ idle="10"
+ />
+
+</config>
\ No newline at end of file
diff --git "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050lz\345\207\211\345\267\236\051.xml" "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050lz\345\207\211\345\267\236\051.xml"
new file mode 100644
index 0000000..fe51578
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050lz\345\207\211\345\267\236\051.xml"
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config>
+ <server name="閫氫俊涓棿浠�" showStartInfo="true" company="http://www.dyjs.com"/>
+ <!--
+ 鍩烘湰閰嶇疆
+ orgTag 鏈烘瀯tag(瀵瑰簲鏈烘瀯tag,鍜屾暟鎹簮鍚庣紑)
+ isLowPower: 鏄惁涓轰綆鍔熻��
+ onlyDealRtus:鍙鐞嗘寚瀹歊TU鍦板潃璁惧锛屽叾浠栬澶囨暟鎹涪寮冿紝澶氫釜RTU鍦板潃鐢ㄨ嫳鏂囬�楀彿闅斿紑锛�
+ onlyOneProtocol锛氬湪鏀寔澶氶�氫俊鍗忚鏃讹紝鍙湁RTU涓婄嚎浜嗭紝鎵嶈兘璇嗗埆鍑鸿RTU瀹為檯鐢ㄧ殑閫氫俊鍗忚锛岃繘鑰岀敤姝ゅ崗璁В鏋愪笂琛屾暟鎹強鏋勯�犱笅琛屽懡浠ゃ��
+ 濡傛灉RTU鏈浘涓婄嚎锛堥�氫俊涓棿浠跺惎鍔ㄥ悗璇TU鏈浘涓婄嚎锛夛紝閭ｄ箞鍦ㄥ悜瀹冨彂閫佷笅琛屽懡浠ゆ椂锛屼笉鑳藉垽鏂嚭鍏堕噰鐢ㄧ殑鍗忚锛屼篃涓嶈兘鏋勯�犲懡浠わ紝灏ゅ叾鏄綆鍔熻�楁儏鍐典笅锛屼笉涓婄嚎鏄甯哥幇璞°��
+ 褰撳彧鏈変竴涓崗璁儏鍐典笅锛屽湪RTU鏈浘涓婄嚎鏃讹紝涔熻兘鐢ㄦ鍗忚鏋勯�犲懡浠ゅ苟缂撳瓨涓嬫潵锛屽挨鍏堕�傚悎浣庡姛鑰楁儏鍐点��
+ onlyOneProtocol=true: 閫氫俊涓棿浠跺綋鍓嶅彧鏈変竴涓崗璁�
+ downComandMaxResendTimes: 涓嬭鍛戒护鍏佽鍙戦�佺殑鏈�澶ф鏁癤锛屽嵆鍏佽閲嶅彂X-1
+ commandSendInterval: 閽堝涓�涓猂TU锛屼笅鍙戝懡浠ょ殑鏃堕棿闂撮殧(绉�)
+ fastCommandSendInterval: 閽堝涓�涓猂TU锛屼笅鍙戝揩閫熷懡浠わ紙濡傚崌绾у懡浠わ級鐨勬椂闂撮棿闅�(姣)锛屾閰嶇疆浣滅敤鍔涘彈涓嬮潰閰嶇疆椤筶astUpDataTimeLive闄愬埗
+ cacheWaitResultTimeout: 鍛戒护宸茬粡鍙戦�佽揪鏈�澶ф鏁帮紝浠嶆湭鏀跺埌鍛戒护缁撴灉锛岄渶瑕佸湪缂撳瓨缁х画绛夊緟锛屽叾绛夊緟鏈�澶ф椂闀�(绉�)锛屾湰绯荤粺RTU锛屽浜庡紑鍏虫车鍛戒护锛屽叾鍏堟墽琛屽紑鍏虫车鎶ワ紝鐒跺悗鍐嶈繘琛屽懡浠ゅ簲绛旓紝鎵�浠ユ鍊� 瑕佸ぇ涓�浜�
+ offLineCacheTimeout: 涓嶅湪绾跨紦瀛樼殑鍛戒护鏈�澶х紦瀛樻椂闀�(绉�)
+ lastUpDataTimeLive: TCP涓婅鏁版嵁鏃跺埢缂撳瓨鏃堕暱(姣)锛屽綋杈惧埌鏃堕暱鏃讹紝TCP涓婅鏁版嵁鏃跺埢琚竻绌猴紝閲囩敤TCP涓婅鏁版嵁鏃跺埢鐩殑鏄紝闃绘涓婅鏁版嵁鍚屾椂涓嬪彂鏁版嵁锛屽洜涓篟TU澶勭悊涓嶈繃鏉�
+ dbDataIdSuffix锛氭暟鎹簱鏁版嵁id鐢熸垚鍣ㄧ殑id鍚庣紑锛�0鏄粯璁ょ殑鍚庣紑锛屼竴鑸瑆eb绯荤粺搴旂敤锛屾暟鎹腑闂翠欢id鍚庣紑澶т簬绛変簬1
+ cacheUpDownDataWarnCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鎶ヨ閲忥紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
+ cacheUpDownDataMaxCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鏈�澶у�硷紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
+ disconnectedByNoUpDataMinutes锛氭病鏈変笂琛屾暟鎹殑鍒嗛挓鏁帮紝杈惧埌杩欎釜鍒嗛挓鏁帮紝璁や负RTU鏂綉浜嗭紝鍙栧�艰寖鍥存槸2-100
+ workReportDealOneByTimes: 宸ヤ綔鎶ュお棰戠箒锛孨娆′笂鎶ュ鐞�1娆★紝鍙栧�艰寖鍥存槸1-100
+ intakeAlarmLossMinValue: 瑙﹀彂鍙戦�侀拤閽夋姤璀︽秷鎭殑鍙栨按鍙ｆ棩婕忔崯閲忕殑鏈�灏忓�硷紙鍖呮嫭浣嗛櫎0.0澶栵級锛堝皬鏁帮級
+ sendDingDingAlarmMsInterval: 鏈夋姤璀﹀彂鐢熸椂锛屽悜閽夐拤鍙戦�佹秷鎭殑闂撮殧鏃堕暱锛堝垎閽燂級
+ -->
+ <base
+ orgTag="lz"
+ isLowPower="false"
+ onlyDealRtus=""
+ onlyOneProtocol="false"
+ downComandMaxResendTimes="1"
+ commandSendInterval="3"
+ fastCommandSendInterval="500"
+ cacheWaitResultTimeout="120"
+ offLineCacheTimeout="86400"
+ lastUpDataTimeLive="500"
+ dbDataIdSuffix="0"
+ cacheUpDownDataWarnCount="100000"
+ cacheUpDownDataMaxCount="110000"
+ disconnectedByNoUpDataMinutes="3"
+ workReportDealOneByTimes="1"
+ intakeAlarmLossMinValue="1.0"
+ sendDingDingAlarmMsInterval="60"
+ />
+
+ <!--
+ 2024-08-22 姝ら厤缃殏鏃舵湭搴旂敤
+ centerAddr: 涓績鍦板潃锛屽綋鍓嶏紝centerAddr鏈敤鍒�
+ synchroRtuClock: 鏄惁瀵筊TU鏍℃椂
+ synchroRtuClockTimepieces锛氬綋RTU涓庢湇鍔″櫒鏃堕挓鐩稿樊涓�瀹氭绉掞紙閰嶇疆鏂囦欢鏄閽燂級鍚庯紝杩涜鏍℃椂
+ -->
+ <protocol
+ centerAddr="1"
+ synchroRtuClock="true"
+ synchroRtuClockTimepieces="300000"
+ />
+
+ <!-- RTU 娑堟伅涓績
+ enable: 妯″潡鏄惁鍚姩
+ notifyInterval: 娑堟伅閫氱煡闂撮殧锛堢锛�
+ -->
+ <msCenter enable="true"
+ notifyInterval="5"
+ />
+
+ <!-- RTU 杞欢鍗囩骇
+ enable: 妯″潡鏄惁鍚姩
+ openNoUpgrade: 闃�寮�锛堟车寮�锛変笉鎵ц鍗囩骇
+ lastOpenMaxGoOn: 闃�寮�锛堟车寮�锛夌姸鎬佽缃互鏉ユ寔缁渶闀挎椂闂达紙绉掗挓锛夛紝瓒呰繃杩欎釜鏃堕棿璁や负鐘舵�佹棤鏁堬紙杩欎釜鏃堕暱鍙栧喅浜庡伐浣滄姤闂撮殧锛�
+ noOneRtuUpgradeMaxDuration锛氬崌绾т换鍔¤缃悗锛屾棤涓�璁惧鍗囩骇鏈�澶ф椂闀匡紙绉掞級锛岃秴杩囪繖涓椂闀匡紝璁や负鍗囩骇浠诲姟瀹屾垚锛屽彇鍊艰寖鍥存槸5鍒嗛挓~60鍒嗛挓
+ runningAndIdleDuration锛歳tu鍗囩骇鍚姩鍚庤繘鍏ュ崌绾т腑鐘舵�侊紝浣嗘煇绉嶆儏鍐典笅RTU涓嶅啀閫氫俊浜嗭紝涓�鐩村浜庣瓑寰呯姸鎬侊紝绛夊緟杈惧埌涓�瀹氭椂闀匡紙绉掞紝涓�鑸笌noOneRtuUpgradeMaxDuration鐩哥瓑锛夎涓哄崌绾уけ璐ワ紙涓�鍖呮鎴栧鍖呮锛夛紝鍙栧�艰寖鍥存槸5鍒嗛挓~60鍒嗛挓
+ failTryTimes锛氬崌绾уけ璐ュ悗锛堥拡瀵圭殑鏄湪绾胯繘琛屼簡鍗囩骇涓嬪彂鍛戒护锛夛紝閲嶆柊鍋胯瘯鍗囩骇娆℃暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉閲嶆柊鍋胯瘯鍗囩骇
+ ugMaxRtuAtOnce锛氫负浜嗙紦瑙ｉ�氫俊涓棿浠剁殑鍘嬪姏锛屽悓鏃舵敮鎸佸崌绾х殑RTU鍙版暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉鍙楅檺鍒�
+ rtuOffLineWaitDuration: rtu绂荤嚎锛岀瓑寰呭叾鍗囩骇鐨勬椂闀匡紙绉掞級锛岃秴杩囪繖涓椂闂达紝璁剧疆鍏跺崌绾уけ璐ワ紝涓旇缃崌绾т换鍔″畬鎴�
+ notifyStateInterval: 鍗囩骇鐘舵�侀�氱煡闂撮殧锛堢锛�
+ notifyTimesAfterOver: 鍗囩骇缁撴潫鍚庯紝鍐嶅悜web鏈嶅姟绯荤粺閫氱煡鐘舵�佺殑娆℃暟
+ -->
+ <upgrade enable="true"
+ openNoUpgrade="true"
+ lastOpenMaxGoOn="1800"
+ noOneRtuUpgradeMaxDuration="1200"
+ runningAndIdleDuration="1200"
+ failTryTimes="2"
+ ugMaxRtuAtOnce="5000"
+ rtuOffLineWaitDuration="1800"
+ notifyStateInterval="2"
+ notifyTimesAfterOver="1"
+ />
+
+
+ <!--
+ 鏀寔妯″潡
+ 鐭伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐ｇ敤鏃惰緝鐭殑宸ヤ綔浠诲姟
+ short_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟涓烘墍鏈塁PU鏍告暟+1锛坰hort姹犱笌long姹犲悇鍒嗕竴鍗婏級锛岃嫢涓�-1锛屼笉鍙楅檺鍒� 锛岃缃负0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ short_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ short_freeTimeout锛� 绾跨▼鏁扮┖闂叉椂闀匡紝鑻ユ睜涓嚎绋嬫暟閲忓ぇ浜巑inThread锛屼笖鏈夌殑绾跨▼绌洪棽鏃堕暱瓒呰繃freeTimeout锛屽垯娓呴櫎璇ョ嚎绋嬶紝涓轰簡涓嶆竻闄わ紝鎶妋inThread涓巑axThread璁剧疆鐩哥瓑
+ short_busyTimeout锛氱嚎绋嬩笉闂存柇宸ヤ綔鏃堕暱锛堝崟浣嶄负绉�)瓒呮椂闄愶紝璁や负绾跨▼宸茬粡浜嗗穿婧冿紝灏嗗己鍒舵竻闄わ紝鐭伐浣滄椂闀胯缃负5绉�
+ 闀垮伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐ｇ敤鏃惰緝闀跨殑宸ヤ綔浠诲姟锛屼緥濡傛暟鎹簱瀛樺彇鎿嶄綔
+ long_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟涓烘墍鏈塁PU鏍告暟+1锛坰hort姹犱笌long姹犲悇鍒嗕竴鍗婏級锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ long_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ long_freeTimeout锛� 绾跨▼鏁扮┖闂叉椂闀匡紝鑻ユ睜涓嚎绋嬫暟閲忓ぇ浜巑inThread锛屼笖鏈夌殑绾跨▼绌洪棽鏃堕暱瓒呰繃freeTimeout锛屽垯娓呴櫎璇ョ嚎绋�
+ long_busyTimeout锛氱嚎绋嬩笉闂存柇宸ヤ綔鏃堕暱锛堝崟浣嶄负绉�)瓒呮椂闄愶紝鑻ヤ负-1锛屼笉鍙楅檺鍒�
+ enableThreadPool锛氭槸鍚﹀惎鐢ㄧ嚎绋嬫睜
+ -->
+ <support
+ short_maxThread="6"
+ short_minThread="6"
+ short_freeTimeout="60"
+ short_busyTimeout="5"
+ long_maxThread="6"
+ long_minThread="6"
+ long_freeTimeout="60"
+ long_busyTimeout="-1"
+ enableThreadPool="true"
+ />
+
+ <!--
+ 璧勬簮妯″潡
+ rtuLogDir锛歊TU鏃ュ織鏂囦欢瀛樺偍鐩綍(鐩稿鐩綍)
+ rtuLogFileMaxSize锛歊TU鏃ュ織鏂囦欢鏈�澶у瓧鑺傛暟(B)
+ rtuLogFileMaxCount锛歊TU鏃ュ織鏂囦欢鏈�澶ф枃浠舵暟
+ monitorInterval锛歊tu鐘舵�佺洃瑙嗛棿闅�(鍒嗛挓)
+ saveDbInterval锛歊tu鐘舵�佸瓨鏁版嵁搴撻棿闅�(鍒嗛挓)
+ -->
+ <resource
+ rtuLogDir="rtuLogs/"
+ rtuLogFileMaxSize="1000000"
+ rtuLogFileMaxCount="3"
+ monitorInterval="2"
+ saveDbInterval="10"
+ />
+
+
+ <!--
+ 2024-08-22 姝ら厤缃殏鏃舵湭搴旂敤
+ port锛歳mi鏈嶅姟绔彛鍙�
+ context锛歳mi鏈嶅姟涓婁笅鏂�
+ -->
+ <rmi enable="true"
+ port="65400"
+ context="rtuMw"
+ />
+
+ <!--
+ coreInterval锛氫富绾跨▼姣忔鎵ц闂撮殧鏃堕暱锛堟绉掞級
+ queueWarnSize: 缂撳瓨闃熷垪鑺傜偣鏁拌鍛婃暟閲�
+ queueMaxSize: 缂撳瓨闃熷垪鑺傜偣鏁版渶澶ф暟閲�
+ -->
+ <core
+ coreInterval="100"
+ queueWarnSize="100000"
+ queueMaxSize="300000"
+ />
+
+ <!--
+ port锛氱鍙�
+ processors锛� Mina IO 澶勭悊涓婁笅琛屾暟鎹殑绾跨▼鏁帮紝涓�鑸槸CPU鎬绘牳鏁�+1
+ idle: 鍙戝憜鏃堕暱锛堢锛�
+ -->
+ <tcp enable="true"
+ port="60104"
+ processors="3"
+ idle="10"
+ />
+
+</config>
\ No newline at end of file
diff --git "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050yq\345\273\266\345\272\206\051.xml" "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050yq\345\273\266\345\272\206\051.xml"
new file mode 100644
index 0000000..bac58fa
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050yq\345\273\266\345\272\206\051.xml"
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config>
+ <server name="閫氫俊涓棿浠�" showStartInfo="true" company="http://www.dyjs.com"/>
+ <!--
+ 鍩烘湰閰嶇疆
+ orgTag 鏈烘瀯tag(瀵瑰簲鏈烘瀯tag,鍜屾暟鎹簮鍚庣紑)
+ isLowPower: 鏄惁涓轰綆鍔熻��
+ onlyDealRtus:鍙鐞嗘寚瀹歊TU鍦板潃璁惧锛屽叾浠栬澶囨暟鎹涪寮冿紝澶氫釜RTU鍦板潃鐢ㄨ嫳鏂囬�楀彿闅斿紑锛�
+ onlyOneProtocol锛氬湪鏀寔澶氶�氫俊鍗忚鏃讹紝鍙湁RTU涓婄嚎浜嗭紝鎵嶈兘璇嗗埆鍑鸿RTU瀹為檯鐢ㄧ殑閫氫俊鍗忚锛岃繘鑰岀敤姝ゅ崗璁В鏋愪笂琛屾暟鎹強鏋勯�犱笅琛屽懡浠ゃ��
+ 濡傛灉RTU鏈浘涓婄嚎锛堥�氫俊涓棿浠跺惎鍔ㄥ悗璇TU鏈浘涓婄嚎锛夛紝閭ｄ箞鍦ㄥ悜瀹冨彂閫佷笅琛屽懡浠ゆ椂锛屼笉鑳藉垽鏂嚭鍏堕噰鐢ㄧ殑鍗忚锛屼篃涓嶈兘鏋勯�犲懡浠わ紝灏ゅ叾鏄綆鍔熻�楁儏鍐典笅锛屼笉涓婄嚎鏄甯哥幇璞°��
+ 褰撳彧鏈変竴涓崗璁儏鍐典笅锛屽湪RTU鏈浘涓婄嚎鏃讹紝涔熻兘鐢ㄦ鍗忚鏋勯�犲懡浠ゅ苟缂撳瓨涓嬫潵锛屽挨鍏堕�傚悎浣庡姛鑰楁儏鍐点��
+ onlyOneProtocol=true: 閫氫俊涓棿浠跺綋鍓嶅彧鏈変竴涓崗璁�
+ downComandMaxResendTimes: 涓嬭鍛戒护鍏佽鍙戦�佺殑鏈�澶ф鏁癤锛屽嵆鍏佽閲嶅彂X-1
+ commandSendInterval: 閽堝涓�涓猂TU锛屼笅鍙戝懡浠ょ殑鏃堕棿闂撮殧(绉�)
+ fastCommandSendInterval: 閽堝涓�涓猂TU锛屼笅鍙戝揩閫熷懡浠わ紙濡傚崌绾у懡浠わ級鐨勬椂闂撮棿闅�(姣)锛屾閰嶇疆浣滅敤鍔涘彈涓嬮潰閰嶇疆椤筶astUpDataTimeLive闄愬埗
+ cacheWaitResultTimeout: 鍛戒护宸茬粡鍙戦�佽揪鏈�澶ф鏁帮紝浠嶆湭鏀跺埌鍛戒护缁撴灉锛岄渶瑕佸湪缂撳瓨缁х画绛夊緟锛屽叾绛夊緟鏈�澶ф椂闀�(绉�)锛屾湰绯荤粺RTU锛屽浜庡紑鍏虫车鍛戒护锛屽叾鍏堟墽琛屽紑鍏虫车鎶ワ紝鐒跺悗鍐嶈繘琛屽懡浠ゅ簲绛旓紝鎵�浠ユ鍊� 瑕佸ぇ涓�浜�
+ offLineCacheTimeout: 涓嶅湪绾跨紦瀛樼殑鍛戒护鏈�澶х紦瀛樻椂闀�(绉�)
+ lastUpDataTimeLive: TCP涓婅鏁版嵁鏃跺埢缂撳瓨鏃堕暱(姣)锛屽綋杈惧埌鏃堕暱鏃讹紝TCP涓婅鏁版嵁鏃跺埢琚竻绌猴紝閲囩敤TCP涓婅鏁版嵁鏃跺埢鐩殑鏄紝闃绘涓婅鏁版嵁鍚屾椂涓嬪彂鏁版嵁锛屽洜涓篟TU澶勭悊涓嶈繃鏉�
+ dbDataIdSuffix锛氭暟鎹簱鏁版嵁id鐢熸垚鍣ㄧ殑id鍚庣紑锛�0鏄粯璁ょ殑鍚庣紑锛屼竴鑸瑆eb绯荤粺搴旂敤锛屾暟鎹腑闂翠欢id鍚庣紑澶т簬绛変簬1
+ cacheUpDownDataWarnCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鎶ヨ閲忥紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
+ cacheUpDownDataMaxCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鏈�澶у�硷紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
+ disconnectedByNoUpDataMinutes锛氭病鏈変笂琛屾暟鎹殑鍒嗛挓鏁帮紝杈惧埌杩欎釜鍒嗛挓鏁帮紝璁や负RTU鏂綉浜嗭紝鍙栧�艰寖鍥存槸2-100
+ workReportDealOneByTimes: 宸ヤ綔鎶ュお棰戠箒锛孨娆′笂鎶ュ鐞�1娆★紝鍙栧�艰寖鍥存槸1-100
+ intakeAlarmLossMinValue: 瑙﹀彂鍙戦�侀拤閽夋姤璀︽秷鎭殑鍙栨按鍙ｆ棩婕忔崯閲忕殑鏈�灏忓�硷紙鍖呮嫭浣嗛櫎0.0澶栵級锛堝皬鏁帮級
+ sendDingDingAlarmMsInterval: 鏈夋姤璀﹀彂鐢熸椂锛屽悜閽夐拤鍙戦�佹秷鎭殑闂撮殧鏃堕暱锛堝垎閽燂級
+ -->
+ <base
+ orgTag="yq"
+ isLowPower="false"
+ onlyDealRtus=""
+ onlyOneProtocol="false"
+ downComandMaxResendTimes="1"
+ commandSendInterval="3"
+ fastCommandSendInterval="500"
+ cacheWaitResultTimeout="120"
+ offLineCacheTimeout="86400"
+ lastUpDataTimeLive="500"
+ dbDataIdSuffix="0"
+ cacheUpDownDataWarnCount="100000"
+ cacheUpDownDataMaxCount="110000"
+ disconnectedByNoUpDataMinutes="3"
+ workReportDealOneByTimes="1"
+ intakeAlarmLossMinValue="1.0"
+ sendDingDingAlarmMsInterval="60"
+ />
+
+ <!--
+ 2024-08-22 姝ら厤缃殏鏃舵湭搴旂敤
+ centerAddr: 涓績鍦板潃锛屽綋鍓嶏紝centerAddr鏈敤鍒�
+ synchroRtuClock: 鏄惁瀵筊TU鏍℃椂
+ synchroRtuClockTimepieces锛氬綋RTU涓庢湇鍔″櫒鏃堕挓鐩稿樊涓�瀹氭绉掞紙閰嶇疆鏂囦欢鏄閽燂級鍚庯紝杩涜鏍℃椂
+ -->
+ <protocol
+ centerAddr="1"
+ synchroRtuClock="true"
+ synchroRtuClockTimepieces="300000"
+ />
+
+ <!-- RTU 娑堟伅涓績
+ enable: 妯″潡鏄惁鍚姩
+ notifyInterval: 娑堟伅閫氱煡闂撮殧锛堢锛�
+ -->
+ <msCenter enable="true"
+ notifyInterval="5"
+ />
+
+ <!-- RTU 杞欢鍗囩骇
+ enable: 妯″潡鏄惁鍚姩
+ openNoUpgrade: 闃�寮�锛堟车寮�锛変笉鎵ц鍗囩骇
+ lastOpenMaxGoOn: 闃�寮�锛堟车寮�锛夌姸鎬佽缃互鏉ユ寔缁渶闀挎椂闂达紙绉掗挓锛夛紝瓒呰繃杩欎釜鏃堕棿璁や负鐘舵�佹棤鏁堬紙杩欎釜鏃堕暱鍙栧喅浜庡伐浣滄姤闂撮殧锛�
+ noOneRtuUpgradeMaxDuration锛氬崌绾т换鍔¤缃悗锛屾棤涓�璁惧鍗囩骇鏈�澶ф椂闀匡紙绉掞級锛岃秴杩囪繖涓椂闀匡紝璁や负鍗囩骇浠诲姟瀹屾垚锛屽彇鍊艰寖鍥存槸5鍒嗛挓~60鍒嗛挓
+ runningAndIdleDuration锛歳tu鍗囩骇鍚姩鍚庤繘鍏ュ崌绾т腑鐘舵�侊紝浣嗘煇绉嶆儏鍐典笅RTU涓嶅啀閫氫俊浜嗭紝涓�鐩村浜庣瓑寰呯姸鎬侊紝绛夊緟杈惧埌涓�瀹氭椂闀匡紙绉掞紝涓�鑸笌noOneRtuUpgradeMaxDuration鐩哥瓑锛夎涓哄崌绾уけ璐ワ紙涓�鍖呮鎴栧鍖呮锛夛紝鍙栧�艰寖鍥存槸5鍒嗛挓~60鍒嗛挓
+ failTryTimes锛氬崌绾уけ璐ュ悗锛堥拡瀵圭殑鏄湪绾胯繘琛屼簡鍗囩骇涓嬪彂鍛戒护锛夛紝閲嶆柊鍋胯瘯鍗囩骇娆℃暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉閲嶆柊鍋胯瘯鍗囩骇
+ ugMaxRtuAtOnce锛氫负浜嗙紦瑙ｉ�氫俊涓棿浠剁殑鍘嬪姏锛屽悓鏃舵敮鎸佸崌绾х殑RTU鍙版暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉鍙楅檺鍒�
+ rtuOffLineWaitDuration: rtu绂荤嚎锛岀瓑寰呭叾鍗囩骇鐨勬椂闀匡紙绉掞級锛岃秴杩囪繖涓椂闂达紝璁剧疆鍏跺崌绾уけ璐ワ紝涓旇缃崌绾т换鍔″畬鎴�
+ notifyStateInterval: 鍗囩骇鐘舵�侀�氱煡闂撮殧锛堢锛�
+ notifyTimesAfterOver: 鍗囩骇缁撴潫鍚庯紝鍐嶅悜web鏈嶅姟绯荤粺閫氱煡鐘舵�佺殑娆℃暟
+ -->
+ <upgrade enable="true"
+ openNoUpgrade="true"
+ lastOpenMaxGoOn="1800"
+ noOneRtuUpgradeMaxDuration="1200"
+ runningAndIdleDuration="1200"
+ failTryTimes="2"
+ ugMaxRtuAtOnce="5000"
+ rtuOffLineWaitDuration="1800"
+ notifyStateInterval="2"
+ notifyTimesAfterOver="1"
+ />
+
+
+ <!--
+ 鏀寔妯″潡
+ 鐭伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐ｇ敤鏃惰緝鐭殑宸ヤ綔浠诲姟
+ short_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟涓烘墍鏈塁PU鏍告暟+1锛坰hort姹犱笌long姹犲悇鍒嗕竴鍗婏級锛岃嫢涓�-1锛屼笉鍙楅檺鍒� 锛岃缃负0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ short_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ short_freeTimeout锛� 绾跨▼鏁扮┖闂叉椂闀匡紝鑻ユ睜涓嚎绋嬫暟閲忓ぇ浜巑inThread锛屼笖鏈夌殑绾跨▼绌洪棽鏃堕暱瓒呰繃freeTimeout锛屽垯娓呴櫎璇ョ嚎绋嬶紝涓轰簡涓嶆竻闄わ紝鎶妋inThread涓巑axThread璁剧疆鐩哥瓑
+ short_busyTimeout锛氱嚎绋嬩笉闂存柇宸ヤ綔鏃堕暱锛堝崟浣嶄负绉�)瓒呮椂闄愶紝璁や负绾跨▼宸茬粡浜嗗穿婧冿紝灏嗗己鍒舵竻闄わ紝鐭伐浣滄椂闀胯缃负5绉�
+ 闀垮伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐ｇ敤鏃惰緝闀跨殑宸ヤ綔浠诲姟锛屼緥濡傛暟鎹簱瀛樺彇鎿嶄綔
+ long_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟涓烘墍鏈塁PU鏍告暟+1锛坰hort姹犱笌long姹犲悇鍒嗕竴鍗婏級锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ long_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ long_freeTimeout锛� 绾跨▼鏁扮┖闂叉椂闀匡紝鑻ユ睜涓嚎绋嬫暟閲忓ぇ浜巑inThread锛屼笖鏈夌殑绾跨▼绌洪棽鏃堕暱瓒呰繃freeTimeout锛屽垯娓呴櫎璇ョ嚎绋�
+ long_busyTimeout锛氱嚎绋嬩笉闂存柇宸ヤ綔鏃堕暱锛堝崟浣嶄负绉�)瓒呮椂闄愶紝鑻ヤ负-1锛屼笉鍙楅檺鍒�
+ enableThreadPool锛氭槸鍚﹀惎鐢ㄧ嚎绋嬫睜
+ -->
+ <support
+ short_maxThread="6"
+ short_minThread="6"
+ short_freeTimeout="60"
+ short_busyTimeout="5"
+ long_maxThread="6"
+ long_minThread="6"
+ long_freeTimeout="60"
+ long_busyTimeout="-1"
+ enableThreadPool="true"
+ />
+
+ <!--
+ 璧勬簮妯″潡
+ rtuLogDir锛歊TU鏃ュ織鏂囦欢瀛樺偍鐩綍(鐩稿鐩綍)
+ rtuLogFileMaxSize锛歊TU鏃ュ織鏂囦欢鏈�澶у瓧鑺傛暟(B)
+ rtuLogFileMaxCount锛歊TU鏃ュ織鏂囦欢鏈�澶ф枃浠舵暟
+ monitorInterval锛歊tu鐘舵�佺洃瑙嗛棿闅�(鍒嗛挓)
+ saveDbInterval锛歊tu鐘舵�佸瓨鏁版嵁搴撻棿闅�(鍒嗛挓)
+ -->
+ <resource
+ rtuLogDir="rtuLogs/"
+ rtuLogFileMaxSize="1000000"
+ rtuLogFileMaxCount="3"
+ monitorInterval="2"
+ saveDbInterval="10"
+ />
+
+
+ <!--
+ 2024-08-22 姝ら厤缃殏鏃舵湭搴旂敤
+ port锛歳mi鏈嶅姟绔彛鍙�
+ context锛歳mi鏈嶅姟涓婁笅鏂�
+ -->
+ <rmi enable="true"
+ port="65400"
+ context="rtuMw"
+ />
+
+ <!--
+ coreInterval锛氫富绾跨▼姣忔鎵ц闂撮殧鏃堕暱锛堟绉掞級
+ queueWarnSize: 缂撳瓨闃熷垪鑺傜偣鏁拌鍛婃暟閲�
+ queueMaxSize: 缂撳瓨闃熷垪鑺傜偣鏁版渶澶ф暟閲�
+ -->
+ <core
+ coreInterval="100"
+ queueWarnSize="100000"
+ queueMaxSize="300000"
+ />
+
+ <!--
+ port锛氱鍙�
+ processors锛� Mina IO 澶勭悊涓婁笅琛屾暟鎹殑绾跨▼鏁帮紝涓�鑸槸CPU鎬绘牳鏁�+1
+ idle: 鍙戝憜鏃堕暱锛堢锛�
+ -->
+ <tcp enable="true"
+ port="60101"
+ processors="3"
+ idle="10"
+ />
+
+</config>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml
index 9e9b323..bc4b74c 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml
@@ -25,7 +25,7 @@
sendDingDingAlarmMsInterval: 鏈夋姤璀﹀彂鐢熸椂锛屽悜閽夐拤鍙戦�佹秷鎭殑闂撮殧鏃堕暱锛堝垎閽燂級
-->
<base
- orgTag="ym"
+ orgTag="mq"
isLowPower="false"
onlyDealRtus=""
onlyOneProtocol="false"
@@ -159,7 +159,7 @@
idle: 鍙戝憜鏃堕暱锛堢锛�
-->
<tcp enable="true"
- port="60000"
+ port="60100"
processors="3"
idle="10"
/>
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/.gitattributes b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/.gitattributes
new file mode 100644
index 0000000..3b41682
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/.gitattributes
@@ -0,0 +1,2 @@
+/mvnw text eol=lf
+*.cmd text eol=crlf
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/.gitignore b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/.gitignore
new file mode 100644
index 0000000..85c2a88
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/.gitignore
@@ -0,0 +1,34 @@
+HELP.md
+target/
+/pipIrr-mw-rtu3rd.iml
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/.mvn/wrapper/maven-wrapper.properties b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..d58dfb7
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/mvnw b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/mvnw
new file mode 100644
index 0000000..19529dd
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/mvnw
@@ -0,0 +1,259 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Apache Maven Wrapper startup batch script, version 3.3.2
+#
+# Optional ENV vars
+# -----------------
+# JAVA_HOME - location of a JDK home dir, required when download maven via java source
+# MVNW_REPOURL - repo url base for downloading maven distribution
+# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
+# ----------------------------------------------------------------------------
+
+set -euf
+[ "${MVNW_VERBOSE-}" != debug ] || set -x
+
+# OS specific support.
+native_path() { printf %s\\n "$1"; }
+case "$(uname)" in
+CYGWIN* | MINGW*)
+ [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
+ native_path() { cygpath --path --windows "$1"; }
+ ;;
+esac
+
+# set JAVACMD and JAVACCMD
+set_java_home() {
+ # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
+ if [ -n "${JAVA_HOME-}" ]; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ]; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ JAVACCMD="$JAVA_HOME/jre/sh/javac"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ JAVACCMD="$JAVA_HOME/bin/javac"
+
+ if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
+ echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
+ echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
+ return 1
+ fi
+ fi
+ else
+ JAVACMD="$(
+ 'set' +e
+ 'unset' -f command 2>/dev/null
+ 'command' -v java
+ )" || :
+ JAVACCMD="$(
+ 'set' +e
+ 'unset' -f command 2>/dev/null
+ 'command' -v javac
+ )" || :
+
+ if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
+ echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
+ return 1
+ fi
+ fi
+}
+
+# hash string like Java String::hashCode
+hash_string() {
+ str="${1:-}" h=0
+ while [ -n "$str" ]; do
+ char="${str%"${str#?}"}"
+ h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
+ str="${str#?}"
+ done
+ printf %x\\n $h
+}
+
+verbose() { :; }
+[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
+
+die() {
+ printf %s\\n "$1" >&2
+ exit 1
+}
+
+trim() {
+ # MWRAPPER-139:
+ # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
+ # Needed for removing poorly interpreted newline sequences when running in more
+ # exotic environments such as mingw bash on Windows.
+ printf "%s" "${1}" | tr -d '[:space:]'
+}
+
+# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
+while IFS="=" read -r key value; do
+ case "${key-}" in
+ distributionUrl) distributionUrl=$(trim "${value-}") ;;
+ distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
+ esac
+done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties"
+[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties"
+
+case "${distributionUrl##*/}" in
+maven-mvnd-*bin.*)
+ MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
+ case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
+ *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
+ :Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
+ :Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
+ :Linux*x86_64*) distributionPlatform=linux-amd64 ;;
+ *)
+ echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
+ distributionPlatform=linux-amd64
+ ;;
+ esac
+ distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
+ ;;
+maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
+*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
+esac
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
+distributionUrlName="${distributionUrl##*/}"
+distributionUrlNameMain="${distributionUrlName%.*}"
+distributionUrlNameMain="${distributionUrlNameMain%-bin}"
+MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
+MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
+
+exec_maven() {
+ unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
+ exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
+}
+
+if [ -d "$MAVEN_HOME" ]; then
+ verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+ exec_maven "$@"
+fi
+
+case "${distributionUrl-}" in
+*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
+*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
+esac
+
+# prepare tmp dir
+if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
+ clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
+ trap clean HUP INT TERM EXIT
+else
+ die "cannot create temp dir"
+fi
+
+mkdir -p -- "${MAVEN_HOME%/*}"
+
+# Download and Install Apache Maven
+verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+verbose "Downloading from: $distributionUrl"
+verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+# select .zip or .tar.gz
+if ! command -v unzip >/dev/null; then
+ distributionUrl="${distributionUrl%.zip}.tar.gz"
+ distributionUrlName="${distributionUrl##*/}"
+fi
+
+# verbose opt
+__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
+[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
+
+# normalize http auth
+case "${MVNW_PASSWORD:+has-password}" in
+'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+esac
+
+if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
+ verbose "Found wget ... using wget"
+ wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
+elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
+ verbose "Found curl ... using curl"
+ curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
+elif set_java_home; then
+ verbose "Falling back to use Java to download"
+ javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
+ targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
+ cat >"$javaSource" <<-END
+ public class Downloader extends java.net.Authenticator
+ {
+ protected java.net.PasswordAuthentication getPasswordAuthentication()
+ {
+ return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
+ }
+ public static void main( String[] args ) throws Exception
+ {
+ setDefault( new Downloader() );
+ java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
+ }
+ }
+ END
+ # For Cygwin/MinGW, switch paths to Windows format before running javac and java
+ verbose " - Compiling Downloader.java ..."
+ "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
+ verbose " - Running Downloader.java ..."
+ "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
+fi
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+if [ -n "${distributionSha256Sum-}" ]; then
+ distributionSha256Result=false
+ if [ "$MVN_CMD" = mvnd.sh ]; then
+ echo "Checksum validation is not supported for maven-mvnd." >&2
+ echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+ exit 1
+ elif command -v sha256sum >/dev/null; then
+ if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then
+ distributionSha256Result=true
+ fi
+ elif command -v shasum >/dev/null; then
+ if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
+ distributionSha256Result=true
+ fi
+ else
+ echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
+ echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+ exit 1
+ fi
+ if [ $distributionSha256Result = false ]; then
+ echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
+ echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
+ exit 1
+ fi
+fi
+
+# unzip and move
+if command -v unzip >/dev/null; then
+ unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
+else
+ tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
+fi
+printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url"
+mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
+
+clean || :
+exec_maven "$@"
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/mvnw.cmd b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/mvnw.cmd
new file mode 100644
index 0000000..249bdf3
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/mvnw.cmd
@@ -0,0 +1,149 @@
+<# : batch portion
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Apache Maven Wrapper startup batch script, version 3.3.2
+@REM
+@REM Optional ENV vars
+@REM MVNW_REPOURL - repo url base for downloading maven distribution
+@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output
+@REM ----------------------------------------------------------------------------
+
+@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
+@SET __MVNW_CMD__=
+@SET __MVNW_ERROR__=
+@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
+@SET PSModulePath=
+@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
+ IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
+)
+@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
+@SET __MVNW_PSMODULEP_SAVE=
+@SET __MVNW_ARG0_NAME__=
+@SET MVNW_USERNAME=
+@SET MVNW_PASSWORD=
+@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*)
+@echo Cannot start maven from wrapper >&2 && exit /b 1
+@GOTO :EOF
+: end batch / begin powershell #>
+
+$ErrorActionPreference = "Stop"
+if ($env:MVNW_VERBOSE -eq "true") {
+ $VerbosePreference = "Continue"
+}
+
+# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
+$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
+if (!$distributionUrl) {
+ Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
+}
+
+switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
+ "maven-mvnd-*" {
+ $USE_MVND = $true
+ $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
+ $MVN_CMD = "mvnd.cmd"
+ break
+ }
+ default {
+ $USE_MVND = $false
+ $MVN_CMD = $script -replace '^mvnw','mvn'
+ break
+ }
+}
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+if ($env:MVNW_REPOURL) {
+ $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" }
+ $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')"
+}
+$distributionUrlName = $distributionUrl -replace '^.*/',''
+$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
+$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain"
+if ($env:MAVEN_USER_HOME) {
+ $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain"
+}
+$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
+$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
+
+if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
+ Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+ Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
+ exit $?
+}
+
+if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
+ Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
+}
+
+# prepare tmp dir
+$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
+$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
+$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
+trap {
+ if ($TMP_DOWNLOAD_DIR.Exists) {
+ try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+ catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+ }
+}
+
+New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
+
+# Download and Install Apache Maven
+Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+Write-Verbose "Downloading from: $distributionUrl"
+Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+$webclient = New-Object System.Net.WebClient
+if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
+ $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
+}
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
+if ($distributionSha256Sum) {
+ if ($USE_MVND) {
+ Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
+ }
+ Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
+ if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
+ Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
+ }
+}
+
+# unzip and move
+Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
+Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null
+try {
+ Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
+} catch {
+ if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
+ Write-Error "fail to move MAVEN_HOME"
+ }
+} finally {
+ try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+ catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+}
+
+Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/pom.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/pom.xml
new file mode 100644
index 0000000..e0dbf79
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/pom.xml
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>pipIrr-mw</artifactId>
+ <groupId>com.dy</groupId>
+ <version>1.0.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <packaging>jar</packaging>
+ <artifactId>pipIrr-mw-rtu3rd</artifactId>
+ <version>1.0.0</version>
+ <name>pipIrr-mw-rtu3rd</name>
+ <description>绗笁鏂规帴鍏ヤ腑闂翠欢</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- 鍔ㄦ�佸姞杞芥柊缂栬瘧鐨勭被 -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-devtools</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- apache mina -->
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ <version>2.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>2.0.7</version>
+ </dependency>
+
+ <!-- 闃块噷fastjson -->
+ <dependency>
+ <groupId>com.alibaba.fastjson2</groupId>
+ <artifactId>fastjson2</artifactId>
+ <version>2.0.40</version>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba.fastjson2</groupId>
+ <artifactId>fastjson2-extension-spring6</artifactId>
+ <version>2.0.40</version>
+ </dependency>
+
+ <!-- 娴嬭瘯 -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <!-- 鐢熸垚涓嶅寘鍚緷璧杍ar鐨勫彲鎵цjar鍖�
+ <plugin>
+ !- spring boot鎻愪緵鐨刴aven鎵撳寘鎻掍欢 -
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ !-
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ -
+ <configuration>
+ !- 涓嶅姞鐨勮瘽鏈�缁堝寘鍚嶄负: ${artifactId}-${version}.jar, 鍔犱簡鐨勮瘽鏈�缁堝寘鍚�: ${artifactId}-${version}-${classifier}.jar -
+ <classifier>execute</classifier>
+ !- 涓嶆寚瀹氱敓鎴愯矾寰勭殑璇�, 榛樿淇濆瓨鍦� ${build.directory} 涓� -
+ <outputDirectory>${project.build.directory}/execute</outputDirectory>
+ <finalName>${artifactId}-${version}</finalName>
+ <layout>ZIP</layout>
+ <mainClass>com.dy.pipIrrBase.PipIrrBaseApplication</mainClass>
+ <includes>
+ <include>
+ <groupId>com.dy</groupId>
+ <artifactId>pipIrr-common</artifactId>
+ </include>
+ <include>
+ <groupId>com.dy</groupId>
+ <artifactId>pipIrr-global</artifactId>
+ </include>
+ </includes>
+ <excludes>
+ <exclude>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ </exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+
+ </plugin>
+ -->
+ <!-- 鎷疯礉渚濊禆鐨刯ar鍖呭埌lib鐩綍-->
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <configuration>
+ <!-- 涓嶅姞鐨勮瘽鏈�缁堝寘鍚嶄负: ${artifactId}-${version}.jar, 鍔犱簡鐨勮瘽鏈�缁堝寘鍚�: ${artifactId}-${version}-${classifier}.jar
+ <classifier>execute</classifier>
+ -->
+ <!-- ${project.build.directory}鏄痬aven鍙橀噺锛屽唴缃殑锛岃〃绀簍arget鐩綍,濡傛灉涓嶅啓锛屽皢鍦ㄦ牴鐩綍涓嬪垱寤�/lib -->
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ <!-- excludeTransitive:鏄惁涓嶅寘鍚棿鎺ヤ緷璧栧寘锛屾瘮濡傛垜浠緷璧朅锛屼絾鏄疉鍙堜緷璧栦簡B锛屾垜浠槸鍚︿篃瑕佹妸B鎵撹繘鍘� 榛樿涓嶆墦-->
+ <excludeTransitive>false</excludeTransitive>
+ <!-- 澶嶅埗鐨刯ar鏂囦欢鍘绘帀鐗堟湰淇℃伅 -->
+ <stripVersion>false</stripVersion>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <layout>ZIP</layout>
+ <mainClass>com.dy.rtuMw.PipIrrMwAcceptApplication</mainClass>
+ <includes>
+ <include>
+ <groupId>com.dy</groupId>
+ <artifactId>pipIrr-common</artifactId>
+ </include>
+ <include>
+ <groupId>com.dy</groupId>
+ <artifactId>pipIrr-global</artifactId>
+ </include>
+ </includes>
+ <excludes>
+ <exclude>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ </exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <!-- 璁剧疆java缂栬瘧鐗堟湰锛岃繍琛岀幆澧冪増鏈� -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <!-- source锛� 婧愪唬鐮佺紪璇戠増鏈紱target锛� 鐩爣骞冲彴缂栬瘧鐗堟湰锛沞ncoding锛� 瀛楃闆嗙紪鐮併�� -->
+ <configuration>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
+ <encoding>${encoding}</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- 瑙ｅ喅璧勬簮鏂囦欢鐨勭紪鐮侀棶棰� -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>${encoding}</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- maven閲屾墽琛屾祴璇曠敤渚嬬殑鎻掍欢 -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- 涓嬮潰瑙ｅ喅锛氬綋杩涜Maven Lifecycle package鏃舵姤閿欙細Could not find artifact org.apache.mina:mina-core:bundle:2.2.1 in maven (https://repo1.maven.org/maven2/)-->
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/AdapterImp_HttpUnit.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/AdapterImp_HttpUnit.java
new file mode 100644
index 0000000..7fff3c1
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/AdapterImp_HttpUnit.java
@@ -0,0 +1,26 @@
+package com.dy.rtuMw3rd;
+
+
+import com.dy.rtuMw3rd.http4Xjnk.HttpUnitAdapter;
+import com.dy.rtuMw3rd.http4Xjnk.HttpUnitConfigVo;
+import com.dy.rtuMw3rd.tcp4Bjnl.TcpClUnitAdapter;
+import com.dy.rtuMw3rd.tcp4Bjnl.TcpClUnitConfigVo;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/03/18 15:49
+ * @Description
+ */
+public class AdapterImp_HttpUnit implements HttpUnitAdapter {
+
+ private HttpUnitConfigVo configVo ;
+
+ public HttpUnitConfigVo getConfig() {
+ return configVo;
+ }
+
+ public void setConfig(HttpUnitConfigVo configVo){
+ this.configVo = configVo ;
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/AdapterImp_TcpClUnit.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/AdapterImp_TcpClUnit.java
new file mode 100644
index 0000000..f6dac06
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/AdapterImp_TcpClUnit.java
@@ -0,0 +1,24 @@
+package com.dy.rtuMw3rd;
+
+
+import com.dy.rtuMw3rd.tcp4Bjnl.TcpClUnitAdapter;
+import com.dy.rtuMw3rd.tcp4Bjnl.TcpClUnitConfigVo;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/03/18 15:49
+ * @Description
+ */
+public class AdapterImp_TcpClUnit implements TcpClUnitAdapter {
+
+ private TcpClUnitConfigVo configVo ;
+
+ public TcpClUnitConfigVo getConfig() {
+ return configVo;
+ }
+
+ public void setConfig(TcpClUnitConfigVo configVo){
+ this.configVo = configVo ;
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/PipIrrMwRtu3rdApplication.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/PipIrrMwRtu3rdApplication.java
new file mode 100644
index 0000000..ef658c1
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/PipIrrMwRtu3rdApplication.java
@@ -0,0 +1,71 @@
+package com.dy.rtuMw3rd;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.context.annotation.FilterType;
+
+
+@Slf4j
+@EnableAspectJAutoProxy
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) //绂佹鍚姩鏁版嵁搴撹繛鎺ユ睜
+@ComponentScan(basePackages = {"com.dy.common", "com.dy.pipIrrGlobal", "com.dy.rtuMw3rd"},
+ excludeFilters = {
+ @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {
+ com.dy.common.apiDoc.SpringApiConfig.class, //涓�绉嶆帓闄ょ被鐨勬柟寮�
+ com.dy.pipIrrGlobal.config.DingTalk.class
+ }),
+ @ComponentScan.Filter(type = FilterType.REGEX, pattern = {
+ //浜岀鎺掗櫎绫荤殑鏂瑰紡锛屽啓姝ｅ垯琛ㄨ揪寮忥紝闇�瑕佸鐩爣绫荤殑瀹屽叏闄愬畾鍚嶅畬鍏ㄥ尮閰嶏紝鍚﹀垯涓嶇敓鏁�
+ "com.dy.common.aop..*",
+ "com.dy.common.apiDoc..*",
+ "com.dy.common.multiDataSource..*",
+ "com.dy.common.mybatis..*",
+ "com.dy.common.singleDataSource..*",
+ "com.dy.common.webFilter..*",
+ "com.dy.common.webListener..*",
+ "com.dy.pipIrrGlobal.webCtrls..*"
+ })
+ }
+)
+public class PipIrrMwRtu3rdApplication implements CommandLineRunner {
+
+ public static void main(String[] args) {
+ new SpringApplicationBuilder(PipIrrMwRtu3rdApplication.class).run(args);
+ }
+
+ /**
+ * Spring瀹瑰櫒鍚姩瀹屾垚鍚庯紝鎵ц涓嬮潰鏂规硶
+ * @param args 鍙傛暟
+ * @throws Exception 寮傚父
+ */
+ @Override
+ public void run(String... args) throws Exception {
+ try{
+ //绛夊緟涓�涓�
+ Thread.sleep(500L);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ finally {
+ this.startMwSv() ;
+ }
+ }
+ private Server sv ;
+ @Autowired
+ public void setSv(Server sv){
+ this.sv = sv ;
+ }
+ private void startMwSv(){
+ if(sv != null){
+ sv.startServer();
+ }
+ }
+
+
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/Server.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/Server.java
new file mode 100644
index 0000000..7e20a0d
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/Server.java
@@ -0,0 +1,135 @@
+package com.dy.rtuMw3rd;
+
+import com.dy.common.mw.UnitInterface;
+import com.dy.common.util.ConfigXml4Springboot;
+import com.dy.rtuMw3rd.http4Xjnk.HttpUnit;
+import com.dy.rtuMw3rd.http4Xjnk.HttpUnitConfigVo;
+import com.dy.rtuMw3rd.tcp4Bjnl.TcpClUnit;
+import com.dy.rtuMw3rd.tcp4Bjnl.TcpClUnitConfigVo;
+import org.jdom2.Document;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/03/18 15:49
+ * @Description
+ */
+@Component
+public class Server {
+ @Autowired
+ protected ResourceLoader resourceLoader ;
+
+ private ConfigXml4Springboot conf = null ;
+ private Document doc = null ;
+ private boolean showStartInfo = false ;
+
+ private List<UnitInterface> units = new ArrayList<UnitInterface>() ;
+
+ /**
+ * 鍚姩鏈嶅姟
+ */
+ public void startServer() {
+ long start = System.currentTimeMillis();
+ try {
+ this.conf = new ConfigXml4Springboot() ;
+ this.doc = this.conf.createDom(resourceLoader, "config.xml") ;
+ ////////////////
+ //鏈嶅姟 閰嶇疆
+ this.showStartInfo = this.conf.getSetAttrBoolean(this.doc, "config.server", "showStartInfo", null, null) ;
+
+ this.startUnits() ;
+
+ String svName ;
+ try{
+ svName = this.conf.getSetAttrTxt(this.doc, "config.server", "name", null, false, null) ;
+ }catch(Exception e){
+ svName = "" ;
+ }
+
+ String company ;
+ try{
+ company = this.conf.getSetAttrTxt(this.doc, "config.server", "company", null, true, null) ;
+ }catch(Exception e){
+ company = "" ;
+ }
+ System.out.println("0O0OOOOOOOOO00 OOOOOOOO OOOOOOOO") ;
+ System.out.println("@@@@@@@@@@@@@@@@@#O $@@@@@@@@& @@@@@@@@#") ;
+ System.out.println("@@@@@@@@@@@@@@@@@@@@# @@@@@@@@# $@@@@@@@@&") ;
+ System.out.println("@@@@@@@@@@@@@@@@@@@@@@# #@@@@@@@@@@@@@@@@O") ;
+ System.out.println("@@@@@@@@@@@@@@@@@@@@@@@@ &@@@@@@@@@@@@@@") ;
+ System.out.println("@@@@@@@$ $@@@@@@@@@& O@@@@@@@@@@@#") ;
+ System.out.println("@@@@@@@$ @@@@@@@@@ @@@@@@@@@& " + svName ) ;
+ System.out.println("@@@@@@@$ O@@@@@@@@@ &@@@@@@@@") ;
+
+ if(ServerProperties.BjnlServerIp != null){
+ System.out.println("@@@@@@@$ O@@@@@@@@@ &@@@@@@@@ 鍖椾含鍐滄灄鏈嶅姟 " + (ServerProperties.BjnlServerIp + " " + ServerProperties.BjnlServerPort) ) ;
+ }else{
+ System.out.println("@@@@@@@$ O@@@@@@@@@ &@@@@@@@@") ;
+ }
+ if(ServerProperties.XjnkServerHttpsBaseUrl != null){
+ System.out.println("@@@@@@@$ O@@@@@@@@@ &@@@@@@@@ 鏂扮枂鍐滃灕--鏈嶅姟 " + (ServerProperties.XjnkServerHttpsBaseUrl) ) ;
+ }else{
+ System.out.println("@@@@@@@$ O@@@@@@@@@ &@@@@@@@@") ;
+ }
+ System.out.println("@@@@@@@$ #@@@@@@@@@$ &@@@@@@@@") ;
+ System.out.println("@@@@@@@@@@@@@@@@@@@@@@@# &@@@@@@@@ Running in standalone mode" ) ;
+ System.out.println("@@@@@@@@@@@@@@@@@@@@@@& &@@@@@@@@ Startup in " + (System.currentTimeMillis() - start) + " MS" ) ;
+ System.out.println("@@@@@@@@@@@@@@@@@@@@# &@@@@@@@@ " + company) ;
+ System.out.println("@@@@@@@@@@@@@@@@@#O &@@@@@@@@") ;
+
+ }catch(Exception e){
+ e.printStackTrace();
+ }
+ }
+
+
+ private void startUnits() {
+ try {
+ // ///////////////
+ // http 妯″潡
+ HttpUnitConfigVo httpVo = new HttpUnitConfigVo();
+ httpVo.httpsBaseUr = this.conf.getSetAttrTxt(this.doc, "config.xjnk", "httpsBaseUrl", null, false, null) ;
+ httpVo.appid = this.conf.getSetAttrTxt(this.doc, "config.xjnk", "appid", null, false, null) ;
+ httpVo.secret = this.conf.getSetAttrTxt(this.doc, "config.xjnk", "secret", null, false, null) ;
+ httpVo.flushDataFromSvInterval = conf.getSetAttrPlusInt(this.doc, "config.xjnk", "flushDataFromSvInterval", null, 1, 7200000, null) ;
+
+ ServerProperties.XjnkServerHttpsBaseUrl = httpVo.httpsBaseUr ;
+
+ AdapterImp_HttpUnit httpAdapt = new AdapterImp_HttpUnit();
+ httpAdapt.setConfig(httpVo);
+ HttpUnit httpUnit = HttpUnit.getInstance();
+ httpUnit.setAdapter(httpAdapt);
+ httpUnit.start(obj -> {
+ });
+ units.add(httpUnit) ;
+
+ // ///////////////
+ // TCP 妯″潡
+ TcpClUnitConfigVo tcpVo = new TcpClUnitConfigVo();
+ tcpVo.BjnlServerIp = this.conf.getSetAttrTxt(this.doc, "config.bjnl", "ip", null, false, null) ;
+ tcpVo.BjnlServerPort = conf.getSetAttrPlusInt(this.doc, "config.bjnl", "port", null, 1, 65536, null) ;
+ tcpVo.BjnlConnectTimeout = conf.getSetAttrPlusInt(this.doc, "config.bjnl", "connectTimeout", null, 1, 65536, null) ;
+ tcpVo.BjnlApikey = this.conf.getSetAttrTxt(this.doc, "config.bjnl", "apikey", null, false, null) ;
+ tcpVo.BjnlSecretkey = this.conf.getSetAttrTxt(this.doc, "config.bjnl", "secretkey", null, false, null) ;
+ tcpVo.heartBeatInterval = conf.getSetAttrPlusInt(this.doc, "config.bjnl", "heartBeatInterval", null, 1, 3600000, null) ;
+
+ ServerProperties.BjnlServerIp = tcpVo.BjnlServerIp ;
+ ServerProperties.BjnlServerPort = tcpVo.BjnlServerPort ;
+
+ AdapterImp_TcpClUnit tcpAdapt = new AdapterImp_TcpClUnit();
+ tcpAdapt.setConfig(tcpVo);
+ TcpClUnit tcpUnit = TcpClUnit.getInstance();
+ tcpUnit.setAdapter(tcpAdapt);
+ tcpUnit.start(obj -> {
+ });
+ units.add(tcpUnit) ;
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/ServerProperties.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/ServerProperties.java
new file mode 100644
index 0000000..cdf55b5
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/ServerProperties.java
@@ -0,0 +1,13 @@
+package com.dy.rtuMw3rd;
+
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/02/26 11:03
+ * @Description
+ */
+public class ServerProperties {
+ public static String XjnkServerHttpsBaseUrl = "https://www.sshyun.com" ;//鏈嶅姟绔痟ttps鏈嶅姟URL
+ public static String BjnlServerIp = "127.0.0.1" ;//鏈嶅姟绔疘P
+ public static Integer BjnlServerPort = 1234 ;//鏈嶅姟绔鍙�
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/HttpSvCtrl.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/HttpSvCtrl.java
new file mode 100644
index 0000000..ca9fcc3
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/HttpSvCtrl.java
@@ -0,0 +1,35 @@
+package com.dy.rtuMw3rd.http4Xjnk;
+
+import com.dy.rtuMw3rd.http4Xjnk.deal.XjnkDealer;
+import com.dy.rtuMw3rd.http4Xjnk.protocol.statusPush.ControllerStatusVo;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/3/17 11:24
+ * @Description
+ */
+@Slf4j
+@RestController
+@RequestMapping(path="xjnkCtrl")
+public class HttpSvCtrl {
+
+ private XjnkDealer dealer ;
+ @Autowired
+ private void setDealer(XjnkDealer dealer){
+ this.dealer = dealer;
+ }
+
+ @PostMapping(path = "receive")
+ public void receive(HttpServletRequest request, @RequestBody Map<String, Object> body){
+ log.info("鎺ユ敹鐨勬暟鎹細", body);
+ ControllerStatusVo vo = ControllerStatusVo.may2Vo(body) ;
+ this.dealer.dealPush(vo);
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/HttpUnit.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/HttpUnit.java
new file mode 100644
index 0000000..b2c2357
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/HttpUnit.java
@@ -0,0 +1,63 @@
+package com.dy.rtuMw3rd.http4Xjnk;
+
+import com.dy.common.mw.UnitAdapterInterface;
+import com.dy.common.mw.UnitCallbackInterface;
+import com.dy.common.mw.UnitInterface;
+import com.dy.common.springUtil.SpringContextUtil;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/3/19 15:14
+ * @Description
+ */
+public class HttpUnit implements UnitInterface {
+
+ private static final Logger log = LogManager.getLogger(HttpUnit.class) ;
+
+ private static HttpUnit instance = new HttpUnit() ;
+
+ public static HttpUnitAdapter adapter ;
+ public static HttpUnitConfigVo confVo ;
+
+ private HttpUnit(){} ;
+
+ public static HttpUnit getInstance(){
+ return instance ;
+ }
+
+ @Override
+ public void setAdapter(UnitAdapterInterface adapter) throws Exception {
+ if(adapter == null){
+ throw new Exception("Http妯″潡閫傞厤鍣ㄥ璞′笉鑳戒负绌猴紒") ;
+ }
+ HttpUnit.adapter = (HttpUnitAdapter)adapter ;
+ HttpUnit.confVo = HttpUnit.adapter.getConfig() ;
+ if(HttpUnit.confVo == null){
+ throw new Exception("Http妯″潡閰嶇疆瀵硅薄涓嶈兘涓虹┖锛�") ;
+ }
+ }
+
+ @Override
+ public void start(UnitCallbackInterface callback) throws Exception {
+ System.out.println("Http妯″潡鎴愬姛鍚姩");
+ this.doStart();
+ callback.call(null) ;
+ }
+
+
+ @Override
+ public void stop(UnitCallbackInterface callback) throws Exception {
+ callback.call(null);
+ }
+
+ private void doStart(){
+ Worker w = SpringContextUtil.getBean(Worker.class) ;
+ w.setHttpsBaseUr(confVo.httpsBaseUr);
+ w.setAppid(confVo.appid);
+ w.setSecret(confVo.secret );
+ w.setWorkInterval(confVo.flushDataFromSvInterval + 0L);
+ w.start();
+ }
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/HttpUnitAdapter.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/HttpUnitAdapter.java
new file mode 100644
index 0000000..d8b702a
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/HttpUnitAdapter.java
@@ -0,0 +1,13 @@
+package com.dy.rtuMw3rd.http4Xjnk;
+
+import com.dy.common.mw.UnitAdapterInterface;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/3/19 15:15
+ * @Description
+ */
+public interface HttpUnitAdapter extends UnitAdapterInterface {
+
+ HttpUnitConfigVo getConfig() ;
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/HttpUnitConfigVo.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/HttpUnitConfigVo.java
new file mode 100644
index 0000000..f1faa55
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/HttpUnitConfigVo.java
@@ -0,0 +1,16 @@
+package com.dy.rtuMw3rd.http4Xjnk;
+
+import lombok.Data;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/3/19 15:15
+ * @Description
+ */
+@Data
+public class HttpUnitConfigVo {
+ public String httpsBaseUr ;
+ public String appid ;
+ public String secret ;
+ public Integer flushDataFromSvInterval = 120000 ;
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/HttpsRq.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/HttpsRq.java
new file mode 100644
index 0000000..a5f72ef
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/HttpsRq.java
@@ -0,0 +1,63 @@
+package com.dy.rtuMw3rd.http4Xjnk;
+
+import com.dy.common.util.HttpCallback;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Map;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/3/17 11:14
+ * @Description
+ */
+@Component()
+public class HttpsRq extends HttpRq {
+ /**
+ * get璇锋眰锛岃繑鍥瀓son鍐呭
+ * 鍚屾
+ * @param httpsBaseUrl
+ * @param params
+ * @param cb
+ * @throws Exception
+ */
+ public void get4JsonBySync(String httpsBaseUrl, Map<String, String> params, HttpCallback cb) throws Exception {
+ super.get4JsonBySync(httpsBaseUrl, params, cb);
+ }
+ /**
+ * get璇锋眰锛岃繑鍥瀓son鍐呭
+ * 寮傛
+ * @param httpsBaseUrl
+ * @param params
+ * @param cb
+ * @throws Exception
+ */
+ public void get4JsonByAsync(String httpsBaseUrl, Map<String, String> params, HttpCallback cb) throws Exception {
+ super.get4JsonByAsync(httpsBaseUrl, params, cb);
+ }
+
+ /**
+ * get璇锋眰锛岃繑鍥瀓son鍐呭
+ * 鍚屾
+ * @param httpsBaseUrl
+ * @param params
+ * @param cb
+ * @throws Exception
+ */
+ public void post4JsonBySync(String httpsBaseUrl, Map<String, String> params, HttpCallback cb) throws Exception {
+ super.post4JsonBySync(httpsBaseUrl, params, cb);
+ }
+ /**
+ * get璇锋眰锛岃繑鍥瀓son鍐呭
+ * 寮傛
+ * @param httpsBaseUrl
+ * @param params
+ * @param cb
+ * @throws Exception
+ */
+ public void post4JsonByAsync(String httpsBaseUrl, Map<String, String> params, HttpCallback cb) throws Exception {
+ super.post4JsonByAsync(httpsBaseUrl, params, cb);
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/Worker.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/Worker.java
new file mode 100644
index 0000000..be427a4
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/Worker.java
@@ -0,0 +1,218 @@
+package com.dy.rtuMw3rd.http4Xjnk;
+
+
+import java.util.*;
+
+import com.alibaba.fastjson2.JSON;
+import com.dy.rtuMw3rd.http4Xjnk.deal.XjnkDealer;
+import com.dy.rtuMw3rd.http4Xjnk.protocol.XjnkResVo;
+import com.dy.rtuMw3rd.http4Xjnk.protocol.controller.ControllerVo;
+import com.dy.rtuMw3rd.http4Xjnk.protocol.mainController.MainControllerVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import com.dy.rtuMw3rd.http4Xjnk.protocol.XjnkProtocol;
+import com.dy.rtuMw3rd.http4Xjnk.protocol.accessToken.Res4AccessTokenVo;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/3/19 15:53
+ * @Description
+ */
+@Slf4j
+@Component()
+public class Worker extends TimerTask {
+
+ private HttpsRq httpsRq ;
+ private XjnkDealer dealer ;
+
+ public String httpsBaseUr ;
+ public String appid ;
+ public String secret ;
+ private Long workInterval ;//寰幆浠诲姟闂撮殧
+
+ private Timer timer;
+
+ private boolean stop;
+
+ private boolean first = true ;
+ private boolean isAccessTokenGot = false ;
+ private List<MainControllerVo> mainControllerVos ;
+ private List<ControllerVo> controllerVos ;
+
+ @Autowired
+ public void setHttpsRq(HttpsRq httpsRq){
+ this.httpsRq = httpsRq ;
+ }
+ @Autowired
+ private void setDealer(XjnkDealer dealer){
+ this.dealer = dealer;
+ }
+ public void setHttpsBaseUr(String httpsBaseUr){
+ this.httpsBaseUr = httpsBaseUr ;
+ }
+ public void setAppid(String appid){
+ this.appid = appid ;
+ }
+ public void setSecret(String secret){
+ this.secret = secret ;
+ }
+ public void setWorkInterval(Long workInterval){
+ this.workInterval = workInterval ;
+ }
+
+ public void stop(){
+ this.stop = true ;
+ if(this.timer != null){
+ this.timer.cancel();
+ }
+ }
+
+ public boolean isStop(){
+ return this.stop ;
+ }
+
+ public void start(){
+ this.timer = new Timer();
+ this.stop = false ;
+ new Thread(() -> {
+ while(true){
+ try {
+ getAccessToken() ;
+ }catch (Exception e){
+ log.error("鏂扮枂鍐滃灕--鑾峰緱AccessToken寮傚父" + (e.getMessage() == null ? "" : (":" + e.getMessage())), e);
+ }
+ try{
+ Thread.sleep(10000);
+ }catch (Exception e){
+ }
+ if(isAccessTokenGot){
+ timer.schedule(this, 0, this.workInterval);
+ break ;
+ }
+ }
+ }).start();
+ }
+
+ @Override
+ public void run() {
+ if(first){
+ first = false ;
+ }else{
+ try{
+ getAccessToken() ;
+ }catch(Exception e){
+ log.error("鏂扮枂鍐滃灕--鑾峰緱AccessToken寮傚父" + (e.getMessage() == null ? "" : (":" + e.getMessage())), e);
+ }
+ }
+ if(isAccessTokenGot) {
+ try {
+ getMainControllers();
+ } catch (Exception e) {
+ log.error("鏂扮枂鍐滃灕--鑾峰緱涓绘帶鍒跺櫒寮傚父" + (e.getMessage() == null ? "" : (":" + e.getMessage())), e);
+ }
+ try {
+ getControllers();
+ } catch (Exception e) {
+ log.error("鏂扮枂鍐滃灕--鑾峰緱鎺у埗鍣ㄥ紓甯�" + (e.getMessage() == null ? "" : (":" + e.getMessage())), e);
+ }
+ }
+ }
+
+ public void getAccessToken() throws Exception{
+ this.httpsRq.get4JsonBySync(this.httpsBaseUr + "/thirdapi/token?appid=" + this.appid + "&secret=" + this.secret,
+ null,
+ (statusCode, charset, body) -> {
+ // 鎵撳嵃鍝嶅簲鐘舵�佺爜
+ //System.out.println("Status Code: " + statusCode);
+ // 鎵撳嵃鍝嶅簲鍐呭缂栫爜绫诲瀷
+ //System.out.println("Response encoding: " + charset);
+ // 鎵撳嵃鍝嶅簲浣撳唴瀹�
+ //System.out.println("Response Body: " + body);
+ if(statusCode != null && statusCode.equals(XjnkProtocol.SuccessCode)){
+ Res4AccessTokenVo vo = JSON.parseObject(body, Res4AccessTokenVo.class);
+ if(vo != null && vo.errcode != null && vo.errcode.length() > 0){
+ log.error("鏂扮枂鍐滃灕--鑾峰彇AccessToken澶辫触锛宔rrcode锛�" + vo.errcode + "锛宔rrmsg锛�" + vo.errmsg);
+ }else{
+ isAccessTokenGot = true ;
+ XjnkProtocol.AccessToken = vo.accessToken ;
+ XjnkProtocol.AccessTokenExpires = vo.expires ;
+ log.info("鏂扮枂鍐滃灕--鑾峰彇AccessToken鎴愬姛锛宎ccessToken锛�" + vo.accessToken + "锛宔xpires锛�" + vo.expires);
+ }
+ }
+ });
+ }
+
+ /**
+ * 鑾峰彇涓绘帶鍒跺櫒
+ * @throws Exception
+ */
+ public void getMainControllers() throws Exception{
+ this.httpsRq.get4JsonBySync(this.httpsBaseUr + "/thirdapi/pridevice/all?access_token=" + XjnkProtocol.AccessToken,
+ null,
+ (statusCode, charset, body) -> {
+ if(statusCode != null && statusCode.equals(XjnkProtocol.SuccessCode)){
+ try{
+ //棣栧厛璁や负杩斿洖鐨勬槸閿欒淇℃伅锛岃繘琛屽皾璇�
+ XjnkResVo vo = JSON.parseObject(body, XjnkResVo.class);
+ if(vo != null && vo.errcode != null && vo.errcode.length() > 0){
+ log.error("鏂扮枂鍐滃灕--鑾峰彇涓绘帶鍒跺櫒澶辫触锛宔rrcode锛�" + vo.errcode + "锛宔rrmsg锛�" + vo.errmsg);
+ }
+ }catch (Exception e){
+ //濡傛灉涓嶆槸閿欒淇℃伅锛岄偅灏辨槸姝ｇ‘淇℃伅
+ try{
+ mainControllerVos = JSON.parseArray(body, MainControllerVo.class);
+ log.info("鏂扮枂鍐滃灕--鑾峰彇涓绘帶鍒跺櫒鎴愬姛锛�");
+ if(mainControllerVos != null && mainControllerVos.size() > 0){
+ this.dealer.dealMainController(mainControllerVos);
+ for(MainControllerVo cvo : mainControllerVos){
+ log.info("涓绘帶鍒跺櫒锛�" + cvo);
+ }
+ }
+ }catch (Exception ee){
+ log.error("鏂扮枂鍐滃灕--鑾峰彇涓绘帶鍒跺櫒寮傚父" + (ee.getMessage() == null ? "" : (":" + ee.getMessage())), ee);
+ }
+ }
+ }
+ });
+ }
+ /**
+ * 鑾峰彇鎺у埗鍣�
+ * @throws Exception
+ */
+ public void getControllers() throws Exception{
+ if(this.mainControllerVos != null && this.mainControllerVos.size() > 0){
+ for(MainControllerVo mcvo : this.mainControllerVos){
+ Map<String, String> params = new HashMap<>() ;
+ params.put("pdId", "" + mcvo.id) ;
+ this.httpsRq.post4JsonBySync(this.httpsBaseUr + "/thirdapi/control_device/query?access_token=" + XjnkProtocol.AccessToken,
+ params,
+ (statusCode, charset, body) -> {
+ if(statusCode != null && statusCode.equals(XjnkProtocol.SuccessCode)){
+ try{
+ //棣栧厛璁や负杩斿洖鐨勬槸閿欒淇℃伅锛岃繘琛屽皾璇�
+ XjnkResVo vo = JSON.parseObject(body, XjnkResVo.class);
+ if(vo != null && vo.errcode != null && vo.errcode.length() > 0){
+ log.error("鏂扮枂鍐滃灕--鑾峰彇鎺у埗鍣ㄥけ璐ワ紝errcode锛�" + vo.errcode + "锛宔rrmsg锛�" + vo.errmsg);
+ }
+ }catch (Exception e){
+ //濡傛灉涓嶆槸閿欒淇℃伅锛岄偅灏辨槸姝ｇ‘淇℃伅
+ try{
+ controllerVos = JSON.parseArray(body, ControllerVo.class);
+ log.info("鏂扮枂鍐滃灕--鑾峰彇鎺у埗鍣ㄦ垚鍔燂細");
+ if(controllerVos != null && controllerVos.size() > 0){
+ this.dealer.dealController(controllerVos);
+ for(ControllerVo cvo : controllerVos){
+ log.info("鎺у埗鍣細" + cvo);
+ }
+ }
+ }catch (Exception ee){
+ log.error("鏂扮枂鍐滃灕--鑾峰彇鎺у埗鍣ㄥ紓甯�" + (ee.getMessage() == null ? "" : (":" + ee.getMessage())), ee);
+ }
+ }
+ }
+ });
+ }
+ }
+ }
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/deal/XjnkDealer.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/deal/XjnkDealer.java
new file mode 100644
index 0000000..333149e
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/deal/XjnkDealer.java
@@ -0,0 +1,31 @@
+package com.dy.rtuMw3rd.http4Xjnk.deal;
+
+import com.dy.rtuMw3rd.http4Xjnk.protocol.controller.ControllerVo;
+import com.dy.rtuMw3rd.http4Xjnk.protocol.mainController.MainControllerVo;
+import com.dy.rtuMw3rd.http4Xjnk.protocol.statusPush.ControllerStatusVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/3/20 16:09
+ * @Description
+ */
+@Slf4j
+@Component()
+public class XjnkDealer {
+
+ public void dealMainController(List<MainControllerVo> list){
+ log.warn("鏂扮枂鍐滃灕--涓绘帶鍒跺櫒鏁版嵁澶勭悊閫昏緫鏈疄鐜�");
+ }
+
+ public void dealController(List<ControllerVo> list){
+ log.warn("鏂扮枂鍐滃灕--鎺у埗鍣ㄦ暟鎹鐞嗛�昏緫鏈疄鐜�");
+ }
+
+ public void dealPush(ControllerStatusVo vo){
+ log.warn("鏂扮枂鍐滃灕--鐘舵�佹帹閫佹暟鎹鐞嗛�昏緫鏈疄鐜�");
+ }
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/XjnkProtocol.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/XjnkProtocol.java
new file mode 100644
index 0000000..ed99cb2
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/XjnkProtocol.java
@@ -0,0 +1,13 @@
+package com.dy.rtuMw3rd.http4Xjnk.protocol;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/3/19 16:27
+ * @Description
+ */
+public class XjnkProtocol {
+ public static String AccessToken = null ;
+ public static Integer AccessTokenExpires = null ;
+
+ public static final String SuccessCode = "200" ;
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/XjnkResVo.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/XjnkResVo.java
new file mode 100644
index 0000000..8e759b7
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/XjnkResVo.java
@@ -0,0 +1,14 @@
+package com.dy.rtuMw3rd.http4Xjnk.protocol;
+
+import lombok.Data;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/3/19 17:00
+ * @Description
+ */
+@Data
+public class XjnkResVo {
+ public String errcode ;
+ public String errmsg ;
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/accessToken/Res4AccessTokenVo.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/accessToken/Res4AccessTokenVo.java
new file mode 100644
index 0000000..5e5203e
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/accessToken/Res4AccessTokenVo.java
@@ -0,0 +1,17 @@
+package com.dy.rtuMw3rd.http4Xjnk.protocol.accessToken;
+
+import com.dy.rtuMw3rd.http4Xjnk.protocol.XjnkResVo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/3/19 16:53
+ * @Description
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+public class Res4AccessTokenVo extends XjnkResVo {
+ public String accessToken ;
+ public Integer expires ;
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/controller/ControllerVo.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/controller/ControllerVo.java
new file mode 100644
index 0000000..db4faa1
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/controller/ControllerVo.java
@@ -0,0 +1,21 @@
+package com.dy.rtuMw3rd.http4Xjnk.protocol.controller;
+
+import lombok.Data;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/3/20 14:40
+ * @Description
+ */
+@Data
+public class ControllerVo {
+ public String name ; //"闃�1", 鎺у埗鍣↖D
+ public String code ; //"SS110",鍚嶇О
+ public Integer ctId ; //1,璁惧缂栫爜
+ public Integer pdId ; //1,璁惧绫诲瀷
+ public String action ; //"",涓绘帶ID
+ public Integer groupId ; //1,鍒嗙粍ID
+ public String mode ; //"gprs",璁惧妯″紡
+ public String iccid ; //"SS112",璁惧iccid
+ public Integer sort ; //1,鎺掑簭
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/mainController/MainControllerVo.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/mainController/MainControllerVo.java
new file mode 100644
index 0000000..7a44fc6
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/mainController/MainControllerVo.java
@@ -0,0 +1,21 @@
+package com.dy.rtuMw3rd.http4Xjnk.protocol.mainController;
+
+import lombok.Data;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/3/19 17:17
+ * @Description
+ */
+@Data
+public class MainControllerVo {
+ public String channel = "1" ;
+ public String deviceid = "sanfangceshipingtai" ;
+ public Long id = 393L ;
+ public Double lat = 0.0 ;
+ public Double lng = 0.0 ;
+ public String mode = "virtual" ;
+ public String name = "涓夋柟瀵规帴娴嬭瘯骞冲彴" ;
+ public String panid = "1" ;
+ public Integer sort = 0 ;
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/statusPush/ControllerStatusVo.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/statusPush/ControllerStatusVo.java
new file mode 100644
index 0000000..60aee56
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/http4Xjnk/protocol/statusPush/ControllerStatusVo.java
@@ -0,0 +1,49 @@
+package com.dy.rtuMw3rd.http4Xjnk.protocol.statusPush;
+
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/3/20 15:59
+ * @Description
+ */
+@Data
+public class ControllerStatusVo {
+ public String classify ; //": "1",
+ public String code ; //": "723",
+ public String line ; //": true,
+ public String pdId ; //": "29",
+ public String category; // "C",
+
+ public String quality; //淇″彿寮哄害 db ("quality": "-36")
+ public String battery; //鐢甸噺 % ("battery": "100",)
+ public String realtimePressure; // 瀹炴椂鍘嬪姏 bar
+ public String constantPressure; // 鎭掑畾鍘嬪姏 bar
+ public String flowRate; // 鐬椂娴侀噺锛堝彲閫夛級 m鲁/h
+ public String totalFlowA; // 绱娴侀噺 A锛堝彲閫夛級 m鲁
+ public String totalFlowB; // 绱娴侀噺 B锛堝彲閫夛級 m鲁
+ public String onoff; // 鐘舵�侊紝鈥�0鈥濓細鍏抽棴锛屸��1鈥濓細寮�鍚� 锛�"onoff": "1",锛�
+ public String angle; // 闃�闂ㄨ搴︼紝鈥�0鈥濓細鍏ㄥ叧锛屸��90鈥濓細A 闃�鍏ㄥ紑锛屸��1-90鈥濓細A 闃�寮�鍚紝鈥�180鈥濓細B 闃�鍏ㄥ紑锛屸��91-180鈥濓細B 闃�寮�鍚�
+
+ public static ControllerStatusVo may2Vo(Map<String, Object> map){
+ ControllerStatusVo vo = new ControllerStatusVo() ;
+ vo.classify = map.get("classify").toString();
+ vo.code = map.get("code").toString();
+ vo.line = map.get("line").toString();
+ vo.pdId = map.get("pdId").toString();
+ vo.category = map.get("category").toString();
+
+ vo.quality = map.get("quality").toString();
+ vo.battery = map.get("battery").toString();
+ vo.realtimePressure = map.get("realtimePressure").toString();
+ vo.constantPressure = map.get("constantPressure").toString();
+ vo.flowRate = map.get("flowRate").toString();
+ vo.totalFlowA = map.get("totalFlowA").toString();
+ vo.totalFlowB = map.get("totalFlowB").toString();
+ vo.onoff = map.get("onoff").toString();
+ vo.angle = map.get("angle").toString();
+ return vo ;
+ }
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/NetDataCodecFactory.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/NetDataCodecFactory.java
new file mode 100644
index 0000000..edd77b8
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/NetDataCodecFactory.java
@@ -0,0 +1,40 @@
+package com.dy.rtuMw3rd.tcp4Bjnl;
+
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.codec.ProtocolCodecFactory;
+import org.apache.mina.filter.codec.ProtocolDecoder;
+import org.apache.mina.filter.codec.ProtocolEncoder;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/03/18 14:20
+ * @Description
+ */
+public class NetDataCodecFactory implements ProtocolCodecFactory {
+ private ProtocolEncoder encoder;
+ private ProtocolDecoder decoder;
+
+ public NetDataCodecFactory() {
+ encoder = new NetDataEncoder();
+ decoder = new NetDataDecoder();
+ }
+
+ /**
+ * 寰楀埌鍗忚缂栫爜鍣�
+ * @param ioSession 缃戠粶浼氳瘽
+ * @return 鍗忚缂栫爜鍣�
+ */
+ @Override
+ public ProtocolEncoder getEncoder(IoSession ioSession) {
+ return encoder;
+ }
+ /**
+ * 寰楀埌鍗忚瑙ｇ爜鍣�
+ * @param ioSession 缃戠粶浼氳瘽
+ * @return 鍗忚瑙ｇ爜鍣�
+ */
+ @Override
+ public ProtocolDecoder getDecoder(IoSession ioSession) {
+ return decoder;
+ }
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/NetDataDecoder.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/NetDataDecoder.java
new file mode 100644
index 0000000..5f947f6
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/NetDataDecoder.java
@@ -0,0 +1,92 @@
+package com.dy.rtuMw3rd.tcp4Bjnl;
+
+import com.alibaba.fastjson2.JSON;
+import com.dy.common.springUtil.SpringContextUtil;
+import com.dy.rtuMw3rd.tcp4Bjnl.deal.BjnlDealer;
+import com.dy.rtuMw3rd.tcp4Bjnl.protocol.BjnlProtocol;
+import com.dy.rtuMw3rd.tcp4Bjnl.protocol.Result;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
+import org.apache.mina.filter.codec.ProtocolDecoderOutput;
+
+import java.io.IOException;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/03/18 14:20
+ * @Description
+ */
+@Slf4j
+public class NetDataDecoder extends CumulativeProtocolDecoder {
+
+ /**
+ * 瀵圭綉缁滀紶杈撴潵鐨勬暟鎹繘琛岃В鐮�
+ */
+ protected boolean doDecode(IoSession session, IoBuffer in, ProtocolDecoderOutput out) throws IOException, Exception{
+ int remain = in.remaining() ;
+ if(remain > 0){
+ byte[] bs = new byte[remain];
+ in.get(bs) ;
+ in.position(0) ;
+ String s = new String(bs, "UTF-8") ;
+ if(s != null && s.length() > 0){
+ s = s.trim() ;
+ }
+ this.receive(s);
+ }
+ return true;
+ }
+
+
+ private void receive(String json){
+ log.info("鍖椾含鍐滄灄--鏀跺埌鏁版嵁锛�" + json);
+ try{
+ if(JSON.isValid(json)){
+ Result res = JSON.parseObject(json, Result.class) ;
+ if(res.status != null && res.status.code != null && res.status.code.equals(BjnlProtocol.SuccessCode)){
+ if(res.status.type != null){
+ if(res.status.type.equals(BjnlProtocol.ResultTypeAuth)){
+ forLogin(res) ;
+ }else if(res.status.type.equals(BjnlProtocol.ResultTypeData)){
+ forData(res) ;
+ }else if(res.status.type.equals(BjnlProtocol.ResultTypeControl)){
+ forControl(res) ;
+ }else{
+ log.error("鍖椾含鍐滄灄--鏈嶅姟绔繑鍥炴暟鎹叾绫诲瀷涓嶅彲璇嗗埆锛�" + res.status.type);
+ }
+ }
+ }else{
+ //鍙兘鎺ㄩ�佺殑鏁版嵁涓笉鍖呭惈status瀛愭暟鎹�
+ if(res.data != null && res.data.length() > 0){
+ forData(res) ;
+ }else{
+ log.error("鍖椾含鍐滄灄--鏈嶅姟绔繑鍥炲け璐ヤ俊鎭細" + json);
+ }
+
+ }
+ }else{
+ log.error("鍖椾含鍐滄灄--鏈嶅姟绔繑鍥炴暟鎹潪鏈夋晥JSON鏁版嵁锛孿n鏁版嵁涓�" + json);
+ }
+ }catch (Exception e){
+ log.error("鍖椾含鍐滄灄--鏈嶅姟绔繑鍥炴暟鎹浆JSON寮傚父锛孿n鏁版嵁涓�" + json ,e);
+ }
+ }
+
+ private void forLogin(Result res){
+ Worker.getInstance().setLogined();
+ BjnlDealer d = SpringContextUtil.getBean(BjnlDealer.class) ;
+ d.logined(res);
+ }
+
+ private void forData(Result res){
+ BjnlDealer d = SpringContextUtil.getBean(BjnlDealer.class) ;
+ d.receiveData(res);
+ }
+
+ private void forControl(Result res){
+ BjnlDealer d = SpringContextUtil.getBean(BjnlDealer.class) ;
+ d.controlRes(res);
+ }
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/NetDataEncoder.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/NetDataEncoder.java
new file mode 100644
index 0000000..16ae616
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/NetDataEncoder.java
@@ -0,0 +1,31 @@
+package com.dy.rtuMw3rd.tcp4Bjnl;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
+import org.apache.mina.filter.codec.ProtocolEncoderOutput;
+
+import java.io.IOException;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/03/18 14:20
+ * @Description
+ */
+public class NetDataEncoder extends ProtocolEncoderAdapter {
+
+ private static final Logger log = LogManager.getLogger(NetDataEncoder.class) ;
+
+ /**
+ * 瀵规暟鎹繘琛岀紪鐮侊紝浠ュ缃戠粶浼犺緭
+ */
+ public void encode(IoSession session, Object message, ProtocolEncoderOutput out) throws IOException, Exception{
+ byte[] data = (byte[])message;
+ //log.info("涓婅鏁版嵁锛�" + ByteUtil.bytes2Hex(data, true));
+
+ out.write(IoBuffer.allocate((data==null?0:data.length), false).put(data).flip());
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/TcpClUnit.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/TcpClUnit.java
new file mode 100644
index 0000000..3bb4bab
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/TcpClUnit.java
@@ -0,0 +1,102 @@
+package com.dy.rtuMw3rd.tcp4Bjnl;
+
+import com.dy.common.mw.UnitAdapterInterface;
+import com.dy.common.mw.UnitCallbackInterface;
+import com.dy.common.mw.UnitInterface;
+import com.dy.common.util.Callback;
+import com.dy.rtuMw3rd.tcp4Bjnl.protocol.BjnlProtocol;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/03/18 14:20
+ * @Description
+ */
+public class TcpClUnit implements UnitInterface {
+
+ private static final Logger log = LogManager.getLogger(TcpClUnit.class) ;
+
+ private static TcpClUnit instance = new TcpClUnit() ;
+
+ public static TcpClUnitAdapter adapter ;
+ public static TcpClUnitConfigVo confVo ;
+
+ private TcpClUnit(){} ;
+
+ public static TcpClUnit getInstance(){
+ return instance ;
+ }
+
+ @Override
+ public void setAdapter(UnitAdapterInterface adapter) throws Exception {
+ if(adapter == null){
+ throw new Exception("Tcp Client妯″潡閫傞厤鍣ㄥ璞′笉鑳戒负绌猴紒") ;
+ }
+ TcpClUnit.adapter = (TcpClUnitAdapter)adapter ;
+ TcpClUnit.confVo = TcpClUnit.adapter.getConfig() ;
+ if(TcpClUnit.confVo == null){
+ throw new Exception("Tcp Client妯″潡閰嶇疆瀵硅薄涓嶈兘涓虹┖锛�") ;
+ }
+ }
+
+ @Override
+ public void start(UnitCallbackInterface callback) throws Exception {
+ System.out.println("Tcp Client妯″潡鎴愬姛鍚姩");
+ this.doStart();
+ callback.call(null) ;
+ }
+
+ @Override
+ public void stop(UnitCallbackInterface callback) throws Exception {
+ callback.call(null);
+ }
+
+ private void doStart(){
+ new Thread(() -> {
+ Exception ex ;
+ while(true){
+ ex = null ;
+ try {
+ new TcpConnect().createSession(
+ confVo.BjnlServerIp,
+ confVo.BjnlServerPort,
+ confVo.BjnlConnectTimeout,
+ new TcpHandler(),
+ new Callback() {
+ @Override
+ public void call(Object obj) {
+ if (obj == null) {
+ log.error("鍖椾含鍐滄灄--鍒涘缓缃戠粶浼氳瘽杩斿洖涓簄ull");
+ } else {
+ log.info("鍖椾含鍐滄灄--鎴愬姛鍒涘缓缃戠粶杩炴帴");
+ Worker w = Worker.getInstance() ;
+ w.setApikey(confVo.BjnlApikey);
+ w.setSecretkey(confVo.BjnlSecretkey );
+ w.setWorkInterval(confVo.heartBeatInterval + 0L);
+ w.start();
+ }
+ }
+ @Override
+ public void call(Object... objs) {
+ }
+ @Override
+ public void exception(Exception e) {
+ }
+ });
+ }catch (Exception e){
+ ex = e ;
+ }
+ if(ex == null){
+ break ;
+ }else{
+ try{
+ Thread.sleep(100);
+ }catch (Exception e){
+ }
+ }
+ }
+ }).start();
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/TcpClUnitAdapter.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/TcpClUnitAdapter.java
new file mode 100644
index 0000000..7c0cc57
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/TcpClUnitAdapter.java
@@ -0,0 +1,14 @@
+package com.dy.rtuMw3rd.tcp4Bjnl;
+
+import com.dy.common.mw.UnitAdapterInterface;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/03/18 14:20
+ * @Description
+ */
+public interface TcpClUnitAdapter extends UnitAdapterInterface {
+
+ TcpClUnitConfigVo getConfig() ;
+
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/TcpClUnitConfigVo.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/TcpClUnitConfigVo.java
new file mode 100644
index 0000000..dd98c5b
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/TcpClUnitConfigVo.java
@@ -0,0 +1,18 @@
+package com.dy.rtuMw3rd.tcp4Bjnl;
+
+import lombok.Data;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/03/18 14:20
+ * @Description
+ */
+@Data
+public class TcpClUnitConfigVo {
+ public String BjnlServerIp = "127.0.0.1" ;//鏈嶅姟绔疘P
+ public Integer BjnlServerPort = 1234 ;//鏈嶅姟绔鍙�
+ public Integer BjnlConnectTimeout = 3000 ;
+ public String BjnlApikey = "afcd5254fea7ba348bbdf8723c421fa7eab04545" ;
+ public String BjnlSecretkey = "4ebb2143c994d5ecbf3cb4af364642a74294c3be" ;
+ public Integer heartBeatInterval = 120000 ;
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/TcpConnect.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/TcpConnect.java
new file mode 100644
index 0000000..9a8fe01
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/TcpConnect.java
@@ -0,0 +1,83 @@
+package com.dy.rtuMw3rd.tcp4Bjnl;
+
+import com.dy.common.util.Callback;
+import org.apache.mina.core.future.ConnectFuture;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.codec.ProtocolCodecFilter;
+import org.apache.mina.transport.socket.SocketConnector;
+import org.apache.mina.transport.socket.nio.NioSocketConnector;
+
+import java.net.InetSocketAddress;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/03/18 14:20
+ * @Description
+ */
+public class TcpConnect {
+
+ private static IoSession ioSession ;
+
+ public static IoSession getIoSession(){
+ return ioSession;
+ }
+
+ /**
+ * 鍒ゆ柇浼氳瘽鏄惁鏈夋晥
+ * @return 鏄惁杩炴帴
+ */
+ public static boolean isConnected() {
+ return (ioSession != null && ioSession.isConnected());
+ }
+
+ /**
+ * 鍒涘缓鏂颁細璇�
+ * @param host 鏈嶅姟鍣║RI
+ * @param port 鏈嶅姟鍣ㄧ鍙�
+ * @param connectTimeout 杩炴帴瓒呮椂鏃堕暱
+ * @param handler 鏁版嵁澶勭悊鑰�
+ * @param callback 鍥炶皟
+ * @return 缃戠粶浼氳瘽
+ */
+ public static void createSession(String host ,
+ int port ,
+ int connectTimeout ,
+ TcpHandler handler,
+ Callback callback) throws Exception{
+ SocketConnector connector = new NioSocketConnector();
+ connector.getFilterChain().addLast("codec", new ProtocolCodecFilter(new NetDataCodecFactory()));
+ connector.setHandler(handler);
+ ConnectFuture connectFuture = connector.connect(new InetSocketAddress(host, port));
+ connectFuture.awaitUninterruptibly(connectTimeout);
+ ioSession = connectFuture.getSession();
+ callback.call(ioSession) ;
+ }
+
+
+ /**
+ * 鍏抽棴浼氳瘽鑱旀帴
+ * @param se
+ * @param connectTimeout
+ */
+ public static void disconnect(IoSession se , int connectTimeout) {
+ if (se != null) {
+ try{
+ se.closeNow().awaitUninterruptibly(connectTimeout);
+ }catch(Exception e){
+ if(se.isConnected()){
+ se.closeNow().awaitUninterruptibly(connectTimeout);
+ }
+ }finally{
+ se = null;
+ }
+ }
+ }
+
+ public static void output(byte[] bs) throws Exception{
+ if (!isConnected()) {
+ throw new Exception("鏈垱寤虹綉缁滆繛鎺�");
+ }else{
+ ioSession.write(bs);
+ }
+ }
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/TcpHandler.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/TcpHandler.java
new file mode 100644
index 0000000..18199e9
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/TcpHandler.java
@@ -0,0 +1,90 @@
+package com.dy.rtuMw3rd.tcp4Bjnl;
+
+import com.dy.common.util.ByteUtil;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.FilterEvent;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/03/18 14:20
+ * @Description
+ */
+public class TcpHandler extends IoHandlerAdapter {
+
+ private static Logger log = LogManager.getLogger(TcpHandler.class.getName()) ;
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void sessionCreated(IoSession session) throws Exception {
+ super.sessionCreated(session);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void sessionOpened(IoSession session) throws Exception {
+ super.sessionOpened(session);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void sessionClosed(IoSession session) throws Exception {
+ super.sessionClosed(session);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void sessionIdle(IoSession session, IdleStatus status) throws Exception {
+ super.sessionIdle(session, status);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void exceptionCaught(IoSession session, Throwable cause) throws Exception {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void messageReceived(IoSession session, Object message) throws Exception {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void messageSent(IoSession session, Object message) throws Exception {
+ if(message != null){
+ log.info("鍖椾含鍐滄灄--鍙戦�佹暟鎹細" + new String((byte[])message, "UTF-8"));
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void inputClosed(IoSession session) throws Exception {
+ session.closeNow();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void event(IoSession session, FilterEvent event) throws Exception {
+ }
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/Worker.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/Worker.java
new file mode 100644
index 0000000..9c71c77
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/Worker.java
@@ -0,0 +1,127 @@
+package com.dy.rtuMw3rd.tcp4Bjnl;
+
+import com.alibaba.fastjson2.JSON;
+import com.dy.rtuMw3rd.tcp4Bjnl.protocol.*;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/2/26 14:39
+ * @Description
+ */
+public class Worker extends TimerTask {
+
+ private static final Logger log = LogManager.getLogger(Worker.class) ;
+
+ private static Worker instance = new Worker() ;
+
+ private String apikey ;
+ private String secretkey ;
+ private Long workInterval ;//寰幆浠诲姟闂撮殧
+
+ private Timer timer;
+
+ private boolean stop;
+
+ private boolean first = true ;
+ private static boolean isLogined = false ;
+
+ private Worker(){
+ this.timer = new Timer();
+ this.stop = false ;
+ }
+
+ public static Worker getInstance(){
+ return instance ;
+ }
+
+
+ public void setApikey(String apikey){
+ this.apikey = apikey ;
+ }
+ public void setSecretkey(String secretkey){
+ this.secretkey = secretkey ;
+ }
+ public void setWorkInterval(Long workInterval){
+ this.workInterval = workInterval ;
+ }
+
+ public void setLogined(){
+ log.info("鍖椾含鍐滄灄--璇锋眰鐧诲綍鎴愬姛");
+ isLogined = true ;
+ }
+
+ public void stop(){
+ this.stop = true ;
+ if(this.timer != null){
+ this.timer.cancel();
+ }
+ }
+ public boolean isStop(){
+ return this.stop ;
+ }
+
+ public void start(){
+ new Thread(() -> {
+ while(true){
+ try {
+ login() ;
+ }catch (Exception e){
+ log.error("鍖椾含鍐滄灄--璇锋眰鐧诲綍寮傚父" + (e.getMessage() == null ? "" : (":" + e.getMessage())), e);
+ }
+ try{
+ Thread.sleep(10000);
+ }catch (Exception e){
+ }
+ if(isLogined){
+ timer.schedule(this, 0, this.workInterval);
+ break ;
+ }
+ }
+ }).start();
+ }
+
+ @Override
+ public void run() {
+ if(first){
+ first = false ;
+ }else{
+ if(TcpConnect.isConnected() && isLogined) {
+ try{
+ heartbeat() ;
+ }catch(Exception e){
+ log.error("鍖椾含鍐滄灄--鍙戦�佸績璺冲紓甯�" + (e.getMessage() == null ? "" : (":" + e.getMessage())), e);
+ }
+ }
+ }
+ }
+
+ private void login(){
+ ParamLogin pl = new ParamLogin() ;
+ pl.protocol = new ParamProtocol() ;
+ pl.auth = new ParamAuth() ;
+ pl.protocol.version = BjnlProtocol.ProtocolVersion ;
+ pl.protocol.protocolcode = BjnlProtocol.Protocolcode ;
+ pl.auth.apikey = apikey ;
+ pl.auth.secretkey = secretkey ;
+
+ String json = JSON.toJSONString(pl) ;
+ byte[] bs = BjnlCommon.wrap(json) ;
+ try {
+ TcpConnect.output(bs);
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
+ }
+ private void heartbeat() throws Exception{
+ try {
+ TcpConnect.output(BjnlProtocol.HeartBeat);
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
+ }
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/deal/BjnlDealer.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/deal/BjnlDealer.java
new file mode 100644
index 0000000..b00f184
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/deal/BjnlDealer.java
@@ -0,0 +1,27 @@
+package com.dy.rtuMw3rd.tcp4Bjnl.deal;
+
+import com.dy.rtuMw3rd.tcp4Bjnl.protocol.Result;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/3/20 16:29
+ * @Description
+ */
+@Slf4j
+@Component()
+public class BjnlDealer {
+
+ public void logined(Result res){
+ log.warn("鍖椾含鍐滄灄--鐧诲綍杩斿洖澶勭悊閫昏緫鏈疄鐜�");
+ }
+
+ public void receiveData(Result res){
+ log.warn("鍖椾含鍐滄灄--鏁版嵁鎺ㄩ�佸鐞嗛�昏緫鏈疄鐜�");
+ }
+
+ public void controlRes(Result res){
+ log.warn("鍖椾含鍐滄灄--杩滅▼鎺у埗杩斿洖澶勭悊閫昏緫鏈疄鐜�");
+ }
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/BjnlCommon.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/BjnlCommon.java
new file mode 100644
index 0000000..ca065e7
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/BjnlCommon.java
@@ -0,0 +1,21 @@
+package com.dy.rtuMw3rd.tcp4Bjnl.protocol;
+
+import com.dy.common.util.ByteUtil;
+
+import java.nio.charset.StandardCharsets;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/3/18 15:06
+ * @Description
+ */
+public class BjnlCommon {
+ public static byte[] wrap(String msg){
+ byte[] bs = BjnlProtocol.FrameHeadBytes;
+ if(msg != null && msg.length() > 0){
+ bs = ByteUtil.bytesMerge(bs, msg.getBytes(StandardCharsets.UTF_8)) ;
+ }
+ bs = ByteUtil.bytesMerge(bs, BjnlProtocol.FrameTailBytes) ;
+ return bs;
+ }
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/BjnlProtocol.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/BjnlProtocol.java
new file mode 100644
index 0000000..68a60e5
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/BjnlProtocol.java
@@ -0,0 +1,25 @@
+package com.dy.rtuMw3rd.tcp4Bjnl.protocol;
+
+import java.nio.charset.StandardCharsets;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/3/18 11:54
+ * @Description
+ */
+public class BjnlProtocol {
+ public static final String ProtocolName = "beiJingNongLin" ;//鍖椾含甯傚啘鏋楃瀛﹂櫌鏅鸿兘瑁呭鎶�鏈爺绌朵腑蹇�
+ public static final String ProtocolVersion = "1.0" ;//鐗堟湰鍙�
+ public static final String Protocolcode = "v1.0" ;//鍗忚鍙�
+
+ public static final byte MinDataLength = 4 ;//鏁版嵁鏈�灏忛暱搴︼紙鍗冲抚澶�4涓瓧鑺傦級
+ public static final byte[] FrameHeadBytes = new byte[]{(byte)0xCA, (byte)0xFE, (byte)0xBA, (byte)0xBE} ;
+ public static final byte[] FrameTailBytes = "&_#".getBytes(StandardCharsets.UTF_8) ;
+
+ public static final String SuccessCode = "200" ;
+ public static final String ResultTypeAuth = "auth" ;
+ public static final String ResultTypeData = "data" ;
+ public static final String ResultTypeControl = "control" ;
+
+ public static final byte[] HeartBeat = "ping".getBytes(StandardCharsets.UTF_8) ;
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/ParamAuth.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/ParamAuth.java
new file mode 100644
index 0000000..e8be9d6
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/ParamAuth.java
@@ -0,0 +1,13 @@
+package com.dy.rtuMw3rd.tcp4Bjnl.protocol;
+
+import lombok.Data;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/3/18 15:13
+ * @Description
+ */@Data
+public class ParamAuth {
+ public String apikey ; // 楠岃瘉key鍊� 鍞竴涓嶅彲鏇存敼
+ public String secretkey; //楠岃瘉key鍊� 鍞竴涓嶅彲鏇存敼
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/ParamLogin.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/ParamLogin.java
new file mode 100644
index 0000000..0479d36
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/ParamLogin.java
@@ -0,0 +1,14 @@
+package com.dy.rtuMw3rd.tcp4Bjnl.protocol;
+
+import lombok.Data;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/3/18 15:15
+ * @Description
+ */
+@Data
+public class ParamLogin {
+ public ParamProtocol protocol ;
+ public ParamAuth auth ;
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/ParamProtocol.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/ParamProtocol.java
new file mode 100644
index 0000000..49d482f
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/ParamProtocol.java
@@ -0,0 +1,14 @@
+package com.dy.rtuMw3rd.tcp4Bjnl.protocol;
+
+import lombok.Data;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/3/18 15:12
+ * @Description
+ */
+@Data
+public class ParamProtocol {
+ public String version ;
+ public String protocolcode ;
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/ResProtocol.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/ResProtocol.java
new file mode 100644
index 0000000..23c87bc
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/ResProtocol.java
@@ -0,0 +1,14 @@
+package com.dy.rtuMw3rd.tcp4Bjnl.protocol;
+
+import lombok.Data;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/3/18 16:31
+ * @Description
+ */
+@Data
+public class ResProtocol {
+ public String version ;
+ public String protocolcode ;
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/ResStatus.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/ResStatus.java
new file mode 100644
index 0000000..c7fff16
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/ResStatus.java
@@ -0,0 +1,17 @@
+package com.dy.rtuMw3rd.tcp4Bjnl.protocol;
+
+import lombok.Data;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/3/18 16:32
+ * @Description
+ */
+@Data
+public class ResStatus {
+ public String code ;
+ public String msg ;
+ public String time ;
+ public String type ;
+ public String uuid ;
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/Result.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/Result.java
new file mode 100644
index 0000000..92f6f00
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/java/com/dy/rtuMw3rd/tcp4Bjnl/protocol/Result.java
@@ -0,0 +1,15 @@
+package com.dy.rtuMw3rd.tcp4Bjnl.protocol;
+
+import lombok.Data;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/3/18 16:36
+ * @Description
+ */
+@Data
+public class Result {
+ public ResProtocol protocol ;
+ public ResStatus status ;
+ public String data ;
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/resources/application.yml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/resources/application.yml
new file mode 100644
index 0000000..78face7
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/resources/application.yml
@@ -0,0 +1,16 @@
+logging:
+ charset:
+ console: UTF-8
+ config:
+ classpath: log4j2.yml
+spring:
+ devtools:
+ livereload:
+ enabled: false
+
+#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8080
+server:
+ port: 65530
+ servlet:
+ context-path: /rtuMw3rd #web璁块棶涓婁笅鏂囪矾寰�
+
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/resources/config.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/resources/config.xml
new file mode 100644
index 0000000..b314ddd
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/resources/config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config>
+ <server name="绗笁鏂规帴鍏ヤ腑闂翠欢" showStartInfo="true" company="http://www.dyjs.com"/>
+
+ <!--
+ flushDataFromSvInterval:鑾峰彇access_token闂撮殧锛堜竴灏忔椂锛�3600000锛夛紝鐩墠access_token鐨勬湁鏁堟湡閫氳繃杩斿洖鐨別xpire_in鏉ヤ紶杈撅紝鐩墠鏄�7200绉�(120鍒嗛挓銆佷袱涓皬鏃�)涔嬪唴鐨勫��
+ -->
+ <xjnk httpsBaseUrl="https://www.sshyun.com"
+ appid="f34e4ac6be4441a6b7d13790313f22d0"
+ secret="b691aef23bf944599963786862370346"
+ flushDataFromSvInterval="3600000"
+ ></xjnk>
+
+ <bjnl ip="210.12.220.75"
+ port="15006"
+ connectTimeout="3000"
+ apikey="d3358a6a0270dbcd3017706c1062883fe6c0c45c"
+ secretkey="58cf2e5319ab4341c93724f2141b5305414ca87e"
+ heartBeatInterval = "120000"
+ ></bjnl>
+</config>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/resources/log4j2.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..a5b63e0
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/main/resources/log4j2.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="OFF">
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout charset="UTF-8" pattern="%d %-5p [%t] (%F:%L) - %m%n%throwable"/>
+ </Console>
+ <RollingFile name="File" fileName="logs/rtuMw3rd.log" filePattern="logs/rtuMw3rd-%d{yyyyMMdd}-%i.log">
+ <PatternLayout charset="UTF-8" pattern="%d %-5p [%t] (%class.%method:%L) - %m%n%throwable"/>
+ <Policies>
+ <TimeBasedTriggeringPolicy interval="7" />
+ <SizeBasedTriggeringPolicy size="10MB"/>
+ </Policies>
+ <DefaultRolloverStrategy max="50" />
+ </RollingFile>
+ </Appenders>
+ <Loggers>
+ <!--
+ <Logger name="com.zhzc.jgTest" level="debug">
+ <AppenderRef ref="Console"/>
+ </Logger>
+ <Logger name="org.jgroups" level="info">
+ <AppenderRef ref="File"/>
+ </Logger>
+ -->
+ <!-- Root涓庡悇涓狶ogger鍚屾椂璧蜂綔鐢� -->
+ <Root level="info">
+ <AppenderRef ref="Console"/>
+ <AppenderRef ref="File"/>
+ </Root>
+ </Loggers>
+</Configuration>
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/test/java/com/dy/rtuMw3rd/PipIrrMwRtu3rdApplicationTests.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/test/java/com/dy/rtuMw3rd/PipIrrMwRtu3rdApplicationTests.java
new file mode 100644
index 0000000..c914a78
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu3rd/src/test/java/com/dy/rtuMw3rd/PipIrrMwRtu3rdApplicationTests.java
@@ -0,0 +1,13 @@
+package com.dy.rtuMw3rd;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class PipIrrMwRtu3rdApplicationTests {
+
+ @Test
+ void contextLoads() {
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/resources/application.yml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/resources/application.yml
index d35af25..df5ee9b 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/resources/application.yml
@@ -3,3 +3,7 @@
console: UTF-8
config:
classpath: log4j2.yml
+spring:
+ devtools:
+ livereload:
+ enabled: false
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpOpenCloseValve.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpOpenCloseValve.java
index 1a2827a..7960851 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpOpenCloseValve.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/tcpClient/upData/UpOpenCloseValve.java
@@ -19,8 +19,8 @@
private static String orderNo = null ;
private static String openValveDt = null ;
- private static Double totalWaterAmount = 1234.56 ;//绱娴侀噺
- private static Double remainMoney = 65.4321 ;//鍓╀綑閲戦
+ private static Double totalWaterAmount = 12345.67 ;//绱娴侀噺
+ private static Double remainMoney = 8765.4321 ;//鍓╀綑閲戦
private static Double thisWaterAmount = 100.00 ;//鏈浣跨敤姘撮噺
private static Double thisMoney = 10.00 ;//鏈浣跨敤閲戦
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/application.yml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/application.yml
index d35af25..df5ee9b 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/application.yml
@@ -3,3 +3,7 @@
console: UTF-8
config:
classpath: log4j2.yml
+spring:
+ devtools:
+ livereload:
+ enabled: false
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/config.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/config.xml
index 0b9f3fe..588a213 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/config.xml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/config.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<config>
- <server name="RTU妯℃嫙鍣紙鐜嬫睙娴凤級" showStartInfo="true" company="http://www.dyjs.com"/>
+ <server name="RTU妯℃嫙鍣紙琛ㄩ榾涓�浣撴満锛�" showStartInfo="true" company="http://www.dyjs.com"/>
</config>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/log4j2.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/log4j2.xml
index da3d606..987a885 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/log4j2.xml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/resources/log4j2.xml
@@ -4,7 +4,7 @@
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout charset="UTF-8" pattern="%d %-5p [%t] (%F:%L) - %m%n%throwable"/>
</Console>
- <RollingFile name="File" fileName="logs/simRtu202404.log" filePattern="logs/simRtu-%d{yyyyMMdd}-%i.log">
+ <RollingFile name="File" fileName="logs/simRtu202404.log" filePattern="logs/simRtu202404-%d{yyyyMMdd}-%i.log">
<PatternLayout charset="UTF-8" pattern="%d %-5p [%t] (%class.%method:%L) - %m%n%throwable"/>
<Policies>
<TimeBasedTriggeringPolicy interval="7" />
diff --git a/pipIrr-platform/pipIrr-mw/pom.xml b/pipIrr-platform/pipIrr-mw/pom.xml
index a4afe51..e008394 100644
--- a/pipIrr-platform/pipIrr-mw/pom.xml
+++ b/pipIrr-platform/pipIrr-mw/pom.xml
@@ -16,10 +16,12 @@
<modules>
<module>pipIrr-mw-rtu</module>
+ <module>pipIrr-mw-rtu3rd</module>
<module>pipIrr-mw-simulate-rtu</module>
<module>pipIrr-mw-simulate-rtu202404</module>
<module>pipIrr-mwTest-server</module>
<module>pipIrr-mwTest-client</module>
+ <module>pipIrr-mw-shzTest</module>
</modules>
<dependencies>
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..1907b46
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #121鏈嶅姟鍣細common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..50d9255
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #233鏈嶅姟鍣細common-web, global, database, database-ym, database-sp, database-test,database-mj, self
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application-self.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application-self.yml
new file mode 100644
index 0000000..6cdfe62
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application-self.yml
@@ -0,0 +1,29 @@
+spring:
+ main:
+ allow-circular-references: true
+#actutor鐨剋eb绔彛
+management:
+ server:
+ port: ${pipIrr.app.actutorPort}
+#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8088
+server:
+ port: ${pipIrr.app.webPort}
+ servlet:
+ context-path: /app #web璁块棶涓婁笅鏂囪矾寰�
+ context-parameters:
+ #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
+ idSuffix: ${pipIrr.app.idSuffix}
+#MQTT
+mqtt:
+ broker: tcp://127.0.0.1:1883
+ username: mqtt_yjy
+ password: yjy
+ topic: workOrder
+ qos: 2
+
+logging:
+ level:
+ com:
+ dy:
+ pipIrrGlobal:
+ daoOp: trace
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml
index 745e1ae..a24b0b5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml
@@ -1,32 +1,3 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
- main:
- allow-circular-references: true
-
-#actutor鐨剋eb绔彛
-management:
- server:
- port: ${pipIrr.app.actutorPort}
-#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8088
-server:
- port: ${pipIrr.app.webPort}
- servlet:
- context-path: /app #web璁块棶涓婁笅鏂囪矾寰�
- context-parameters:
- #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
- idSuffix: ${pipIrr.app.idSuffix}
-#MQTT
-mqtt:
- broker: tcp://127.0.0.1:1883
- username: mqtt_yjy
- password: yjy
- topic: workOrder
- qos: 2
-
-logging:
- level:
- com:
- dy:
- pipIrrGlobal:
- daoOp: trace
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..1907b46
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #121鏈嶅姟鍣細common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..50d9255
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #233鏈嶅姟鍣細common-web, global, database, database-ym, database-sp, database-test,database-mj, self
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application-self.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application-self.yml
new file mode 100644
index 0000000..b4209c5
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application-self.yml
@@ -0,0 +1,17 @@
+user:
+ defaultTrueRandomFalsePassword: true #true:閲囩敤榛樿瀵嗙爜锛宖alse:绯荤粺浜х敓闅忔満瀵嗙爜
+ defaultPassword: "abc_123"
+# defaultPassword: "admin"
+
+#actutor鐨剋eb绔彛
+management:
+ server:
+ port: ${pipIrr.base.actutorPort}
+#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8080
+server:
+ port: ${pipIrr.base.webPort}
+ servlet:
+ context-path: /base #web璁块棶涓婁笅鏂囪矾寰�
+ context-parameters:
+ #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
+ idSuffix: ${pipIrr.base.idSuffix}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
index eb80e19..a24b0b5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
@@ -1,20 +1,3 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
-user:
- defaultTrueRandomFalsePassword: true #true:閲囩敤榛樿瀵嗙爜锛宖alse:绯荤粺浜х敓闅忔満瀵嗙爜
- defaultPassword: "abc_123"
-# defaultPassword: "admin"
-
-#actutor鐨剋eb绔彛
-management:
- server:
- port: ${pipIrr.base.actutorPort}
-#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8080
-server:
- port: ${pipIrr.base.webPort}
- servlet:
- context-path: /base #web璁块棶涓婁笅鏂囪矾寰�
- context-parameters:
- #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
- idSuffix: ${pipIrr.base.idSuffix}
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..1907b46
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #121鏈嶅姟鍣細common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..50d9255
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #233鏈嶅姟鍣細common-web, global, database, database-ym, database-sp, database-test,database-mj, self
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application-self.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application-self.yml
new file mode 100644
index 0000000..2a76402
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application-self.yml
@@ -0,0 +1,12 @@
+#actutor鐨剋eb绔彛
+management:
+ server:
+ port: ${pipIrr.file1.actutorPort}
+#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8088
+server:
+ port: ${pipIrr.file1.webPort}
+ servlet:
+ context-path: /file #web璁块棶涓婁笅鏂囪矾寰�
+ context-parameters:
+ #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
+ idSuffix: ${pipIrr.file.idSuffix}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application.yml
index 76c7483..a24b0b5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application.yml
@@ -1,16 +1,3 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
-
-#actutor鐨剋eb绔彛
-management:
- server:
- port: ${pipIrr.file1.actutorPort}
-#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8088
-server:
- port: ${pipIrr.file1.webPort}
- servlet:
- context-path: /file #web璁块棶涓婁笅鏂囪矾寰�
- context-parameters:
- #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
- idSuffix: ${pipIrr.file.idSuffix}
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..1907b46
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #121鏈嶅姟鍣細common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..50d9255
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #233鏈嶅姟鍣細common-web, global, database, database-ym, database-sp, database-test,database-mj, self
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application-self.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application-self.yml
new file mode 100644
index 0000000..002d937
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application-self.yml
@@ -0,0 +1,12 @@
+#actutor鐨剋eb绔彛
+management:
+ server:
+ port: ${pipIrr.gis.actutorPort}
+#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8080
+server:
+ port: ${pipIrr.gis.webPort}
+ servlet:
+ context-path: /gis #web璁块棶涓婁笅鏂囪矾寰�
+ context-parameters:
+ #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
+ idSuffix: ${pipIrr.gis.idSuffix}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml
index 51ff4d8..a24b0b5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml
@@ -1,16 +1,3 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
-
-#actutor鐨剋eb绔彛
-management:
- server:
- port: ${pipIrr.gis.actutorPort}
-#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8080
-server:
- port: ${pipIrr.gis.webPort}
- servlet:
- context-path: /gis #web璁块棶涓婁笅鏂囪矾寰�
- context-parameters:
- #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
- idSuffix: ${pipIrr.gis.idSuffix}
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..1907b46
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #121鏈嶅姟鍣細common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..50d9255
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #233鏈嶅姟鍣細common-web, global, database, database-ym, database-sp, database-test,database-mj, self
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application-self.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application-self.yml
new file mode 100644
index 0000000..ccfc880
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application-self.yml
@@ -0,0 +1,12 @@
+#actutor鐨剋eb绔彛
+management:
+ server:
+ port: ${pipIrr.irrigate.actutorPort}
+#web鏈嶅姟绔彛锛�8086
+server:
+ port: ${pipIrr.irrigate.webPort}
+ servlet:
+ context-path: /irrigate #web璁块棶涓婁笅鏂囪矾寰�
+ context-parameters:
+ #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
+ idSuffix: ${pipIrr.irrigate.idSuffix}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application.yml
index cd8db20..a24b0b5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application.yml
@@ -1,16 +1,3 @@
spring:
- profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
-
-#actutor鐨剋eb绔彛
-management:
- server:
- port: ${pipIrr.irrigate.actutorPort}
-#web鏈嶅姟绔彛锛�8086
-server:
- port: ${pipIrr.irrigate.webPort}
- servlet:
- context-path: /irrigate #web璁块棶涓婁笅鏂囪矾寰�
- context-parameters:
- #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
- idSuffix: ${pipIrr.irrigate.idSuffix}
+ profiles:
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..1907b46
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #121鏈嶅姟鍣細common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..50d9255
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #233鏈嶅姟鍣細common-web, global, database, database-ym, database-sp, database-test,database-mj, self
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application-self.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application-self.yml
new file mode 100644
index 0000000..ae27845
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application-self.yml
@@ -0,0 +1,12 @@
+#actutor鐨剋eb绔彛
+management:
+ server:
+ port: ${pipIrr.operation.actutorPort}
+#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8089
+server:
+ port: ${pipIrr.operation.webPort}
+ servlet:
+ context-path: /operation #web璁块棶涓婁笅鏂囪矾寰�
+ context-parameters:
+ #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
+ idSuffix: ${pipIrr.operation.idSuffix}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml
index 8f703ba..a24b0b5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml
@@ -1,16 +1,3 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
-
-#actutor鐨剋eb绔彛
-management:
- server:
- port: ${pipIrr.operation.actutorPort}
-#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8089
-server:
- port: ${pipIrr.operation.webPort}
- servlet:
- context-path: /operation #web璁块棶涓婁笅鏂囪矾寰�
- context-parameters:
- #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
- idSuffix: ${pipIrr.operation.idSuffix}
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
index e13d639..caa9e6d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
@@ -119,14 +119,14 @@
*/
public int update(PrIntake po) {
- if (po.getTownId() == null || po.getTownId() == 0) {
- Long townId = getSupperByVillageId(po.getVillageId());
- po.setTownId(townId);
- }
- if (po.getCountyId() == null || po.getCountyId() == 0) {
- Long countyId = getSupperByVillageId(getSupperByVillageId(po.getVillageId()));
- po.setCountyId(countyId);
- }
+// if (po.getTownId() == null || po.getTownId() == 0) {
+// Long townId = getSupperByVillageId(po.getVillageId());
+// po.setTownId(townId);
+// }
+// if (po.getCountyId() == null || po.getCountyId() == 0) {
+// Long countyId = getSupperByVillageId(getSupperByVillageId(po.getVillageId()));
+// po.setCountyId(countyId);
+// }
return this.prIntakeMapper.updateByPrimaryKeySelective(po);
// return this.prIntakeMapper.updateByPrimaryKey(po);
}
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..1907b46
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #121鏈嶅姟鍣細common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..50d9255
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #233鏈嶅姟鍣細common-web, global, database, database-ym, database-sp, database-test,database-mj, self
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application-self.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application-self.yml
new file mode 100644
index 0000000..d9b99f3
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application-self.yml
@@ -0,0 +1,12 @@
+#actutor鐨剋eb绔彛
+management:
+ server:
+ port: ${pipIrr.project.actutorPort}
+#web鏈嶅姟绔彛锛�8085
+server:
+ port: ${pipIrr.project.webPort}
+ servlet:
+ context-path: /project #web璁块棶涓婁笅鏂囪矾寰�
+ context-parameters:
+ #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
+ idSuffix: ${pipIrr.project.idSuffix}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application.yml
index efbe063..a24b0b5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application.yml
@@ -1,16 +1,3 @@
spring:
- profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
-
-#actutor鐨剋eb绔彛
-management:
- server:
- port: ${pipIrr.project.actutorPort}
-#web鏈嶅姟绔彛锛�8085
-server:
- port: ${pipIrr.project.webPort}
- servlet:
- context-path: /project #web璁块棶涓婁笅鏂囪矾寰�
- context-parameters:
- #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
- idSuffix: ${pipIrr.project.idSuffix}
+ profiles:
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/largeScreen/WebSocketHeartBeat.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/largeScreen/WebSocketHeartBeat.java
index 925f764..ef881b4 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/largeScreen/WebSocketHeartBeat.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/largeScreen/WebSocketHeartBeat.java
@@ -18,7 +18,7 @@
// 璁剧疆瀹氭椂鍗佺涓�娆�
@Scheduled(cron = "0/10 * * * * ?")
public void WsHeartBeat() throws Exception {
- WebSocketServer.sendAllMessage(getHeartBeatMessage());
+ WebSocketServer.sendMessage2AllClient(getHeartBeatMessage());
}
public static String getHeartBeatMessage() {
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/largeScreen/WebSocketServer.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/largeScreen/WebSocketServer.java
index fd66ef4..1f2d1c9 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/largeScreen/WebSocketServer.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/largeScreen/WebSocketServer.java
@@ -103,7 +103,7 @@
/**
* 鏈嶅姟鍣ㄤ富鍔ㄧ兢鎺ㄩ�佹秷鎭�
*/
- public static void sendAllMessage(String message) throws IOException {
+ public static void sendMessage2AllClient(String message) throws IOException {
ConcurrentHashMap.KeySetView<String, WebSocketServer> ids = webSocketMap.keySet();
for (String id : ids) {
WebSocketServer webSocketServer = webSocketMap.get(id);
@@ -114,7 +114,7 @@
/**
* 鏈嶅姟鍣ㄦ寚瀹氬鎴风鎺ㄩ�佹秷鎭�
*/
- public static void sendOneMessage(String message, String id) throws IOException {
+ public static void sendMessage2OneClient(String message, String id) throws IOException {
if (message != null && message.length() != 0 && webSocketMap.containsKey(id)) {
webSocketMap.get(id).sendMessage(message);
} else {
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/msCenter/CenterMsReceiveCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/msCenter/CenterMsReceiveCtrl.java
index 5be1e22..0678465 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/msCenter/CenterMsReceiveCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/msCenter/CenterMsReceiveCtrl.java
@@ -83,7 +83,7 @@
vo.type = WebSocketMessage.TYPE_JSON ;
vo.content = list ;
try {
- WebSocketServer.sendAllMessage(JSON.toJSONString(vo));
+ WebSocketServer.sendMessage2AllClient(JSON.toJSONString(vo));
}catch (Exception e){
log.error("鎺ㄩ�佹秷鎭け璐�", e) ;
}
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..1907b46
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #121鏈嶅姟鍣細common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..50d9255
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #233鏈嶅姟鍣細common-web, global, database, database-ym, database-sp, database-test,database-mj, self
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application-self.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application-self.yml
new file mode 100644
index 0000000..4fe5015
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application-self.yml
@@ -0,0 +1,12 @@
+#actutor鐨剋eb绔彛
+management:
+ server:
+ port: ${pipIrr.remote.actutorPort}
+#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8081
+server:
+ port: ${pipIrr.remote.webPort}
+ servlet:
+ context-path: /remote #web璁块棶涓婁笅鏂囪矾寰�
+ context-parameters:
+ #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
+ idSuffix: ${pipIrr.remote.idSuffix}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml
index 7782b62..a24b0b5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml
@@ -1,16 +1,3 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
-
-#actutor鐨剋eb绔彛
-management:
- server:
- port: ${pipIrr.remote.actutorPort}
-#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8081
-server:
- port: ${pipIrr.remote.webPort}
- servlet:
- context-path: /remote #web璁块棶涓婁笅鏂囪矾寰�
- context-parameters:
- #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
- idSuffix: ${pipIrr.remote.idSuffix}
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..1907b46
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #121鏈嶅姟鍣細common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..50d9255
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #233鏈嶅姟鍣細common-web, global, database, database-ym, database-sp, database-test,database-mj, self
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application-self.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application-self.yml
new file mode 100644
index 0000000..298ef20
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application-self.yml
@@ -0,0 +1,31 @@
+#actutor鐨剋eb绔彛
+management:
+ server:
+ port: ${pipIrr.sell.actutorPort}
+#web鏈嶅姟绔彛锛�8084
+server:
+ port: ${pipIrr.sell.webPort}
+ servlet:
+ context-path: /sell #web璁块棶涓婁笅鏂囪矾寰�
+ context-parameters:
+ #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
+ idSuffix: ${pipIrr.sell.idSuffix}
+
+#闃块噷鐭俊鏈嶅姟
+aliyun:
+ sms:
+ sms-access-key-id: LTAI5tPCmHqfyJ9YnoPorEwt
+ sms-access-key-secret: sU2CoLdNgcjnf5uPPU2dY7NNGNvOIX
+ sms-template-code: SMS_460776024
+ sms-sign-name: 澶х鑺傛按
+ #redis
+ redis:
+ host: localhost
+ #password:鎴戞槸娌￠厤缃瘑鐮佺殑
+ port: 6379
+ database: 6 #鎿嶄綔鐨勬槸6鍙锋暟鎹簱
+ pool:
+ max-active: 8 #鏈�澶ц繛鎺ユ暟
+ max-wait: -1 #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂� -1琛ㄧず鏃犻檺
+ max-idle: 4 #杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+ min-idle: 0 #杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml
index 1864041..a24b0b5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml
@@ -1,35 +1,3 @@
spring:
- profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
-
-#actutor鐨剋eb绔彛
-management:
- server:
- port: ${pipIrr.sell.actutorPort}
-#web鏈嶅姟绔彛锛�8084
-server:
- port: ${pipIrr.sell.webPort}
- servlet:
- context-path: /sell #web璁块棶涓婁笅鏂囪矾寰�
- context-parameters:
- #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
- idSuffix: ${pipIrr.sell.idSuffix}
-
-#闃块噷鐭俊鏈嶅姟
-aliyun:
- sms:
- sms-access-key-id: LTAI5tPCmHqfyJ9YnoPorEwt
- sms-access-key-secret: sU2CoLdNgcjnf5uPPU2dY7NNGNvOIX
- sms-template-code: SMS_460776024
- sms-sign-name: 澶х鑺傛按
- #redis
- redis:
- host: localhost
- #password:鎴戞槸娌￠厤缃瘑鐮佺殑
- port: 6379
- database: 6 #鎿嶄綔鐨勬槸6鍙锋暟鎹簱
- pool:
- max-active: 8 #鏈�澶ц繛鎺ユ暟
- max-wait: -1 #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂� -1琛ㄧず鏃犻檺
- max-idle: 4 #杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- min-idle: 0 #杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
\ No newline at end of file
+ profiles:
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..1907b46
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #121鏈嶅姟鍣細common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..50d9255
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #233鏈嶅姟鍣細common-web, global, database, database-ym, database-sp, database-test,database-mj, self
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application-self.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application-self.yml
new file mode 100644
index 0000000..7f6548f
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application-self.yml
@@ -0,0 +1,12 @@
+#actutor鐨剋eb绔彛
+management:
+ server:
+ port: ${pipIrr.sso.actutorPort}
+#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8080
+server:
+ port: ${pipIrr.sso.webPort}
+ servlet:
+ context-path: /sso #web璁块棶涓婁笅鏂囪矾寰�
+ context-parameters:
+ #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
+ IdSuffix: ${pipIrr.sso.IdSuffix}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml
index 2eed3f4..a24b0b5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml
@@ -1,16 +1,3 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
-
-#actutor鐨剋eb绔彛
-management:
- server:
- port: ${pipIrr.sso.actutorPort}
-#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8080
-server:
- port: ${pipIrr.sso.webPort}
- servlet:
- context-path: /sso #web璁块棶涓婁笅鏂囪矾寰�
- context-parameters:
- #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
- IdSuffix: ${pipIrr.sso.IdSuffix}
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..1907b46
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #121鏈嶅姟鍣細common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..50d9255
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #233鏈嶅姟鍣細common-web, global, database, database-ym, database-sp, database-test,database-mj, self
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application-self.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application-self.yml
new file mode 100644
index 0000000..2c6c7f2
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application-self.yml
@@ -0,0 +1,12 @@
+#actutor鐨剋eb绔彛
+management:
+ server:
+ port: ${pipIrr.statistics.actutorPort}
+#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8080
+server:
+ port: ${pipIrr.statistics.webPort}
+ servlet:
+ context-path: /statistics #web璁块棶涓婁笅鏂囪矾寰�
+ context-parameters:
+ #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
+ idSuffix: ${pipIrr.statistics.idSuffix}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml
index 8a22743..a24b0b5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml
@@ -1,16 +1,3 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
-
-#actutor鐨剋eb绔彛
-management:
- server:
- port: ${pipIrr.statistics.actutorPort}
-#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8080
-server:
- port: ${pipIrr.statistics.webPort}
- servlet:
- context-path: /statistics #web璁块棶涓婁笅鏂囪矾寰�
- context-parameters:
- #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
- idSuffix: ${pipIrr.statistics.idSuffix}
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..1907b46
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #121鏈嶅姟鍣細common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..50d9255
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #233鏈嶅姟鍣細common-web, global, database, database-ym, database-sp, database-test,database-mj, self
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application-self.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application-self.yml
new file mode 100644
index 0000000..bc70cd3
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application-self.yml
@@ -0,0 +1,17 @@
+user:
+ defaultTrueRandomFalsePassword: true #true:閲囩敤榛樿瀵嗙爜锛宖alse:绯荤粺浜х敓闅忔満瀵嗙爜
+ defaultPassword: "abc_123"
+# defaultPassword: "admin"
+
+#actutor鐨剋eb绔彛
+management:
+ server:
+ port: ${pipIrr.temp.actutorPort}
+#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8080
+server:
+ port: ${pipIrr.temp.webPort}
+ servlet:
+ context-path: /temp #web璁块棶涓婁笅鏂囪矾寰�
+ context-parameters:
+ #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
+ idSuffix: ${pipIrr.temp.idSuffix}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application.yml
index 6f6ddc2..a24b0b5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application.yml
@@ -1,20 +1,3 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
-user:
- defaultTrueRandomFalsePassword: true #true:閲囩敤榛樿瀵嗙爜锛宖alse:绯荤粺浜х敓闅忔満瀵嗙爜
- defaultPassword: "abc_123"
-# defaultPassword: "admin"
-
-#actutor鐨剋eb绔彛
-management:
- server:
- port: ${pipIrr.temp.actutorPort}
-#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8080
-server:
- port: ${pipIrr.temp.webPort}
- servlet:
- context-path: /temp #web璁块棶涓婁笅鏂囪矾寰�
- context-parameters:
- #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
- idSuffix: ${pipIrr.temp.idSuffix}
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..1907b46
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #121鏈嶅姟鍣細common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
new file mode 100644
index 0000000..50d9255
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
@@ -0,0 +1,4 @@
+spring:
+ profiles:
+ #233鏈嶅姟鍣細common-web, global, database, database-ym, database-sp, database-test,database-mj, self
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application-self.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application-self.yml
new file mode 100644
index 0000000..188b296
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application-self.yml
@@ -0,0 +1,22 @@
+spring:
+ jpa:
+ show-sql=true:#actutor鐨剋eb绔彛
+management:
+ server:
+ port: ${pipIrr.wechat.actutorPort}
+#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8087
+server:
+ port: ${pipIrr.wechat.webPort}
+ servlet:
+ context-path: /wx #web璁块棶涓婁笅鏂囪矾寰�
+ context-parameters:
+ #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
+ idSuffix: ${pipIrr.wechat.idSuffix}
+
+#闃块噷鐭俊鏈嶅姟
+aliyun:
+ sms:
+ sms-access-key-id: LTAI5tPCmHqfyJ9YnoPorEwt
+ sms-access-key-secret: sU2CoLdNgcjnf5uPPU2dY7NNGNvOIX
+ sms-template-code: SMS_460776024
+ sms-sign-name: 澶х鑺傛按
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml
index c5cbd76..a24b0b5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml
@@ -1,26 +1,3 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
-
-
- jpa:
- show-sql=true:#actutor鐨剋eb绔彛
-management:
- server:
- port: ${pipIrr.wechat.actutorPort}
-#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8087
-server:
- port: ${pipIrr.wechat.webPort}
- servlet:
- context-path: /wx #web璁块棶涓婁笅鏂囪矾寰�
- context-parameters:
- #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
- idSuffix: ${pipIrr.wechat.idSuffix}
-
-#闃块噷鐭俊鏈嶅姟
-aliyun:
- sms:
- sms-access-key-id: LTAI5tPCmHqfyJ9YnoPorEwt
- sms-access-key-secret: sU2CoLdNgcjnf5uPPU2dY7NNGNvOIX
- sms-template-code: SMS_460776024
- sms-sign-name: 澶х鑺傛按
+ include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/SaaS/\347\253\257\345\217\243\343\200\201IP\343\200\201\346\240\207\347\255\276\351\205\215\347\275\256.docx" "b/pipIrr-platform/\346\226\207\346\241\243/SaaS/\347\253\257\345\217\243\343\200\201IP\343\200\201\346\240\207\347\255\276\351\205\215\347\275\256.docx"
index bd278b6..aa19e80 100644
--- "a/pipIrr-platform/\346\226\207\346\241\243/SaaS/\347\253\257\345\217\243\343\200\201IP\343\200\201\346\240\207\347\255\276\351\205\215\347\275\256.docx"
+++ "b/pipIrr-platform/\346\226\207\346\241\243/SaaS/\347\253\257\345\217\243\343\200\201IP\343\200\201\346\240\207\347\255\276\351\205\215\347\275\256.docx"
Binary files differ
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/\347\254\254\344\270\211\346\226\271\345\271\263\345\217\260\346\216\245\345\217\243/\345\214\227\344\272\254\345\270\202\345\206\234\346\236\227\347\247\221\345\255\246\351\231\242\346\231\272\350\203\275\350\243\205\345\244\207\346\212\200\346\234\257\347\240\224\347\251\266\344\270\255\345\277\203/\347\211\251\350\201\224\347\275\221\345\205\261\344\272\253\346\225\260\346\215\256\346\240\207\345\207\206\346\216\245\345\217\243\346\226\207\346\241\2431.4.0.pdf" "b/pipIrr-platform/\346\226\207\346\241\243/\347\254\254\344\270\211\346\226\271\345\271\263\345\217\260\346\216\245\345\217\243/\345\214\227\344\272\254\345\270\202\345\206\234\346\236\227\347\247\221\345\255\246\351\231\242\346\231\272\350\203\275\350\243\205\345\244\207\346\212\200\346\234\257\347\240\224\347\251\266\344\270\255\345\277\203/\347\211\251\350\201\224\347\275\221\345\205\261\344\272\253\346\225\260\346\215\256\346\240\207\345\207\206\346\216\245\345\217\243\346\226\207\346\241\2431.4.0.pdf"
new file mode 100644
index 0000000..2a6bc95
--- /dev/null
+++ "b/pipIrr-platform/\346\226\207\346\241\243/\347\254\254\344\270\211\346\226\271\345\271\263\345\217\260\346\216\245\345\217\243/\345\214\227\344\272\254\345\270\202\345\206\234\346\236\227\347\247\221\345\255\246\351\231\242\346\231\272\350\203\275\350\243\205\345\244\207\346\212\200\346\234\257\347\240\224\347\251\266\344\270\255\345\277\203/\347\211\251\350\201\224\347\275\221\345\205\261\344\272\253\346\225\260\346\215\256\346\240\207\345\207\206\346\216\245\345\217\243\346\226\207\346\241\2431.4.0.pdf"
Binary files differ
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/\347\254\254\344\270\211\346\226\271\345\271\263\345\217\260\346\216\245\345\217\243/\345\214\227\344\272\254\345\270\202\345\206\234\346\236\227\347\247\221\345\255\246\351\231\242\346\231\272\350\203\275\350\243\205\345\244\207\346\212\200\346\234\257\347\240\224\347\251\266\344\270\255\345\277\203/\350\257\264\346\230\216--\345\210\230\346\266\246\347\216\211.docx" "b/pipIrr-platform/\346\226\207\346\241\243/\347\254\254\344\270\211\346\226\271\345\271\263\345\217\260\346\216\245\345\217\243/\345\214\227\344\272\254\345\270\202\345\206\234\346\236\227\347\247\221\345\255\246\351\231\242\346\231\272\350\203\275\350\243\205\345\244\207\346\212\200\346\234\257\347\240\224\347\251\266\344\270\255\345\277\203/\350\257\264\346\230\216--\345\210\230\346\266\246\347\216\211.docx"
new file mode 100644
index 0000000..a0bfd42
--- /dev/null
+++ "b/pipIrr-platform/\346\226\207\346\241\243/\347\254\254\344\270\211\346\226\271\345\271\263\345\217\260\346\216\245\345\217\243/\345\214\227\344\272\254\345\270\202\345\206\234\346\236\227\347\247\221\345\255\246\351\231\242\346\231\272\350\203\275\350\243\205\345\244\207\346\212\200\346\234\257\347\240\224\347\251\266\344\270\255\345\277\203/\350\257\264\346\230\216--\345\210\230\346\266\246\347\216\211.docx"
Binary files differ
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/\347\254\254\344\270\211\346\226\271\345\271\263\345\217\260\346\216\245\345\217\243/\346\226\260\347\226\206\345\206\234\345\236\246\345\255\246\351\231\242/\344\270\200\345\207\272\344\272\214\346\201\222\345\216\213\347\224\265\345\212\250\351\230\200\351\227\250\345\257\271\346\216\245\345\215\217\350\256\256.pdf" "b/pipIrr-platform/\346\226\207\346\241\243/\347\254\254\344\270\211\346\226\271\345\271\263\345\217\260\346\216\245\345\217\243/\346\226\260\347\226\206\345\206\234\345\236\246\345\255\246\351\231\242/\344\270\200\345\207\272\344\272\214\346\201\222\345\216\213\347\224\265\345\212\250\351\230\200\351\227\250\345\257\271\346\216\245\345\215\217\350\256\256.pdf"
new file mode 100644
index 0000000..6a4b00d
--- /dev/null
+++ "b/pipIrr-platform/\346\226\207\346\241\243/\347\254\254\344\270\211\346\226\271\345\271\263\345\217\260\346\216\245\345\217\243/\346\226\260\347\226\206\345\206\234\345\236\246\345\255\246\351\231\242/\344\270\200\345\207\272\344\272\214\346\201\222\345\216\213\347\224\265\345\212\250\351\230\200\351\227\250\345\257\271\346\216\245\345\215\217\350\256\256.pdf"
Binary files differ
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/\347\254\254\344\270\211\346\226\271\345\271\263\345\217\260\346\216\245\345\217\243/\346\226\260\347\226\206\345\206\234\345\236\246\345\255\246\351\231\242/\344\270\211\347\224\237\344\272\221\346\216\245\345\217\243\346\226\207\346\241\243.pdf" "b/pipIrr-platform/\346\226\207\346\241\243/\347\254\254\344\270\211\346\226\271\345\271\263\345\217\260\346\216\245\345\217\243/\346\226\260\347\226\206\345\206\234\345\236\246\345\255\246\351\231\242/\344\270\211\347\224\237\344\272\221\346\216\245\345\217\243\346\226\207\346\241\243.pdf"
new file mode 100644
index 0000000..ffd067c
--- /dev/null
+++ "b/pipIrr-platform/\346\226\207\346\241\243/\347\254\254\344\270\211\346\226\271\345\271\263\345\217\260\346\216\245\345\217\243/\346\226\260\347\226\206\345\206\234\345\236\246\345\255\246\351\231\242/\344\270\211\347\224\237\344\272\221\346\216\245\345\217\243\346\226\207\346\241\243.pdf"
Binary files differ
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/\347\254\254\344\270\211\346\226\271\345\271\263\345\217\260\346\216\245\345\217\243/\346\226\260\347\226\206\345\206\234\345\236\246\345\255\246\351\231\242/\350\257\264\346\230\216--\345\210\230\346\266\246\347\216\211.docx" "b/pipIrr-platform/\346\226\207\346\241\243/\347\254\254\344\270\211\346\226\271\345\271\263\345\217\260\346\216\245\345\217\243/\346\226\260\347\226\206\345\206\234\345\236\246\345\255\246\351\231\242/\350\257\264\346\230\216--\345\210\230\346\266\246\347\216\211.docx"
new file mode 100644
index 0000000..118dfcd
--- /dev/null
+++ "b/pipIrr-platform/\346\226\207\346\241\243/\347\254\254\344\270\211\346\226\271\345\271\263\345\217\260\346\216\245\345\217\243/\346\226\260\347\226\206\345\206\234\345\236\246\345\255\246\351\231\242/\350\257\264\346\230\216--\345\210\230\346\266\246\347\216\211.docx"
Binary files differ
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/\347\254\254\344\270\211\346\226\271\345\271\263\345\217\260\346\216\245\345\217\243/\346\270\251\345\267\236\347\221\236\346\226\260/\350\257\264\346\230\216--\345\210\230\346\266\246\347\216\211.docx" "b/pipIrr-platform/\346\226\207\346\241\243/\347\254\254\344\270\211\346\226\271\345\271\263\345\217\260\346\216\245\345\217\243/\346\270\251\345\267\236\347\221\236\346\226\260/\350\257\264\346\230\216--\345\210\230\346\266\246\347\216\211.docx"
new file mode 100644
index 0000000..1e26877
--- /dev/null
+++ "b/pipIrr-platform/\346\226\207\346\241\243/\347\254\254\344\270\211\346\226\271\345\271\263\345\217\260\346\216\245\345\217\243/\346\270\251\345\267\236\347\221\236\346\226\260/\350\257\264\346\230\216--\345\210\230\346\266\246\347\216\211.docx"
Binary files differ
--
Gitblit v1.8.0