From dcfc005ee387ac39de83bd4637f48ed0f8f6c9a9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 三月 2025 16:23:03 +0800
Subject: [PATCH] 1、修改文档“增加一个单位(orgTa)”名称； 2、config.properties配置改为ym的配置； 3、江海用测试系统调整，适应阿里云服务器环境。
---
pipIrr-platform/文档/SaaS/增加一个单位（orgTag）.docx | 0
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/ComSupportP206V202404.java | 4 ++--
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.properties | 4 ++--
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/PipIrrMwTestWebApplication.java | 3 ++-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.properties b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.properties
index 0be1acb..e824793 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.properties
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.properties
@@ -10,7 +10,7 @@
# 鐢樺窞锛� gz
# 鍑夊窞锛� lz
# 閲戝窛锛� jc
-base.orgTag=jc
+base.orgTag=ym
# 233鏈嶅姟鍣細
# 鍏冭皨锛� 60000
@@ -24,5 +24,5 @@
# 鐢樺窞锛� 60103
# 鍑夊窞锛� 60104
# 閲戝窛锛� 60105
-tcp.port=60105
+tcp.port=60000
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/PipIrrMwTestWebApplication.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/PipIrrMwTestWebApplication.java
index fad490a..df4c077 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/PipIrrMwTestWebApplication.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/PipIrrMwTestWebApplication.java
@@ -29,7 +29,8 @@
"com.dy.common.mybatis..*",
"com.dy.common.singleDataSource..*",
"com.dy.common.webFilter..*",
- "com.dy.common.webListener..*"
+ "com.dy.common.webListener..*",
+ "com.dy.pipIrrGlobal.webCtrls..*"
})
}
)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/ComSupportP206V202404.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/ComSupportP206V202404.java
index 64b94fa..8b9334d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/ComSupportP206V202404.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/ComSupportP206V202404.java
@@ -23,12 +23,12 @@
//protected static final String mwIp = "romq9311819.vicp.fun" ; //http://romq9311819.vicp.fun:16583
//protected static final String mwPort = "16583" ;
protected static final String mwIp = "127.0.0.1" ;
- protected static final String mwPort = "8071" ;
+ protected static final String mwPort = "65533" ;
protected static String mwUrlTest = "http://" + mwIp + ":" + mwPort + "/rtuMw/com/test" ;
protected static String mwUrlSendCom = "http://" + mwIp + ":" + mwPort + "/rtuMw/com/send" ;
- protected static String rtuAddr = "41162810400100001" ;
+ protected static String rtuAddr = "37142501020100229" ;
protected static String rtuResultSendWebUrl = "http://127.0.0.1:65535/test/comRes/receive" ;
protected static String controllerType = "57" ;//鎺у埗鍣ㄧ被鍨�
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/SaaS/\345\242\236\345\212\240\344\270\200\344\270\252\345\215\225\344\275\215\357\274\210orgTa\357\274\211.docx" "b/pipIrr-platform/\346\226\207\346\241\243/SaaS/\345\242\236\345\212\240\344\270\200\344\270\252\345\215\225\344\275\215\357\274\210orgTag\357\274\211.docx"
similarity index 100%
rename from "pipIrr-platform/\346\226\207\346\241\243/SaaS/\345\242\236\345\212\240\344\270\200\344\270\252\345\215\225\344\275\215\357\274\210orgTa\357\274\211.docx"
rename to "pipIrr-platform/\346\226\207\346\241\243/SaaS/\345\242\236\345\212\240\344\270\200\344\270\252\345\215\225\344\275\215\357\274\210orgTag\357\274\211.docx"
Binary files differ
--
Gitblit v1.8.0