From f5979b61dd5f52f506007d86908baa5f1b7eab97 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 26 十一月 2023 18:08:52 +0800
Subject: [PATCH] 1、优化代码，去除一些类中的main方法，原因是Maven打包不允许有多个main方法； 2、实现pipIrr-mwTest-server模块； 3、重构pom.xml，配置打包策略。
---
pipIrr-platform/pipIrr-web/pipIrr-web-sso/pom.xml | 120 ++
pipIrr-platform/pom.xml | 90 +
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/AnnotationScan.java | 6
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/.gitignore | 33
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/RmiRequestedCallback.java | 36
pipIrr-platform/pipIrr-mw/pom.xml | 129 --
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailableHandleImp.java | 4
pipIrr-platform/pipIrr-web/pipIrr-web-gis/pom.xml | 118 ++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java | 4
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/ServerProperties.java | 18
pipIrr-platform/pipIrr-mw/pipIrr-mw.iml | 106 --
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/RtuDownTask.java | 8
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/fastjson/FastJsonConfig.java | 6
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/MwConfigVo.java | 84 +
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/AdapterImp_RmiUnit.java | 26
pipIrr-platform/pipIrr-web/pipIrr-web.iml | 3
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/Server.java | 167 +++
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/MwTestClientStatus.java | 56 +
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/ResStartVo.java | 63 +
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/RtuUpTask.java | 4
pipIrr-platform/pipIrr-web/pipIrr-web-demo/pom.xml | 118 ++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolCache.java | 4
pipIrr-platform/pipIrr-global/pom.xml | 128 +-
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/busi/TcpUpDataCache.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/AsciiPic.java | 2
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/pom.xml | 112 ++
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/RmiRequestVo.java | 87 +
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/console/CommandConsole.java | 91 +
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/ResRegisterVo.java | 46
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/PipIrrMwAcceptApplication.java | 1
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/console/Command.java | 126 ++
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/pom.xml | 104 ++
pipIrr-platform/pipIrr-global/pipIrr-global.iml | 56
pipIrr-platform/pipIrr-web/pom.xml | 52 -
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/Manager.java | 173 +++
pipIrr-platform/pipIrr-common/pipIrr-common.iml | 7
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/pipIrr-mwTest-server.iml | 49 +
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java | 2
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/resources/Config.xml | 31
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/resources/log4j2.yml | 64 +
pipIrr-platform/pipIrr-web/pipIrr-web-remote/pom.xml | 119 ++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLineHandle.java | 2
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/Code.java | 15
pipIrr-platform/pipIrr-web/pipIrr-web-base/pom.xml | 120 ++
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/pom.xml | 119 ++
pipIrr-platform/pipIrr-common/pom.xml | 94 +
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/RmiResponseVo.java | 75 +
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolUnit.java | 6
48 files changed, 2,464 insertions(+), 422 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/pipIrr-common.iml b/pipIrr-platform/pipIrr-common/pipIrr-common.iml
index 6c1b512..dc8e3ef 100644
--- a/pipIrr-platform/pipIrr-common/pipIrr-common.iml
+++ b/pipIrr-platform/pipIrr-common/pipIrr-common.iml
@@ -97,14 +97,13 @@
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:5.0.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:6.0.11" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: cglib:cglib:3.3.0" level="project" />
- <orderEntry type="library" name="Maven: org.ow2.asm:asm:7.1" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.40" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension-spring6:2.0.40" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension:2.0.40" level="project" />
<orderEntry type="library" name="Maven: org.jdom:jdom2:2.0.6.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.mina:mina-core:2.2.2" level="project" />
+ <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" />
+ <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.15" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.21" level="project" />
- <orderEntry type="library" name="Maven: org.apache.mina:mina-core:2.2.1" level="project" />
- <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.1.7" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-common/pom.xml b/pipIrr-platform/pipIrr-common/pom.xml
index d645758..893e832 100644
--- a/pipIrr-platform/pipIrr-common/pom.xml
+++ b/pipIrr-platform/pipIrr-common/pom.xml
@@ -42,6 +42,7 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
+ <!-- @Aspect @Pointcut @Around绛夊簲鐢� -->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
@@ -71,7 +72,6 @@
<artifactId>springdoc-openapi-security</artifactId>
</dependency>
-
<!--mysql椹卞姩-->
<dependency>
<groupId>com.mysql</groupId>
@@ -82,25 +82,25 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
+ <version>1.2.20</version>
</dependency>
<!--mybatis-plus-spring-boot-->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
+ <version>3.5.3.2</version>
</dependency>
<!-- 闃块噷fastjson -->
<dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </dependency>
- <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>
<!-- jdom2 -->
@@ -113,12 +113,8 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
+ <version>2.2.2</version>
</dependency>
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-filter-compression</artifactId>
- </dependency>
-
<!-- quartz -->
<dependency>
<groupId>org.quartz-scheduler</groupId>
@@ -130,22 +126,77 @@
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
</dependency>
-
</dependencies>
<build>
<plugins>
<plugin>
- <!-- spring boot鎻愪緵鐨刴aven鎵撳寘鎻掍欢 -->
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
+ <!-- 璇ユ彃浠朵笉浼氬皢椤圭洰涓紩鍏ョ殑渚濊禆鎵撹繘鏈�缁堢殑 Jar 鏂囦欢 -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
+ <archive>
+ <!-- 鐢熸垚鐨刯ar涓紝涓嶈鍖呭惈pom.xml鍜宲om.properties杩欎袱涓枃浠� -->
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <!-- 杩欓儴鍒嗗彲鏈夊彲鏃�,鍔犱笂鐨勮瘽鍒欑洿鎺ョ敓鎴愬彲杩愯jar鍖�
+ <manifest>
+ <mainClass>com.dy.Main</mainClass>
+ <useUniqueVersions>false</useUniqueVersions>
+ <addClasspath>true</addClasspath>
+ <classpathPrefix>lib/</classpathPrefix>
+ </manifest>
+ -->
+ <!-- manifestEntries鐨勪綔鐢ㄦ槸鎸囧畾鏈湴锛堣嚜宸变笅杞界殑lib涓嬬殑锛塲ar鍖呮坊鍔犲埌MANIFEST.MF鏂囦欢涓幓
+ <manifestEntries>
+ <Class-Path>.lib/alipay-sdk.java.jar</Class-Path>
+ </manifestEntries>
+ -->
+ </archive>
+ <!-- 鎺掗櫎鏌愪釜鏂囦欢
<excludes>
- <exclude>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </exclude>
+ <exclude>com/dy/App.class</exclude>
</excludes>
+ -->
+ <!-- 鍙墽琛宩ar杩涜鍛藉悕銆傝繖鏍蜂細鎵撳寘鎴愪袱涓猨ar鍖咃紝涓嶄細瀵规櫘閫歫ar閲嶆柊鍛藉悕銆�
+ <classifier>exec</classifier>
+ -->
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- 褰撻」鐩腑渚濊禆姣旇緝澶氭椂锛屾垜浠彲浠ュ�熷姪 maven-dependency-plugin 鎻掍欢鑷姩甯垜浠笅杞戒緷璧栫殑 Jar 鏂囦欢锛屾帹鑽愬皢璇ユ彃浠剁粦瀹氬埌package鐢熷懡鍛ㄦ湡涓� -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- 缁戝畾鐢熷懡鍛ㄦ湡 -->
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <!-- 璁剧疆渚濊禆鐨勫瓨鏀捐矾寰� -->
+ <configuration>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ </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>
@@ -157,9 +208,10 @@
</configuration>
</plugin>
<plugin>
- <!-- 寮哄埗璁惧畾 java缂栬瘧鐗堟湰锛岃繍琛岀幆澧冪増鏈� -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <!-- 涓嬮潰瑙ｅ喅锛氬綋杩涜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>
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/fastjson/FastJsonConfig.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/fastjson/FastJsonConfig.java
index 477f78a..22eb799 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/fastjson/FastJsonConfig.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/fastjson/FastJsonConfig.java
@@ -6,18 +6,18 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.http.MediaType;
import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@Configuration
-public class FastJsonConfig implements WebMvcConfigurer {
+public class FastJsonConfig {
/**
* 閰嶇疆fastjson杈撳嚭鏍煎紡
**/
- @Override
+ @SuppressWarnings("unused")
public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
// 1. 閰嶇疆fastjson
com.alibaba.fastjson2.support.config.FastJsonConfig config = new com.alibaba.fastjson2.support.config.FastJsonConfig();
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/AnnotationScan.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/AnnotationScan.java
index f4ec4cb..2b3aa3a 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/AnnotationScan.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/AnnotationScan.java
@@ -65,9 +65,9 @@
int onLineDataMinLength;
int headMinLength ;
- HashMap<String, AnnotationDriverVo> driverMap = ProtocolCach.getDriverMap() ;
- HashMap<String, AnnotationPrefixedDataAvailableVo> prefixedDataAvailableMap = ProtocolCach.getPrefixedDataAvailableMap() ;
- HashMap<String, AnnotationOnLineVo> onLineMap = ProtocolCach.getOnLineMap() ;
+ HashMap<String, AnnotationDriverVo> driverMap = ProtocolCache.getDriverMap() ;
+ HashMap<String, AnnotationPrefixedDataAvailableVo> prefixedDataAvailableMap = ProtocolCache.getPrefixedDataAvailableMap() ;
+ HashMap<String, AnnotationOnLineVo> onLineMap = ProtocolCache.getOnLineMap() ;
for(String cName : classNames){
String className = cName.substring(0, cName.lastIndexOf('.')) ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLineHandle.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLineHandle.java
index 61ac4bd..a3c306b 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLineHandle.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLineHandle.java
@@ -12,7 +12,7 @@
*/
public OnLine.OnLineResult parse(byte[] bs)throws Exception{
OnLine.OnLineResult rs = null ;
- HashMap<String, AnnotationOnLineVo> onLineMap = ProtocolCach.getOnLineMap() ;
+ HashMap<String, AnnotationOnLineVo> onLineMap = ProtocolCache.getOnLineMap() ;
Collection<AnnotationOnLineVo> set = onLineMap.values() ;
if(set.size() == 0){
throw new Exception("澶勭悊涓婄嚎鏃讹紝寰楀埌鐨勫崗璁泦鍚堜负绌恒��") ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailableHandleImp.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailableHandleImp.java
index dbf7f64..30864ee 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailableHandleImp.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailableHandleImp.java
@@ -30,7 +30,7 @@
try{
PrefixedDataAvailableStatus pds = null ;
- HashMap<String, AnnotationPrefixedDataAvailableVo> prefixedDataAvailableMap = ProtocolCach.getPrefixedDataAvailableMap() ;
+ HashMap<String, AnnotationPrefixedDataAvailableVo> prefixedDataAvailableMap = ProtocolCache.getPrefixedDataAvailableMap() ;
Collection<AnnotationPrefixedDataAvailableVo> set = prefixedDataAvailableMap.values() ;
if(set.size() == 0){
throw new Exception("涓婄嚎鏁版嵁瀹屾暣鎬ф鏌ユ椂锛屽緱鍒扮殑鍗忚瀹屾暣鎬ф鏌ョ被闆嗗悎涓虹┖銆�") ;
@@ -90,7 +90,7 @@
try{
PrefixedDataAvailableStatus pds = null ;
- HashMap<String, AnnotationPrefixedDataAvailableVo> prefixedDataAvailableMap = ProtocolCach.getPrefixedDataAvailableMap() ;
+ HashMap<String, AnnotationPrefixedDataAvailableVo> prefixedDataAvailableMap = ProtocolCache.getPrefixedDataAvailableMap() ;
Collection<AnnotationPrefixedDataAvailableVo> set = prefixedDataAvailableMap.values() ;
if(set.size() == 0){
throw new Exception("涓婄嚎鏁版嵁瀹屾暣鎬ф鏌ユ椂锛屽緱鍒扮殑鍗忚闆嗗悎涓虹┖銆�") ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolCach.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolCache.java
similarity index 98%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolCach.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolCache.java
index 58dddb1..a8815d9 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolCach.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolCache.java
@@ -5,7 +5,7 @@
import java.util.List;
import java.util.Map;
-public class ProtocolCach {
+public class ProtocolCache {
//鏈郴缁熶腑锛孌river鍦ㄥ崟绾跨▼涓繍琛岋紝鎵�浠ュ彧鐢ㄤ竴涓疄渚�
private static final HashMap<String, Driver> drivers = new HashMap<>() ;
@@ -79,6 +79,7 @@
return onLineMap;
}
+ /*
public static void main(String[] args){
HashMap<String, Integer> mp = new HashMap<>() ;
mp.put("a1", 1) ;
@@ -86,4 +87,5 @@
List<String> list = new ArrayList<>(mp.keySet()) ;
System.out.println(list);
}
+ */
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolUnit.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolUnit.java
index 71dea2a..0e280fb 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolUnit.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolUnit.java
@@ -44,7 +44,7 @@
AnnotationScan.getIntance() ;
//鍚勪釜鍗忚椹卞姩绫绘壂鎻忚嚜宸辩殑鍔熻兘鐮佹敞瑙�
- HashMap<String, AnnotationDriverVo> drivers = ProtocolCach.getDriverMap() ;
+ HashMap<String, AnnotationDriverVo> drivers = ProtocolCache.getDriverMap() ;
Collection<String> colDrivers = drivers.keySet() ;
StringBuilder totalProtocols = new StringBuilder() ;
for(String protocolName : colDrivers){
@@ -52,7 +52,7 @@
totalProtocols.append("锛�") ;
}
totalProtocols.append(protocolName) ;
- Driver dri = ProtocolCach.getDriver(protocolName) ;
+ Driver dri = ProtocolCache.getDriver(protocolName) ;
if(dri != null){
dri.scanAnnotationCode();
}
@@ -70,7 +70,7 @@
*/
@SuppressWarnings("unused")
public boolean isOnlyOneProtocol(){
- HashMap<String, AnnotationDriverVo> drivers = ProtocolCach.getDriverMap() ;
+ HashMap<String, AnnotationDriverVo> drivers = ProtocolCache.getDriverMap() ;
return drivers.size() == 1 ;
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/AsciiPic.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/AsciiPic.java
index 53f71b7..f1e4a93 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/AsciiPic.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/AsciiPic.java
@@ -81,6 +81,7 @@
}
}
+ /*
public static void main(final String[] args) {
try {
AsciiPic.createAsciiPic(toBufferedImage(creatImage("DY.png")));
@@ -88,4 +89,5 @@
e.printStackTrace();
}
}
+ */
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java
index 7f561f1..31a6248 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java
@@ -1486,6 +1486,7 @@
// System.out.println(v5);
//
// }
+ /*
public static void main(String[] args) throws Exception {
byte[] bs = new byte[]{0x38, 0x36, 0x39, 0x31} ;
String s = bytes2String_BE(bs, 0, 3) ;
@@ -1499,5 +1500,6 @@
}
System.out.println(v);
}
+ */
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java
index 1e04eeb..158a591 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java
@@ -1619,7 +1619,7 @@
}
-
+ /*
public static void main(String[] args){
Long now = getTime() ;
System.out.println(now);
@@ -1631,6 +1631,6 @@
String s = yyyy_MM_dd_HH_mm_ss(dt);
System.out.println(s);
}
-
+ */
}
diff --git a/pipIrr-platform/pipIrr-global/pipIrr-global.iml b/pipIrr-platform/pipIrr-global/pipIrr-global.iml
index 89d9c6f..016a445 100644
--- a/pipIrr-platform/pipIrr-global/pipIrr-global.iml
+++ b/pipIrr-platform/pipIrr-global/pipIrr-global.iml
@@ -25,24 +25,20 @@
</content>
<orderEntry type="jdk" jdkName="20" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="pipIrr-common" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:3.1.3" level="project" />
+ <orderEntry type="module" module-name="pipIrr-common" scope="PROVIDED" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:3.1.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:3.1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:3.1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:3.1.3" level="project" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.4.11" level="project" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.4.11" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.20.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.20.0" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:2.0.7" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:2.1.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:6.0.11" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:10.1.12" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:10.1.12" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-web:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-beans:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: io.micrometer:micrometer-observation:1.11.2" level="project" />
- <orderEntry type="library" name="Maven: io.micrometer:micrometer-commons:1.11.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-aop:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-context:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-expression:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:3.1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.33" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:10.1.12" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:8.0.1.Final" level="project" />
<orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:3.0.2" level="project" />
@@ -54,28 +50,25 @@
<orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-starter-common:2.2.0" level="project" />
<orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-core-jakarta:2.2.15" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:2.0.7" level="project" />
<orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations-jakarta:2.2.15" level="project" />
<orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models-jakarta:2.2.15" level="project" />
<orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:4.0.0" level="project" />
<orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:2.1.2" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.springframework.boot:spring-boot-devtools:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.28" level="project" />
- <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.20" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:2.7.9" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.20.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.20.0" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:2.0.7" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.20.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-jul:2.20.0" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:2.0.7" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.15.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.15.2" level="project" />
- <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.33" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.15.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.15.2" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:6.0.11" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aop:6.0.11" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-beans:6.0.11" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context:6.0.11" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-expression:6.0.11" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-web:6.0.11" level="project" />
+ <orderEntry type="library" name="Maven: io.micrometer:micrometer-observation:1.11.2" level="project" />
+ <orderEntry type="library" name="Maven: io.micrometer:micrometer-commons:1.11.2" level="project" />
+ <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.28" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.3.2" level="project" />
@@ -84,12 +77,11 @@
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.6" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.13" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:3.1.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:3.1.3" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:5.0.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:6.0.11" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: cglib:cglib:3.3.0" level="project" />
- <orderEntry type="library" name="Maven: org.ow2.asm:asm:7.1" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.40" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension-spring6:2.0.40" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension:2.0.40" level="project" />
diff --git a/pipIrr-platform/pipIrr-global/pom.xml b/pipIrr-platform/pipIrr-global/pom.xml
index 960b924..1131ab6 100644
--- a/pipIrr-platform/pipIrr-global/pom.xml
+++ b/pipIrr-platform/pipIrr-global/pom.xml
@@ -21,23 +21,19 @@
<groupId>com.dy</groupId>
<artifactId>pipIrr-common</artifactId>
<version>1.0.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- <version>3.1.3</version>
+ <scope>provided</scope>
+ <!-- optional=true锛屼笉浼犻�掍緷璧栵紝鍗硃ipIrr-web-base渚濊禆pipIrr-global锛屼絾涓嶄細浼犻�掍緷璧栧埌pipIrr-common -->
+ <optional>true</optional>
<exclusions>
<exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-json</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
+ <!-- 鎺掗櫎鎺塸ipIrr-common鐨勬墍鏈変緷璧栵紝鏈ā鍧楄嚜宸卞畾涔変緷璧� -->
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
+
+
<!-- 杈撳叆鍙傛暟鎹獙璇� -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -53,47 +49,19 @@
<artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-devtools</artifactId>
- <version>3.1.3</version>
- <scope>runtime</scope>
- </dependency>
<!-- lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.28</version>
</dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
- <version>1.9.20</version>
- </dependency>
- <!--log4j2鏃ュ織-->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-log4j2</artifactId>
- <version>2.7.9</version>
- </dependency>
- <!-- 鐢ㄤ簬杈ㄨlog4j2.yml鏂囦欢 -->
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-yaml</artifactId>
- <version>2.15.2</version>
- </dependency>
- <!--mybatis-plus-spring-boot-->
+
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.5.3.2</version>
</dependency>
<!-- 闃块噷fastjson -->
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>3.3.0</version>
- </dependency>
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
@@ -120,21 +88,79 @@
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
- <!-- spring boot鎻愪緵鐨刴aven鎵撳寘鎻掍欢 -->
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
+ <!-- 璇ユ彃浠朵笉浼氬皢椤圭洰涓紩鍏ョ殑渚濊禆鎵撹繘鏈�缁堢殑 Jar 鏂囦欢 -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
+ <archive>
+ <!-- 鐢熸垚鐨刯ar涓紝涓嶈鍖呭惈pom.xml鍜宲om.properties杩欎袱涓枃浠� -->
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <!-- 杩欓儴鍒嗗彲鏈夊彲鏃�,鍔犱笂鐨勮瘽鍒欑洿鎺ョ敓鎴愬彲杩愯jar鍖�
+ <manifest>
+ <mainClass>com.dy.Main</mainClass>
+ <useUniqueVersions>false</useUniqueVersions>
+ <addClasspath>true</addClasspath>
+ <classpathPrefix>lib/</classpathPrefix>
+ </manifest>
+ -->
+ <!-- manifestEntries鐨勪綔鐢ㄦ槸鎸囧畾鏈湴锛堣嚜宸变笅杞界殑lib涓嬬殑锛塲ar鍖呮坊鍔犲埌MANIFEST.MF鏂囦欢涓幓
+ <manifestEntries>
+ <Class-Path>.lib/alipay-sdk.java.jar</Class-Path>
+ </manifestEntries>
+ -->
+ </archive>
+ <!-- 鎺掗櫎鏌愪釜鏂囦欢
<excludes>
- <exclude>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </exclude>
+ <exclude>com/dy/App.class</exclude>
</excludes>
+ -->
+ <!-- 鍙墽琛宩ar杩涜鍛藉悕銆傝繖鏍蜂細鎵撳寘鎴愪袱涓猨ar鍖咃紝涓嶄細瀵规櫘閫歫ar閲嶆柊鍛藉悕銆�
+ <classifier>exec</classifier>
+ -->
</configuration>
</plugin>
+ <plugin>
+ <!-- 褰撻」鐩腑渚濊禆姣旇緝澶氭椂锛屾垜浠彲浠ュ�熷姪 maven-dependency-plugin 鎻掍欢鑷姩甯垜浠笅杞戒緷璧栫殑 Jar 鏂囦欢锛屾帹鑽愬皢璇ユ彃浠剁粦瀹氬埌package鐢熷懡鍛ㄦ湡涓� -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- 缁戝畾鐢熷懡鍛ㄦ湡 -->
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <!-- 璁剧疆渚濊禆鐨勫瓨鏀捐矾寰� -->
+ <configuration>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ </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>
@@ -143,11 +169,7 @@
<skipTests>true</skipTests>
</configuration>
</plugin>
- <plugin>
- <!-- 寮哄埗璁惧畾 java缂栬瘧鐗堟湰锛岃繍琛岀幆澧冪増鏈� -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
+
</plugins>
</build>
</project>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/pom.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/pom.xml
index 6131694..bcbec20 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/pom.xml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/pom.xml
@@ -11,25 +11,125 @@
<packaging>jar</packaging>
<artifactId>pipIrr-mw-accept</artifactId>
+ <version>1.0.0</version>
<name>pipIrr-mw-accept</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-json</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- 绯荤粺鐩戠 -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
+
+ <!-- api鍦ㄧ嚎鏂囨。 https://springdoc.org/#modules-->
+ <dependency>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-security</artifactId>
+ </dependency>
+
+ <!-- 鍔ㄦ�佸姞杞芥柊缂栬瘧鐨勭被 -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-devtools</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!--mysql椹卞姩-->
+ <dependency>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
+ <version>8.0.33</version>
+ </dependency>
+ <!--druid-spring-boot杩炴帴姹�-->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>druid-spring-boot-starter</artifactId>
+ <version>1.2.20</version>
+ </dependency>
+ <!--mybatis-plus-spring-boot-->
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-boot-starter</artifactId>
+ <version>3.5.3.2</version>
+ </dependency>
+
+ <!-- bean鍜宮ap浜掕浆鎹� -->
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo</artifactId>
+ <version>3.2.7</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.alibaba.spring</groupId>
+ <artifactId>spring-context-support</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.alibaba.fastjson2</groupId>
+ <artifactId>fastjson2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.alibaba</groupId>
+ <artifactId>hessian-lite</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<!-- apache mina -->
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-filter-compression</artifactId>
- <version>2.2.1</version>
+ <version>2.2.2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.7</version>
</dependency>
+
+ <!-- 娴嬭瘯 -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/PipIrrMwAcceptApplication.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/PipIrrMwAcceptApplication.java
index a93ac94..f69af6f 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/PipIrrMwAcceptApplication.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/PipIrrMwAcceptApplication.java
@@ -6,7 +6,6 @@
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/busi/TcpUpDataCache.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/busi/TcpUpDataCache.java
index d6bec2b..3da1fb8 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/busi/TcpUpDataCache.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/busi/TcpUpDataCache.java
@@ -26,7 +26,7 @@
* @throws Exception 寮傚父
*/
public static void cacheRtuUpData(boolean reportOrResponse_trueOrFalse, AboutRtuNode node) throws Exception{
- if(node != null && node.data != null){
+ if(node != null && node.obj != null){
if(reportOrResponse_trueOrFalse){
cacheQueue.pushHead(node);
}else{
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/RtuDownTask.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/RtuDownTask.java
index 7362c7a..64891d0 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/RtuDownTask.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/RtuDownTask.java
@@ -7,7 +7,7 @@
import com.dy.common.mw.protocol.MidResult;
import com.dy.common.mw.protocol.Command;
import com.dy.common.mw.protocol.Driver;
-import com.dy.common.mw.protocol.ProtocolCach;
+import com.dy.common.mw.protocol.ProtocolCache;
import com.dy.aceMw.server.ServerProperties;
import com.dy.aceMw.server.forTcp.TcpSessionCach;
@@ -44,13 +44,13 @@
String protocolName = TcpSessionCach.getTcpProtocolName(rtuAddr) ;
if(protocolName == null){
//RTU鏈浘涓婄嚎
- int count = ProtocolCach.driverCount() ;
+ int count = ProtocolCache.driverCount() ;
if(count == 1){
//鍙湁涓�涓崗璁�
- dri = ProtocolCach.getFirstDriver() ;
+ dri = ProtocolCache.getFirstDriver() ;
}
}else{
- dri = ProtocolCach.getDriver(protocolName) ;
+ dri = ProtocolCache.getDriver(protocolName) ;
}
if(dri == null){
log.error("涓ラ噸閿欒锛屾湭鑳藉緱鍒板崗璁�" + protocolName + "椹卞姩绫诲疄渚嬶紒");
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/RtuUpTask.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/RtuUpTask.java
index bfa8f7f..c27241f 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/RtuUpTask.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/RtuUpTask.java
@@ -14,7 +14,7 @@
import com.dy.common.mw.protocol.Driver;
import com.dy.common.mw.protocol.OnLine;
import com.dy.common.mw.protocol.OnLineHandle;
-import com.dy.common.mw.protocol.ProtocolCach;
+import com.dy.common.mw.protocol.ProtocolCache;
import com.dy.aceMw.server.ServerProperties;
import com.dy.aceMw.server.forTcp.RtuLogDealer;
import com.dy.aceMw.server.forTcp.RtuStatusDealer;
@@ -144,7 +144,7 @@
* @throws Exception 寮傚父
*/
private void dealUpData(IoSession session, String rtuAddrAtHead, String protocolName, boolean isOnLine, byte[] upBuf, String upHex) throws Exception{
- Driver dri = ProtocolCach.getDriver(protocolName) ;
+ Driver dri = ProtocolCache.getDriver(protocolName) ;
if(dri == null){
log.error("涓ラ噸閿欒锛屾湭鑳藉緱鍒板崗璁�" + protocolName + "椹卞姩绫诲疄渚嬶紒");
}else{
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw.iml b/pipIrr-platform/pipIrr-mw/pipIrr-mw.iml
index 754c7d6..7054b2a 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw.iml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw.iml
@@ -8,88 +8,19 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="pipIrr-common" />
- <orderEntry type="module" module-name="pipIrr-global" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:10.1.12" level="project" />
- <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:8.0.1.Final" level="project" />
- <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:3.0.2" level="project" />
- <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.5.3.Final" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:2.1.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:10.1.12" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:10.1.12" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-web:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-beans:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-aop:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-context:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-expression:6.0.11" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.springframework.boot:spring-boot-devtools:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:3.1.3" level="project" />
+ <orderEntry type="module" module-name="pipIrr-common" scope="PROVIDED" />
+ <orderEntry type="module" module-name="pipIrr-global" scope="PROVIDED" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.28" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.20" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:2.0.7" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:3.1.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j2-impl:2.20.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.20.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.20.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-jul:2.20.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.15.2" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.15.2" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.33" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.15.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2" level="project" />
- <orderEntry type="library" name="Maven: io.micrometer:micrometer-observation:1.11.2" level="project" />
- <orderEntry type="library" name="Maven: io.micrometer:micrometer-commons:1.11.2" level="project" />
- <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.11.2" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.hdrhistogram:HdrHistogram:2.1.12" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
- <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.webjars:swagger-ui:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-starter-webmvc-api:2.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-starter-common:2.2.0" level="project" />
- <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-core-jakarta:2.2.15" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
- <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations-jakarta:2.2.15" level="project" />
- <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models-jakarta:2.2.15" level="project" />
- <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-security:1.7.0" level="project" />
- <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-common:1.7.0" level="project" />
- <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-core:2.2.9" level="project" />
- <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.2.9" level="project" />
- <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.2.9" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:6.1.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:6.1.2" level="project" />
- <orderEntry type="library" name="Maven: com.mysql:mysql-connector-j:8.0.33" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.20" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.20" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:2.0.7" level="project" />
- <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:4.0.3" level="project" />
- <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-core:4.0.3" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.eclipse.angus:angus-activation:2.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:4.0.3" level="project" />
- <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:4.1.2" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.6" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.13" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.1.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:5.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-tx:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: cglib:cglib:3.3.0" level="project" />
- <orderEntry type="library" name="Maven: org.ow2.asm:asm:7.1" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.40" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension-spring6:2.0.40" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension:2.0.40" level="project" />
@@ -97,37 +28,8 @@
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct-processor:1.5.5.Final" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.21" level="project" />
<orderEntry type="library" name="Maven: org.jdom:jdom2:2.0.6.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.dubbo:dubbo:3.2.7" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:3.1.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:3.1.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:3.1.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.8.0" level="project" />
- <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:4.0.0" level="project" />
- <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:2.1.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.4.11" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.4.11" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.24.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.14.6" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.9.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.9.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.9.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.9.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.9.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.9.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:5.3.1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.14.6" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:5.3.1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-core:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-jcl:6.0.11" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:6.0.11" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.9.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/.gitignore b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/.gitignore
new file mode 100644
index 0000000..549e00a
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.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-mwTest-server/pipIrr-mwTest-server.iml b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/pipIrr-mwTest-server.iml
new file mode 100644
index 0000000..4267c35
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/pipIrr-mwTest-server.iml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="web" name="Web">
+ <configuration>
+ <webroots />
+ <sourceRoots>
+ <root url="file://$MODULE_DIR$/src/main/java" />
+ <root url="file://$MODULE_DIR$/src/main/resources" />
+ </sourceRoots>
+ </configuration>
+ </facet>
+ </component>
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_16">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="jdk" jdkName="20" jdkType="JavaSDK" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="pipIrr-common" scope="PROVIDED" />
+ <orderEntry type="module" module-name="pipIrr-global" scope="PROVIDED" />
+ <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.28" level="project" />
+ <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.20" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:2.0.7" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:3.1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j2-impl:2.20.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.20.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.20.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-jul:2.20.0" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2" level="project" />
+ <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.33" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.15.2" level="project" />
+ <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.40" level="project" />
+ <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension-spring6:2.0.40" level="project" />
+ <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension:2.0.40" level="project" />
+ <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.5.5.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.mapstruct:mapstruct-processor:1.5.5.Final" level="project" />
+ <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.21" level="project" />
+ <orderEntry type="library" name="Maven: org.jdom:jdom2:2.0.6.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/pom.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/pom.xml
new file mode 100644
index 0000000..4872f57
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/pom.xml
@@ -0,0 +1,104 @@
+<?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 http://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-mwTest-server</artifactId>
+ <version>1.0.0</version>
+ <name>pipIrr-mwTest-server</name>
+ <description>涓烘ā鎷烺TU娴嬭瘯绔彁渚涙湇鍔�</description>
+
+ <dependencies>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <!-- 璇ユ彃浠朵笉浼氬皢椤圭洰涓紩鍏ョ殑渚濊禆鎵撹繘鏈�缁堢殑 Jar 鏂囦欢 -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <!-- 鐢熸垚鐨刯ar涓紝涓嶈鍖呭惈pom.xml鍜宲om.properties杩欎袱涓枃浠� -->
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <!-- 杩欓儴鍒嗗彲鏈夊彲鏃�,鍔犱笂鐨勮瘽鍒欑洿鎺ョ敓鎴愬彲杩愯jar鍖� -->
+ <manifest>
+ <mainClass>com.dy.testServer.Server</mainClass>
+ <useUniqueVersions>false</useUniqueVersions>
+ <addClasspath>true</addClasspath>
+ <classpathPrefix>lib/</classpathPrefix>
+ </manifest>
+ <!-- manifestEntries鐨勪綔鐢ㄦ槸鎸囧畾鏈湴锛堣嚜宸变笅杞界殑lib涓嬬殑锛塲ar鍖呮坊鍔犲埌MANIFEST.MF鏂囦欢涓幓
+ <manifestEntries>
+ <Class-Path>.lib/alipay-sdk.java.jar</Class-Path>
+ </manifestEntries>
+ -->
+ </archive>
+ <!-- 鎺掗櫎鏌愪釜鏂囦欢
+ <excludes>
+ <exclude>com/dy/App.class</exclude>
+ </excludes>
+ -->
+ <!-- 鍙墽琛宩ar杩涜鍛藉悕銆傝繖鏍蜂細鎵撳寘鎴愪袱涓猨ar鍖咃紝涓嶄細瀵规櫘閫歫ar閲嶆柊鍛藉悕銆�
+ <classifier>exec</classifier>
+ -->
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- 褰撻」鐩腑渚濊禆姣旇緝澶氭椂锛屾垜浠彲浠ュ�熷姪 maven-dependency-plugin 鎻掍欢鑷姩甯垜浠笅杞戒緷璧栫殑 Jar 鏂囦欢锛屾帹鑽愬皢璇ユ彃浠剁粦瀹氬埌package鐢熷懡鍛ㄦ湡涓� -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- 缁戝畾鐢熷懡鍛ㄦ湡 -->
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <!-- 璁剧疆渚濊禆鐨勫瓨鏀捐矾寰� -->
+ <configuration>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ </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>
+
+ </plugins>
+ </build>
+</project>
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/AdapterImp_RmiUnit.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/AdapterImp_RmiUnit.java
new file mode 100644
index 0000000..de59d8c
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/AdapterImp_RmiUnit.java
@@ -0,0 +1,26 @@
+package com.dy.testServer;
+
+import com.dy.common.mw.channel.rmi.RmiConfigVo;
+import com.dy.common.mw.channel.rmi.RmiRequestCallback;
+import com.dy.common.mw.channel.rmi.RmiUnitAdapter;
+import com.dy.testServer.forRmi.RmiRequestedCallback;
+
+public class AdapterImp_RmiUnit implements RmiUnitAdapter {
+
+ private RmiConfigVo configVo ;
+
+ @Override
+ public RmiConfigVo getConfig() {
+ return configVo;
+ }
+
+ public void setConfig(RmiConfigVo configVo){
+ this.configVo = configVo ;
+ }
+
+ @Override
+ public RmiRequestCallback newRequestCallback() {
+ return new RmiRequestedCallback();
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/Server.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/Server.java
new file mode 100644
index 0000000..27fcf68
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/Server.java
@@ -0,0 +1,167 @@
+package com.dy.testServer;
+
+import java.io.Console;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.dy.testServer.console.CommandConsole;
+import com.dy.testServer.forRmi.Manager;
+import org.jdom2.Document;
+
+import com.dy.common.mw.UnitInterface;
+import com.dy.common.mw.UnitStartedCallbackInterface;
+import com.dy.common.mw.channel.rmi.RmiConfigVo;
+import com.dy.common.mw.channel.rmi.RmiUnit;
+import com.dy.common.util.ConfigXml;
+import com.dy.common.util.NumUtil;
+
+public class Server{
+
+ private ConfigXml conf = null ;
+ private Document doc = null ;
+ private boolean showStartInfo = false ;
+
+ private String RmiSvUrl ;
+
+ private final List<UnitInterface> units = new ArrayList<>() ;
+
+ /**
+ * @param args 鍙傛暟
+ */
+ public static void main(String[] args) {
+ new Server().startServer(args);
+ }
+
+ /**
+ * 鍚姩鏈嶅姟
+ */
+ public void startServer(String[] args){
+ Server sv = new Server();
+ long start = System.currentTimeMillis() ;
+ try {
+ sv.conf = new ConfigXml() ;
+ sv.doc = sv.conf.createDom(sv.getClass(), "/config.xml") ;
+ ////////////////
+ //鏈嶅姟 閰嶇疆
+ sv.showStartInfo = sv.conf.getSetAttrBoolean(sv.doc, "config.server", "showStartInfo", null, null) ;
+
+ sv.startUnits() ;
+
+ String svName ;
+ try{
+ svName = sv.conf.getSetAttrTxt(sv.doc, "config.server", "name", null, false, null) ;
+ }catch(Exception e){
+ svName = "" ;
+ }
+
+ System.out.println("OOOOOOOOOO OOOOOOOO OOOOOOOO") ;
+ System.out.println("@@@@@@@@@@@@@@@@#O $@@@@@@@@& @@@@@@@@#") ;
+ System.out.println("@@@@@@@@@@@@@@@@@@@# @@@@@@@@# $@@@@@@@@&") ;
+ System.out.println("@@@@@@@@@@@@@@@@@@@@@# #@@@@@@@@@@@@@@@@O") ;
+ System.out.println("@@@@@@@@@@@@@@@@@@@@@@@ &@@@@@@@@@@@@@@") ;
+ System.out.println("@@@@@@$ $@@@@@@@@@& O@@@@@@@@@@@#") ;
+ System.out.println("@@@@@@$ @@@@@@@@@ @@@@@@@@@& " + svName + "mwTestSv " ) ;
+ System.out.println("@@@@@@$ @@@@@@@@@ &@@@@@@@@") ;
+ System.out.println("@@@@@@$ O@@@@@@@@@ &@@@@@@@@") ;
+ if(sv.RmiSvUrl != null){
+ System.out.println("@@@@@@$ #@@@@@@@@@$ &@@@@@@@@ RmiSv " + sv.RmiSvUrl ) ;
+ }else{
+ System.out.println("@@@@@@$ #@@@@@@@@@$ &@@@@@@@@" ) ;
+ }
+ System.out.println("@@@@@@@@@@@@@@@@@@@@@@# &@@@@@@@@ Runing in standalone mode" ) ;
+ System.out.println("@@@@@@@@@@@@@@@@@@@@@& &@@@@@@@@ Startup in " + (System.currentTimeMillis() - start) + " MS" ) ;
+ System.out.println("@@@@@@@@@@@@@@@@@@@# &@@@@@@@@") ;
+ System.out.println("@@@@@@@@@@@@@@@@#O &@@@@@@@@") ;
+
+
+
+ Console console = System.console();
+ if (console == null) {
+ throw new IllegalStateException("涓ラ噸閿欒锛屾湭鑳藉緱鍒版帶鍒跺彴瀵硅薄!");
+ }
+ CommandConsole mwConsole = new CommandConsole(console) ;
+ mwConsole.init(args);
+ boolean exit = mwConsole.clientConsole() ;
+ if(exit){
+ System.exit(-1);
+ }
+ }catch(Exception e){
+ e.printStackTrace();
+ }
+ }
+
+ private void startUnits(){
+ try {
+ ///////////////
+ //鍩烘湰閰嶇疆
+ String txt = conf.getSetAttrTxt(doc, "config.base", "rtuAddrStart", null, false, null) ;
+ if(txt == null || txt.trim().equals("")){
+ throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrStart鐨勫�间负绌哄瓧绗︿覆!");
+ }
+ txt = txt.trim() ;
+ if(!NumUtil.isPlusIntNumber(txt)){
+ throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrStart鐨勫�煎繀椤讳负鏁板��!");
+ }
+ if(txt.startsWith("0")){
+ throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrStart鐨勬暟鍊间笉鑳戒互0寮�澶�!");
+ }
+ if(txt.length() != 10){
+ throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrStart鐨勬暟鍊奸暱搴﹀繀椤讳负10浣�!");
+ }
+ ServerProperties.rtuAddrStart = Long.valueOf(txt) ;
+
+ txt = conf.getSetAttrTxt(doc, "config.base", "rtuAddrEnd", null, false, null) ;
+ if(txt == null || txt.trim().equals("")){
+ throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrEnd鐨勫�间负绌哄瓧绗︿覆!");
+ }
+ txt = txt.trim() ;
+ if(!NumUtil.isPlusIntNumber(txt)){
+ throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrEnd鐨勫�煎繀椤讳负鏁板��!");
+ }
+ if(txt.startsWith("0")){
+ throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrEnd鐨勬暟鍊间笉鑳戒互0寮�澶�!");
+ }
+ if(txt.length() != 10){
+ throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrEnd鐨勬暟鍊奸暱搴﹀繀椤讳负10浣�!");
+ }
+ ServerProperties.rtuAddrEnd = Long.valueOf(txt) ;
+ if(ServerProperties.rtuAddrEnd <= ServerProperties.rtuAddrStart){
+ throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrEnd鐨勬暟鍊煎繀椤诲ぇ浜巖tuAddrStart!");
+ }
+
+ ServerProperties.rtuAddrPerMwTest = conf.getSetAttrPlusInt(doc, "config.base", "rtuAddrPerMwTest", null, 1, null, null) ;
+ if(ServerProperties.rtuAddrPerMwTest > ServerProperties.rtuAddrEnd - ServerProperties.rtuAddrStart){
+ throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrPerMwTest鐨勬暟鍊奸厤缃笉姝ｇ‘!");
+ }
+ ServerProperties.tcpServerIp = conf.getSetAttrTxt(doc, "config.base", "tcpServerIp", null, false, null) ;
+ ServerProperties.tcpServerPort = conf.getSetAttrPlusInt(doc, "config.base", "tcpServerPort", null, 1, 65535, null) ;
+ ServerProperties.sendTimes = conf.getSetAttrPlusInt(doc, "config.base", "sendTimes", null, 1, null, null) ;
+
+
+ /////////////////
+ //RMI妯″潡
+ Manager.init();
+ RmiConfigVo rmiVo = new RmiConfigVo();
+ rmiVo.enable = conf.getSetAttrBoolean(doc, "config.rmi", "enable", null, null) ;
+ if(rmiVo.enable){
+ rmiVo.port = conf.getSetAttrPlusInt(doc, "config.rmi", "port", null, 100, 65535, null);
+ rmiVo.context = conf.getSetAttrTxt(doc, "config.rmi", "context", null, false, null);
+ rmiVo.showStartInfo = showStartInfo ;
+ AdapterImp_RmiUnit rmiAdap = new AdapterImp_RmiUnit();
+ rmiAdap.setConfig(rmiVo);
+ RmiUnit rmiUnit = RmiUnit.getInstance();
+ rmiUnit.setAdapter(rmiAdap);
+ rmiUnit.start(new UnitStartedCallbackInterface(){
+ @Override
+ public void call(Object obj) {
+ }
+ });
+ RmiSvUrl = "[ip]:" + rmiVo.port + "/" + rmiVo.context ;
+ units.add(rmiUnit) ;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/ServerProperties.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/ServerProperties.java
new file mode 100644
index 0000000..de6cd2d
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/ServerProperties.java
@@ -0,0 +1,18 @@
+package com.dy.testServer;
+
+public class ServerProperties {
+
+ //妯℃嫙瀹㈡埛鐨剅tuAddr璧峰鍙�
+ public static Long rtuAddrStart = 0L ;
+ //妯℃嫙瀹㈡埛鐨剅tuAddr鎴鍙�
+ public static Long rtuAddrEnd = 0L ;
+ //姣忎釜mwTest鍒嗛厤鐨剅tuAddr鏁�
+ public static Integer rtuAddrPerMwTest = 0 ;
+ //鏈嶅姟绔疷RL
+ public static String tcpServerIp = "" ;
+ //鏈嶅姟绔笂涓嬫枃
+ public static Integer tcpServerPort = 60000 ;
+ //鍙戦�佹暟鎹鏁�
+ public static Integer sendTimes = 0 ;
+
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/console/Command.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/console/Command.java
new file mode 100644
index 0000000..8e746e3
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/console/Command.java
@@ -0,0 +1,126 @@
+package com.dy.testServer.console;
+
+import java.io.PrintWriter;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import com.dy.common.mw.channel.rmi.RmiConfigVo;
+import com.dy.common.mw.channel.rmi.RmiUnit;
+import com.dy.testServer.ServerProperties;
+import com.dy.testServer.forRmi.MwTestClientStatus;
+import com.dy.testServer.forRmi.Manager;
+
+public class Command {
+
+ private static final String[] commands ;
+ static{
+ commands = new String[]{
+ "config 鏌ョ湅閰嶇疆淇℃伅",
+ "show 鏄剧ずmwTest鎯呭喌",
+ "start 鍚姩mwTest涓婃姤鏁版嵁",
+ "exit 閫�鍑�",
+ };
+ }
+
+
+ public static boolean dealCommand(String command, PrintWriter prtWrt){
+ boolean exit = false ;
+ if (command.equals("help")) {
+ outCommand(prtWrt);
+ } else if (command.equals("config")) {
+ config(prtWrt);
+ } else if (command.equals("show")) {
+ show(prtWrt);
+ } else if (command.equals("start")) {
+ start(prtWrt);
+ } else if(command.equals("exit")){
+ exit = true ;
+ } else {
+ outError(prtWrt);
+ }
+ return exit ;
+ }
+ private static void outCommand(PrintWriter prtWrt){
+ prtWrt.println("");
+ prtWrt.println("鍛戒护");
+ for(String s : commands){
+ prtWrt.println(" " + s);
+ }
+ prtWrt.println("");
+ }
+ private static void outError(PrintWriter prtWrt){
+ prtWrt.println("");
+ prtWrt.println("鍛戒护涓嶅彲璇嗗埆锛�");
+ prtWrt.println("");
+ }
+
+ private static void config(PrintWriter prtWrt){
+ prtWrt.println("");
+ prtWrt.println("鐩稿叧mwTest鐨勯厤缃�");
+ prtWrt.println(" 妯℃嫙瀹㈡埛鐨凴tuAddr璧峰鍙凤細" + ServerProperties.rtuAddrStart);
+ prtWrt.println(" 妯℃嫙瀹㈡埛鐨凴tuAddr鎴鍙凤細" + ServerProperties.rtuAddrEnd);
+ prtWrt.println(" 姣忎釜mwTest鍒嗛厤鐨凴tuAddr鏁帮細" + ServerProperties.rtuAddrPerMwTest);
+ prtWrt.println(" 閫氫俊涓棿浠禝P锛�" + ServerProperties.tcpServerIp);
+ prtWrt.println(" 閫氫俊涓棿浠剁鍙ｏ細" + ServerProperties.tcpServerPort);
+ prtWrt.println(" mwTest姣廟tuAddr鍙峰彂閫佹暟鎹鏁帮細" + ServerProperties.sendTimes);
+ prtWrt.println("鏈湇鍔MI Server閰嶇疆");
+ String ip = null ;
+ try {
+ ip = InetAddress.getLocalHost().getHostAddress();
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
+ }
+ RmiConfigVo confVo = RmiUnit.getInstance().getAdapter().getConfig() ;
+ if(ip != null){
+ prtWrt.println(" RMI Server锛�" + ip + ":" + confVo.port + "/" + confVo.context);
+ }else{
+ prtWrt.println(" RMI Server锛歔ip]:" + confVo.port + "/" + confVo.context);
+ }
+ prtWrt.println("");
+ }
+
+ private static void show(PrintWriter prtWrt){
+ prtWrt.println("");
+ prtWrt.println("褰撳墠宸叉敞鍐宮wTest瀹㈡埛绔暟閲忥細" + Manager.id2TokenMap.size());
+ if(Manager.id2TokenMap.size() > 0){
+ prtWrt.println("mwTest瀹㈡埛绔強鍏跺伐浣滀俊鎭�");
+ Set<Map.Entry<String, MwTestClientStatus>> set = Manager.token2ClientMap.entrySet() ;
+ Iterator<Map.Entry<String, MwTestClientStatus>> it = set.iterator() ;
+ Map.Entry<String, MwTestClientStatus> ent ;
+ while(it.hasNext()){
+ ent = it.next() ;
+ prtWrt.println(" mwTest瀹㈡埛绔�(token=" + ent.getKey() + ")");
+ MwTestClientStatus sta = ent.getValue() ;
+ if(sta != null){
+ if(sta.confVo != null){
+ prtWrt.println(" rtuAddr鑼冨洿锛�" + sta.confVo.rtuAddrStart + "--" + sta.confVo.rtuAddrEnd);
+ }
+ if(sta.startVo != null){
+ prtWrt.println(" 涓婃姤鏁版嵁锛�" + (sta.startVo.start?"宸茬粡寮�濮�":"鏈紑濮�"));
+ }else{
+ prtWrt.println(" 涓婃姤鏁版嵁锛氭湭寮�濮�") ;
+ }
+ if(sta.count != null){
+ prtWrt.println(" 宸茬粡涓婃姤鏁版嵁锛�" + sta.count + "鏉�");
+ }
+ if(sta.over != null && sta.over){
+ prtWrt.println(" 涓婃姤鏁版嵁宸茬粡瀹屾垚锛屽叡鐢ㄦ椂锛�" + sta.seconds + "绉�");
+ }
+ }
+ }
+ }
+ prtWrt.println("");
+ }
+
+ private static void start(PrintWriter prtWrt){
+ prtWrt.println("");
+ prtWrt.println(" 宸茬粡鍏佽mwTest涓婃姤鏁版嵁浜�");
+ prtWrt.println("");
+ Manager.enablemwTestStart = true ;
+ }
+
+
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/console/CommandConsole.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/console/CommandConsole.java
new file mode 100644
index 0000000..b03e5b3
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/console/CommandConsole.java
@@ -0,0 +1,91 @@
+package com.dy.testServer.console;
+
+import java.io.Console;
+import java.io.PrintWriter;
+
+public class CommandConsole {
+
+ private Console console ;
+ private PrintWriter prtWrt ;
+ private static final String myPassword = "123456" ;
+ private static final String commandPrefix1 = ">>" ;
+ private static final String commandPrefix2 = "$: " ;
+ private static String commandPrefix = commandPrefix1 + commandPrefix2 ;
+
+
+ public CommandConsole(Console console)throws Exception{
+ this.console = console ;
+ if(this.console == null){
+ throw new Exception("涓ラ噸閿欒锛宩ava鎺у埗鍙板璞′负绌猴紒");
+ }
+ prtWrt = console.writer() ;
+ }
+
+ /**
+ * 鍒濆锛屾鏌ュ苟杈撳嚭涓�浜涗俊鎭�
+ * @param args 鍙傛暟
+ * @throws Exception 寮傚父
+ */
+ public void init(String[] args) throws Exception{
+ PrintWriter prtWrt = console.writer() ;
+ if(args != null && args.length > 0){
+ String str = "" ;
+ for(String s : args){
+ str += s ;
+ }
+ prtWrt.println("info锛氬惎鍔ㄥ弬鏁�" + str);
+ }
+
+ prtWrt.println("----------------------------------------");
+ prtWrt.println("-- --");
+ prtWrt.println("-- 娆㈣繋浣跨敤mwTest 鏈嶅姟鎺у埗绔� --");
+ prtWrt.println("-- --");
+ prtWrt.println("----------------------------------------");
+ }
+
+ /**
+ * 鎵ц鎺у埗鍙版帶鍒�
+ * @return 杩斿洖
+ */
+ public boolean clientConsole(){
+ boolean exit = false ;
+ try {
+ this.login() ;
+ exit = this.doConsole();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return exit ;
+ }
+
+ private boolean login(){
+ while (true) {
+ //String username = console.readLine("Username: ");
+ char[] password = console.readPassword(">>Password: ");
+ String passwordStr = String.valueOf(password) ;
+ if (passwordStr.equals("help")) {
+ console.printf("瀵嗙爜鏄�%1$s.\n", "123456");
+ // 浣跨敤鍚庡簲绔嬪嵆灏嗘暟缁勬竻绌猴紝浠ュ噺灏戝叾鍦ㄥ唴瀛樹腑鍗犵敤鐨勬椂闂达紝澧炲己瀹夊叏鎬�
+ password = null;
+ } else if(passwordStr.equals(myPassword)){
+ return true;
+ }
+ }
+ }
+
+ private boolean doConsole(){
+ boolean exit = false ;
+ while (!exit) {
+ String command = console.readLine(commandPrefix);
+ exit = Command.dealCommand(command, prtWrt) ;
+ }
+ return exit ;
+ }
+
+ public static void changeCommandPrefix(String prefix){
+ commandPrefix = commandPrefix1 + prefix ;
+ }
+ public static void recoverCommandPrefix(){
+ commandPrefix = commandPrefix1 + commandPrefix2 ;
+ }
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/Code.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/Code.java
new file mode 100644
index 0000000..889e9b3
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/Code.java
@@ -0,0 +1,15 @@
+package com.dy.testServer.forRmi;
+
+public class Code {
+
+ public static String cd1 = "001" ;//娉ㄥ唽
+
+ public static String cd2 = "002" ;//璇锋眰mwClient鐨勯厤缃�
+
+ public static String cd3 = "003" ;//璇锋眰寮�濮嬪伐浣�
+
+ public static String cd4 = "004" ;//鍚戞湇鍔＄涓婃姤淇℃伅
+
+ public static String cd5 = "005" ;//鍚戞湇鍔＄涓婃姤 鏁版嵁涓婃姤宸ヤ綔宸茬粡瀹屾垚
+
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/Manager.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/Manager.java
new file mode 100644
index 0000000..8e057db
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/Manager.java
@@ -0,0 +1,173 @@
+package com.dy.testServer.forRmi;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.dy.testServer.ServerProperties;
+
+public class Manager {
+
+ public static boolean enablemwTestStart = false ;
+
+ public static int clientId = 1 ;
+
+ public static long maxClient = 0 ;
+
+ public static Map<String, String> id2TokenMap = new HashMap<>() ;
+
+ public static Map<String, MwTestClientStatus> token2ClientMap = new HashMap<>() ;
+
+ public static List<Object[]> rtuAddrList = new ArrayList<>() ;
+
+ public static void init(){
+ maxClient = (ServerProperties.rtuAddrEnd - ServerProperties.rtuAddrStart)/ServerProperties.rtuAddrPerMwTest ;
+ if((ServerProperties.rtuAddrEnd - ServerProperties.rtuAddrStart)%ServerProperties.rtuAddrPerMwTest > 0 ){
+ maxClient = maxClient + 1 ;
+ }
+ int count = 0 ;
+ for(int i = 0; i < maxClient; i++){
+ long start = ServerProperties.rtuAddrStart + (i * ServerProperties.rtuAddrPerMwTest) ;
+ long end = ServerProperties.rtuAddrStart + ((i + 1) * ServerProperties.rtuAddrPerMwTest - 1) ;
+ if(end > ServerProperties.rtuAddrEnd){
+ end = ServerProperties.rtuAddrEnd ;
+ }
+ if(end < start){
+ break ;
+ }else{
+ rtuAddrList.add(count++, new Object[]{start, end});
+ }
+ }
+ }
+
+ public synchronized static String dealRequest(Object obj) throws Exception{
+ RmiResponseVo resVo ;
+ if(obj == null){
+ resVo = new RmiResponseVo() ;
+ resVo.success = false ;
+ resVo.errorInfo = "鏀跺埌鐨勬暟鎹负null" ;
+ }else if(!(obj instanceof String)){
+ resVo = new RmiResponseVo() ;
+ resVo.success = false ;
+ resVo.errorInfo = "鏀跺埌鐨勬暟鎹笉鏄瓧绗︿覆绫诲瀷" ;
+ }else{
+ RmiRequestVo rqVo = RmiRequestVo.jsonToObject((String)obj) ;
+ resVo = doDeal(rqVo) ;
+ }
+ return resVo.toJson() ;
+ }
+
+ private static RmiResponseVo doDeal(RmiRequestVo rqVo){
+ RmiResponseVo resVo = new RmiResponseVo() ;
+ resVo.code = rqVo.code ;
+ if(rqVo.code.equals(Code.cd1)){
+ if(rqVo.id == null || rqVo.id.trim().equals("")){
+ resVo.success = false ;
+ resVo.errorInfo = "娉ㄥ唽澶辫触锛屽繀椤绘彁渚涘鎴风ID " ;
+ }else{
+ ResRegisterVo vo = doDealRegister(rqVo) ;
+ if(vo != null){
+ resVo.obj = vo ;
+ }else{
+ resVo.success = false ;
+ resVo.errorInfo = "rtuAddr宸茬粡鍒嗛厤瀹屾垚锛屾敞鍐屽け璐�" ;
+ }
+ }
+ }else if(rqVo.code.equals(Code.cd2)){
+ resVo.obj = doDealGetConfig(rqVo) ;
+ }else if(rqVo.code.equals(Code.cd3)){
+ resVo.obj = doDealGetStart(rqVo) ;
+ }else if(rqVo.code.equals(Code.cd4)){
+ doDealReportCount(rqVo) ;
+ }else if(rqVo.code.equals(Code.cd5)){
+ doDealReportOver(rqVo) ;
+ }
+ return resVo ;
+ }
+
+ private static ResRegisterVo doDealRegister(RmiRequestVo rqVo){
+ ResRegisterVo resVo = null ;
+ String token = id2TokenMap.get(rqVo.id) ;
+ if(token == null){
+ if(clientId <= rtuAddrList.size()){
+ resVo = new ResRegisterVo() ;
+ resVo.token = "" + clientId ;
+ id2TokenMap.put(rqVo.id, resVo.token) ;
+ clientId++ ;
+ }
+ }else{
+ resVo = new ResRegisterVo() ;
+ resVo.token = token ;
+ }
+ return resVo ;
+ }
+
+ private static MwConfigVo doDealGetConfig(RmiRequestVo rqVo){
+ MwConfigVo conVo ;
+ int token = Integer.parseInt(rqVo.token) ;
+ MwTestClientStatus sta = token2ClientMap.get("" + token);
+ if(sta == null){
+ Object[] rtuAddrs = rtuAddrList.get(token-1) ;
+ conVo = new MwConfigVo() ;
+ conVo.rtuAddrStart = (Long)rtuAddrs[0] ;
+ conVo.rtuAddrEnd = (Long)rtuAddrs[1] ;
+ conVo.tcpServerIp = ServerProperties.tcpServerIp ;
+ conVo.tcpServerPort = ServerProperties.tcpServerPort ;
+ conVo.sendTimes = ServerProperties.sendTimes ;
+ sta = new MwTestClientStatus() ;
+ sta.confVo = conVo ;
+ token2ClientMap.put("" + token, sta);
+ }else{
+ conVo = sta.confVo;
+ }
+ return conVo ;
+ }
+ private static ResStartVo doDealGetStart(RmiRequestVo rqVo){
+ ResStartVo rvo = new ResStartVo() ;
+ rvo.start = enablemwTestStart ;
+ int token = Integer.parseInt(rqVo.token) ;
+ MwTestClientStatus sta = token2ClientMap.get("" + token);
+ if(sta == null){
+ sta = new MwTestClientStatus() ;
+ sta.startVo = rvo ;
+ token2ClientMap.put("" + token, sta);
+ }else{
+ sta.startVo = rvo ;
+ }
+ return rvo ;
+ }
+
+
+ private static void doDealReportCount(RmiRequestVo rqVo){
+ int token = Integer.parseInt(rqVo.token) ;
+ MwTestClientStatus sta = token2ClientMap.get("" + token);
+ if(sta == null){
+ sta = new MwTestClientStatus() ;
+ sta.count = rqVo.count ;
+ token2ClientMap.put("" + token, sta);
+ }else{
+ sta.count = rqVo.count ;
+ }
+ }
+
+
+ private static void doDealReportOver(RmiRequestVo rqVo){
+ int token = Integer.parseInt(rqVo.token) ;
+ MwTestClientStatus sta = token2ClientMap.get("" + token);
+ if(sta == null){
+ sta = new MwTestClientStatus() ;
+ if(rqVo.over != null && rqVo.over){
+ sta.over = true ;
+ sta.seconds = rqVo.seconds ;
+ }
+ token2ClientMap.put("" + token, sta);
+ }else{
+ if(rqVo.over != null && rqVo.over){
+ sta.over = true ;
+ sta.seconds = rqVo.seconds ;
+ }
+ }
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/MwConfigVo.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/MwConfigVo.java
new file mode 100644
index 0000000..d5de351
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/MwConfigVo.java
@@ -0,0 +1,84 @@
+package com.dy.testServer.forRmi;
+
+import com.alibaba.fastjson2.JSON;
+
+public class MwConfigVo {
+ //妯℃嫙瀹㈡埛鐨凴tuAddr璧峰鍙�
+ public Long rtuAddrStart = 0L ;
+ //妯℃嫙瀹㈡埛鐨凴tuAddr鎴鍙�
+ public Long rtuAddrEnd = 0L ;
+ //閫氫俊涓棿浠禝P
+ public String tcpServerIp = "" ;
+ //閫氫俊涓棿浠剁鍙�
+ public Integer tcpServerPort = 0 ;
+ //鍙戦�佹暟鎹鏁�
+ public Integer sendTimes = 0 ;
+
+ /**
+ * 瀵硅薄杞垚json
+ * @return 杩斿洖 json
+ * @throws Exception 寮傚父
+ */
+ public String toJson()throws Exception{
+ try{
+ return JSON.toJSONString(this) ;
+ //return new JSONSerializer().exclude(new String[]{"class", "*.class"}).deepSerialize(this);
+ }catch(Exception e){
+ throw new Exception(e.getMessage() , e ) ;
+ }
+ }
+ /**
+ * json杞垚瀵硅薄
+ * @param json 鍙傛暟
+ * @return 杩斿洖瀵硅薄
+ * @throws Exception 寮傚父
+ */
+ public static MwConfigVo jsonToObject(String json)throws Exception{
+ try{
+ return JSON.parseObject(json, MwConfigVo.class) ;
+ //return new JSONDeserializer<ResConfigVo>().deserialize(json, ResConfigVo.class) ;
+ }catch(Exception e){
+ throw new Exception(e.getMessage() , e ) ;
+ }
+ }
+
+ public Long getRtuAddrStart() {
+ return rtuAddrStart;
+ }
+
+ public void setRtuAddrStart(Long rtuAddrStart) {
+ this.rtuAddrStart = rtuAddrStart;
+ }
+
+ public Long getRtuAddrEnd() {
+ return rtuAddrEnd;
+ }
+
+ public void setRtuAddrEnd(Long rtuAddrEnd) {
+ this.rtuAddrEnd = rtuAddrEnd;
+ }
+
+ public String getTcpServerIp() {
+ return tcpServerIp;
+ }
+
+ public void setTcpServerIp(String tcpServerIp) {
+ this.tcpServerIp = tcpServerIp;
+ }
+
+ public Integer getTcpServerPort() {
+ return tcpServerPort;
+ }
+
+ public void setTcpServerPort(Integer tcpServerPort) {
+ this.tcpServerPort = tcpServerPort;
+ }
+
+ public Integer getSendTimes() {
+ return sendTimes;
+ }
+
+ public void setSendTimes(Integer sendTimes) {
+ this.sendTimes = sendTimes;
+ }
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/MwTestClientStatus.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/MwTestClientStatus.java
new file mode 100644
index 0000000..3dc24c6
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/MwTestClientStatus.java
@@ -0,0 +1,56 @@
+package com.dy.testServer.forRmi;
+
+public class MwTestClientStatus {
+
+ public MwConfigVo confVo ;
+
+ public ResStartVo startVo ;
+
+ public Integer count ;//mwTest涓婃姤鏁版嵁鏁伴噺
+
+ public Boolean over ;//mwTest涓婃姤鏁版嵁缁撴潫
+
+ public Long seconds ;//mwTest涓婃姤鏁版嵁鐢ㄦ椂(绉�)
+
+ public MwConfigVo getConfVo() {
+ return confVo;
+ }
+
+ public void setConfVo(MwConfigVo confVo) {
+ this.confVo = confVo;
+ }
+
+ public ResStartVo getStartVo() {
+ return startVo;
+ }
+
+ public void setStartVo(ResStartVo startVo) {
+ this.startVo = startVo;
+ }
+
+ public Integer getCount() {
+ return count;
+ }
+
+ public void setCount(Integer count) {
+ this.count = count;
+ }
+
+ public Boolean getOver() {
+ return over;
+ }
+
+ public void setOver(Boolean over) {
+ this.over = over;
+ }
+
+ public Long getSeconds() {
+ return seconds;
+ }
+
+ public void setSeconds(Long seconds) {
+ this.seconds = seconds;
+ }
+
+
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/ResRegisterVo.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/ResRegisterVo.java
new file mode 100644
index 0000000..7a71d33
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/ResRegisterVo.java
@@ -0,0 +1,46 @@
+package com.dy.testServer.forRmi;
+
+
+import com.alibaba.fastjson2.JSON;
+
+public class ResRegisterVo {
+
+ public String token ;
+
+ /**
+ * 瀵硅薄杞垚json
+ * @return json
+ * @throws Exception 寮傚父
+ */
+ public String toJson()throws Exception{
+ try{
+ return JSON.toJSONString(this) ;
+ //return new JSONSerializer().exclude(new String[]{"class", "*.class"}).deepSerialize(this);
+ }catch(Exception e){
+ throw new Exception(e.getMessage() , e ) ;
+ }
+ }
+ /**
+ * json杞垚瀵硅薄
+ * @param json 鍙傛暟
+ * @return 瀵硅薄
+ * @throws Exception 寮傚父
+ */
+ public static ResRegisterVo jsonToObject(String json)throws Exception{
+ try{
+ return JSON.parseObject(json, ResRegisterVo.class) ;
+ //return new JSONDeserializer<ResRegisterVo>().deserialize(json, ResRegisterVo.class) ;
+ }catch(Exception e){
+ throw new Exception(e.getMessage() , e ) ;
+ }
+ }
+
+ public String getToken() {
+ return token;
+ }
+
+ public void setToken(String id) {
+ this.token = id;
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/ResStartVo.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/ResStartVo.java
new file mode 100644
index 0000000..ce87eb6
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/ResStartVo.java
@@ -0,0 +1,63 @@
+package com.dy.testServer.forRmi;
+
+
+import com.alibaba.fastjson2.JSON;
+
+public class ResStartVo {
+
+ public boolean success = true ;
+
+ public String errorInfo ;
+
+ public boolean start ;
+
+
+ /**
+ * 瀵硅薄杞垚json
+ * @return json
+ * @throws Exception 寮傚父
+ */
+ public String toJson()throws Exception{
+ try{
+ return JSON.toJSONString(this) ;
+ //return new JSONSerializer().exclude(new String[]{"class", "*.class"}).deepSerialize(this);
+ }catch(Exception e){
+ throw new Exception(e.getMessage() , e ) ;
+ }
+ }
+ /**
+ * json杞垚瀵硅薄
+ * @param json 鍙傛暟
+ * @return 瀵硅薄
+ * @throws Exception 寮傚父
+ */
+ public static ResStartVo jsonToObject(String json)throws Exception{
+ try{
+ return JSON.parseObject(json, ResStartVo.class) ;
+ //return new JSONDeserializer<ResStartVo>().deserialize(json, ResStartVo.class) ;
+ }catch(Exception e){
+ throw new Exception(e.getMessage() , e ) ;
+ }
+ }
+
+ public boolean isSuccess() {
+ return success;
+ }
+ public void setSuccess(boolean success) {
+ this.success = success;
+ }
+ public String getErrorInfo() {
+ return errorInfo;
+ }
+ public void setErrorInfo(String errorInfo) {
+ this.errorInfo = errorInfo;
+ }
+ public boolean isStart() {
+ return start;
+ }
+
+ public void setStart(boolean start) {
+ this.start = start;
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/RmiRequestVo.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/RmiRequestVo.java
new file mode 100644
index 0000000..59e9e6c
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/RmiRequestVo.java
@@ -0,0 +1,87 @@
+package com.dy.testServer.forRmi;
+
+import com.alibaba.fastjson2.JSON;
+
+public class RmiRequestVo {
+
+ public String id ;//瀹㈡埛绔疘D
+
+ public String token ;//鏈嶅姟绔垎閰嶇殑token
+
+ public String code ;
+
+ public Integer count;//mwTest涓婃姤鏁版嵁鏁伴噺
+
+ public Boolean over ;//mwTest涓婃姤鏁版嵁缁撴潫
+
+ public Long seconds ;//mwTest涓婃姤鏁版嵁鐢ㄦ椂(绉�)
+
+ /**
+ * 瀵硅薄杞垚json
+ * @return json
+ * @throws Exception 寮傚父
+ */
+ public String toJson()throws Exception{
+ try{
+ return JSON.toJSONString(this) ;
+ //return new JSONSerializer().exclude(new String[]{"class", "*.class"}).deepSerialize(this);
+ }catch(Exception e){
+ throw new Exception(e.getMessage() , e ) ;
+ }
+ }
+ /**
+ * json杞垚瀵硅薄
+ * @param json 鍙傛暟
+ * @return 瀵硅薄
+ * @throws Exception 寮傚父
+ */
+ public static RmiRequestVo jsonToObject(String json)throws Exception{
+ try{
+ return JSON.parseObject(json, RmiRequestVo.class) ;
+ //JSONDeserializer<RmiRequestVo> jsonD = new JSONDeserializer<>() ;
+ //RmiRequestVo rqVo = jsonD.deserialize(json, RmiRequestVo.class) ;
+ //return rqVo ;
+ }catch(Exception e){
+ throw new Exception(e.getMessage() , e ) ;
+ }
+ }
+
+ public String getId() {
+ return id;
+ }
+ public void setId(String id) {
+ this.id = id;
+ }
+ public String getToken() {
+ return token;
+ }
+ public void setToken(String id) {
+ this.token = id;
+ }
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+ public Integer getCount() {
+ return count;
+ }
+ public void setCount(Integer count) {
+ this.count = count;
+ }
+ public Boolean getOver() {
+ return over;
+ }
+ public void setOver(Boolean over) {
+ this.over = over;
+ }
+ public Long getSeconds() {
+ return seconds;
+ }
+ public void setSeconds(Long seconds) {
+ this.seconds = seconds;
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/RmiRequestedCallback.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/RmiRequestedCallback.java
new file mode 100644
index 0000000..da9d2b2
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/RmiRequestedCallback.java
@@ -0,0 +1,36 @@
+package com.dy.testServer.forRmi;
+
+import java.rmi.RemoteException;
+
+import com.dy.common.mw.channel.rmi.RmiRequestCallback;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class RmiRequestedCallback implements RmiRequestCallback {
+
+ @SuppressWarnings("unused")
+ private static Logger log = LogManager.getLogger(RmiRequestedCallback.class.getName()) ;
+
+ @Override
+ public Object syncRequest(Object obj) throws RemoteException {
+ String json ;
+ try {
+ json = Manager.dealRequest(obj);
+ } catch (Exception e) {
+ throw new RemoteException("鏈嶅姟绔紓甯�" , e) ;
+ }
+ return json ;
+ }
+
+ @Override
+ public String asyncRequest(Object obj) throws RemoteException {
+ String json ;
+ try {
+ json = Manager.dealRequest(obj);
+ } catch (Exception e) {
+ throw new RemoteException("鏈嶅姟绔紓甯�" , e) ;
+ }
+ return json ;
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/RmiResponseVo.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/RmiResponseVo.java
new file mode 100644
index 0000000..c076cea
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/RmiResponseVo.java
@@ -0,0 +1,75 @@
+package com.dy.testServer.forRmi;
+
+import com.alibaba.fastjson2.JSON;
+
+public class RmiResponseVo {
+
+ public boolean success = true ;
+
+ public String errorInfo ;
+
+ public String code ;
+
+ public Object obj ;
+
+ /**
+ * 瀵硅薄杞垚json
+ * @return
+ * @throws Exception
+ */
+ public String toJson()throws Exception{
+ try{
+ return JSON.toJSONString(this) ;
+ //return new JSONSerializer().exclude(new String[]{"class", "*.class"}).deepSerialize(this);
+ }catch(Exception e){
+ throw new Exception(e.getMessage() , e ) ;
+ }
+ }
+ /**
+ * json杞垚瀵硅薄
+ * @param json
+ * @param clazz
+ * @return
+ * @throws Exception
+ */
+ public static RmiResponseVo jsonToObject(String json, Class<?> clazz)throws Exception{
+ try{
+ return JSON.parseObject(json, RmiResponseVo.class) ;
+ //JSONDeserializer<RmiResponseVo> jsonD = new JSONDeserializer<>() ;
+ //jsonD.use("obj", clazz) ;
+ //RmiResponseVo resp = jsonD.deserialize(json, RmiResponseVo.class) ;
+ //return resp ;
+ }catch(Exception e){
+ throw new Exception(e.getMessage() , e ) ;
+ }
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public boolean isSuccess() {
+ return success;
+ }
+ public void setSuccess(boolean success) {
+ this.success = success;
+ }
+ public String getErrorInfo() {
+ return errorInfo;
+ }
+ public void setErrorInfo(String errorInfo) {
+ this.errorInfo = errorInfo;
+ }
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public Object getObj() {
+ return obj;
+ }
+
+ public void setObj(Object obj) {
+ this.obj = obj;
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/resources/Config.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/resources/Config.xml
new file mode 100644
index 0000000..e0a7651
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/resources/Config.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config>
+ <server name="mwTest娴嬭瘯鎺у埗绔�" showStartInfo="true" company="http://www.dyjs.com"/>
+ <!--
+ 鍩烘湰閰嶇疆
+ rtuAddrStart: 妯℃嫙瀹㈡埛鐨凴tuAddr璧峰鍙�
+ rtuAddrEnd: 妯℃嫙瀹㈡埛鐨凴tuAddr鎴鍙�
+ rtuAddrsPerMwTest: 姣忎釜mwTest鍒嗛厤鐨凴tuAddr鏁�
+ tcpServerIp: 閫氫俊涓棿浠禝P
+ tcpServerPort: 閫氫俊涓棿浠剁鍙�
+ sendTimes锛氬彂閫佹暟鎹鏁�
+ -->
+ <base
+ rtuAddrStart="5323280000"
+ rtuAddrEnd="5323289999"
+ rtuAddrPerMwTest="1"
+ tcpServerIp="127.0.0.1"
+ tcpServerPort="60000"
+ sendTimes="1"
+ />
+
+ <!--
+ port锛歳mi鏈嶅姟绔彛鍙�
+ context锛歳mi鏈嶅姟涓婁笅鏂�
+ -->
+ <rmi enable="true"
+ port="12345"
+ context="mwTestSv"
+ />
+
+</config>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/resources/log4j2.yml b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/resources/log4j2.yml
new file mode 100644
index 0000000..5aba47b
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/resources/log4j2.yml
@@ -0,0 +1,64 @@
+Configuration:
+ #status锛岃繖涓敤浜庤缃甽og4j2鑷韩鍐呴儴鐨勪俊鎭緭鍑猴紝鍙互涓嶈缃紝褰撹缃垚trace鏃讹紝浣犱細鐪嬪埌log4j2鍐呴儴鍚勭璇︾粏杈撳嚭锛涘彲浠ヨ缃垚Off(鍏抽棴)鎴朎rror(鍙緭鍑洪敊璇俊鎭�)
+ status: Error
+
+ Properties: # 瀹氫箟鍏ㄥ眬鍙橀噺
+ Property:
+ #鏃ュ織鏂囦欢瀛樺偍鐨勭洰褰�
+ - name: log.path
+ value: ./logs
+ #鏃ュ織鏂囦欢瀛樺偍鍚嶇О
+ - name: project.name
+ value: mwTestSever
+
+ #瀹氫箟杈撳嚭鍣紝鍙互杈撳嚭鍒版帶鍒跺彴鍜屾枃浠�.
+ Appenders:
+ #杈撳嚭鍒版帶鍒跺彴
+ Console:
+ #Appender鍛藉悕
+ name: CONSOLE
+ target: SYSTEM_OUT
+ ThresholdFilter:
+ level: debug #杈撳嚭鏃ュ織绾у埆锛岃緭鍑烘棩蹇楁椂锛岄鍏堢敱Loggers.Root.level鎴朙oggers.Logger.level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢辨湰level鍒ゆ柇鏄惁杈撳嚭
+ onMatch: ACCEPT #onMatch=ACCEPT 澶т簬绛変簬 "level" 閰嶇疆鐨勭瓑绾у湴鏃ュ織杈撳嚭
+ onMismatch: DENY #onMismatch=DENY 灏忎簬 "level" 閰嶇疆鐨勭瓑绾у湴鏃ュ織涓嶈緭鍑�
+ #鏃ュ織鍐呭鏍峰紡
+ PatternLayout:
+ #%n-鎹㈣
+ #%m-鏃ュ織鍐呭锛岃緭鍑轰唬鐮佷腑鎸囧畾鐨勬棩蹇椾俊鎭�
+ #%p-杈撳嚭浼樺厛绾э紝鍗矰EBUG,INFO,WARN,ERROR,FATAL
+ #%r-绋嬪簭鍚姩鍒扮幇鍦ㄧ殑姣鏁�
+ #%%- 杈撳嚭涓�涓�"%" 瀛楃
+ #%t-褰撳墠绾跨▼鍚�
+ #%d-鏃ユ湡鍜屾椂闂�, 甯哥敤鐨勬牸寮忔湁%d{DATE},%d{ABSOLUTE},%d{HH:mm:ss,SSS},%d{ddMMyyyyHH:mm:ss,SSS}
+ #%l-鍚�%F%L%C%M
+ #%F-java婧愭枃浠跺悕
+ #%L-java婧愮爜琛屾暟
+ #%C-java绫诲悕,%C{1}杈撳嚭鏈�鍚庝竴涓厓绱�
+ #%M-java鏂规硶鍚�
+ pattern: "%d{yyyy-MM-dd HH:mm:ss,SSS}:%4p %t (%C.%M:%L) - %m%n"
+ # 杈撳嚭鍒版枃浠讹紝瓒呰繃10MB褰掓。
+ RollingFile:
+ - name: ROLLING_FILE
+ ignoreExceptions: false
+ fileName: ${log.path}/${project.name}.log
+ filePattern: "${log.path}/$${date:yyyy-MM}/${project.name}-%d{yyyy-MM-dd}-%i.log.gz"
+ ThresholdFilter:
+ level: error #杈撳嚭鏃ュ織绾у埆锛岃緭鍑烘棩蹇楁椂锛岄鍏堢敱Loggers.Root.level鎴朙oggers.Logger.level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢辨湰level鍒ゆ柇鏄惁杈撳嚭
+ onMatch: ACCEPT #onMatch=ACCEPT 澶т簬绛変簬 "level" 閰嶇疆鐨勭瓑绾у湴鏃ュ織杈撳嚭
+ onMismatch: DENY #onMismatch=DENY 灏忎簬 "level" 閰嶇疆鐨勭瓑绾у湴鏃ュ織涓嶈緭鍑�
+ #鏃ュ織鍐呭鏍峰紡
+ PatternLayout:
+ pattern: "%d{yyyy-MM-dd HH:mm:ss,SSS}:%4p %t (%C.%M:%L) - %m%n"
+ Policies:
+ SizeBasedTriggeringPolicy:
+ size: "10 MB"
+ DefaultRolloverStrategy:
+ max: 1000
+
+ Loggers:
+ Root:
+ level: info #鏃ュ織杈撳嚭绾у埆锛屽叡鏈�8涓骇鍒紝鎸夌収浠庝綆鍒伴珮涓猴細all < trace < debug < info < warn < error < fatal < off
+ AppenderRef: #Root鐨勫瓙鑺傜偣锛岀敤鏉ユ寚瀹氳鏃ュ織杈撳嚭鍒板摢涓狝ppender.
+ - ref: CONSOLE #杈撳嚭鏃ュ織鏃讹紝棣栧厛鐢辨湰level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢变笂闈㈢殑Appenders.Console.ThresholdFilter.level鍒ゆ柇鏄惁杈撳嚭
+ - ref: ROLLING_FILE #杈撳嚭鏃ュ織鏃讹紝棣栧厛鐢辨湰level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢变笂闈㈢殑Appenders.RollingFile.ThresholdFilter.level鍒ゆ柇鏄惁杈撳嚭
diff --git a/pipIrr-platform/pipIrr-mw/pom.xml b/pipIrr-platform/pipIrr-mw/pom.xml
index 780ceef..57010d3 100644
--- a/pipIrr-platform/pipIrr-mw/pom.xml
+++ b/pipIrr-platform/pipIrr-mw/pom.xml
@@ -16,6 +16,7 @@
<modules>
<module>pipIrr-mw-accept</module>
+ <module>pipIrr-mwTest-server</module>
</modules>
<dependencies>
@@ -23,41 +24,47 @@
<groupId>com.dy</groupId>
<artifactId>pipIrr-common</artifactId>
<version>1.0.0</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <!-- 鎺掗櫎鎺塸ipIrr-common鐨勬墍鏈変緷璧栵紝鏈ā鍧楄嚜宸卞畾涔変緷璧� -->
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.dy</groupId>
<artifactId>pipIrr-global</artifactId>
<version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
<exclusions>
<exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-json</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
+ <!-- 鎺掗櫎鎺塸ipIrr-common鐨勬墍鏈変緷璧栵紝鏈ā鍧楄嚜宸卞畾涔変緷璧� -->
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-devtools</artifactId>
- <scope>runtime</scope>
- </dependency>
+
<!-- lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
+ <!-- @Aspect @Pointcut @Around绛夊簲鐢� -->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
</dependency>
<!--log4j2鏃ュ織-->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>2.0.7</version>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
@@ -66,53 +73,16 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
- </dependency>
-
- <!-- 绯荤粺鐩戠 -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
-
- <!-- api鍦ㄧ嚎鏂囨。 https://springdoc.org/#modules-->
- <dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-security</artifactId>
- </dependency>
-
-
- <!--mysql椹卞姩-->
- <dependency>
- <groupId>com.mysql</groupId>
- <artifactId>mysql-connector-j</artifactId>
- <version>8.0.33</version>
- </dependency>
- <!--druid-spring-boot杩炴帴姹�-->
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>druid-spring-boot-starter</artifactId>
- <version>1.2.20</version>
- </dependency>
- <!--mybatis-plus-spring-boot-->
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
- <version>3.5.3.2</version>
+ <exclusions>
+ <exclusion>
+ <!-- 鎺掗櫎鎺変緷璧� -->
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- 闃块噷fastjson -->
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </dependency>
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
@@ -148,49 +118,8 @@
<artifactId>jdom2</artifactId>
</dependency>
- <!-- bean鍜宮ap浜掕浆鎹� -->
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo</artifactId>
- <version>3.2.7</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.alibaba.spring</groupId>
- <artifactId>spring-context-support</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.alibaba.fastjson2</groupId>
- <artifactId>fastjson2</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.alibaba</groupId>
- <artifactId>hessian-lite</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<!-- 娴嬭瘯 -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/pom.xml b/pipIrr-platform/pipIrr-web/pipIrr-web-base/pom.xml
index 02bf348..77f0653 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/pom.xml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/pom.xml
@@ -15,4 +15,124 @@
<name>pipIrr-web-base</name>
<description>web鍩虹淇℃伅绯荤粺</description>
+
+ <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.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>
+
+ <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-web/pipIrr-web-demo/pom.xml b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/pom.xml
index ae0ed8e..84d7f0d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/pom.xml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/pom.xml
@@ -15,5 +15,123 @@
<name>pipIrr-web-demo</name>
<description>web寮�鍙戞紨绀虹郴缁燂紝婕旂ず绀轰緥</description>
+ <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.pipIrrDemo.PipIrrDemoApplication</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-web/pipIrr-web-gis/pom.xml b/pipIrr-platform/pipIrr-web/pipIrr-web-gis/pom.xml
index 10d9c51..2abaa94 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-gis/pom.xml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-gis/pom.xml
@@ -15,5 +15,123 @@
<name>pipIrr-web-gis</name>
<description>web鐢靛瓙鍦板浘绯荤粺</description>
+ <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.pipIrrGis.PipIrrGisApplication</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-web/pipIrr-web-remote/pom.xml b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/pom.xml
index d98b6bf..1363c26 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/pom.xml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/pom.xml
@@ -15,4 +15,123 @@
<name>pipIrr-web-remote</name>
<description>web杩滅▼鎿嶄綔淇℃伅绯荤粺</description>
+ <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.pipIrrRemote.PipIrrRemoteApplication</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-web/pipIrr-web-sso/pom.xml b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/pom.xml
index a9e19dc..50c030a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/pom.xml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/pom.xml
@@ -36,4 +36,124 @@
<!-- 鑷姩鍒ゆ柇浣跨敤涓巗pring boot鍏煎鐨勭増鏈� -->
</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.sso.PipIrrSsoApplication</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-web/pipIrr-web-statistics/pom.xml b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/pom.xml
index 8cda3d4..b7dd239 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/pom.xml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/pom.xml
@@ -15,4 +15,123 @@
<name>pipIrr-web-statistics</name>
<description>web缁熻鍒嗘瀽绯荤粺</description>
+ <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.pipIrrStatistics.PipIrrStatisticsApplication</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>
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web.iml b/pipIrr-platform/pipIrr-web/pipIrr-web.iml
index b162fa6..c70d370 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web.iml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web.iml
@@ -23,6 +23,9 @@
<orderEntry type="jdk" jdkName="20" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="pipIrr-common" />
+ <orderEntry type="library" name="Maven: org.apache.mina:mina-core:2.2.2" level="project" />
+ <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" />
+ <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.15" level="project" />
<orderEntry type="module" module-name="pipIrr-global" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:3.1.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:3.1.3" level="project" />
diff --git a/pipIrr-platform/pipIrr-web/pom.xml b/pipIrr-platform/pipIrr-web/pom.xml
index 568c48c..abbd0c9 100644
--- a/pipIrr-platform/pipIrr-web/pom.xml
+++ b/pipIrr-platform/pipIrr-web/pom.xml
@@ -210,58 +210,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
- <!-- <!– 鍏ㄥ眬鎺掗櫎–>-->
- <!-- <dependency>-->
- <!-- <groupId>org.springframework.boot</groupId>-->
- <!-- <artifactId>spring-boot-starter-json</artifactId>-->
- <!-- <exclusions>-->
- <!-- <exclusion>-->
- <!-- <groupId>*</groupId>-->
- <!-- <artifactId>*</artifactId>-->
- <!-- </exclusion>-->
- <!-- </exclusions>-->
- <!-- </dependency>-->
- <!-- <dependency>-->
- <!-- <groupId>org.springframework.boot</groupId>-->
- <!-- <artifactId>spring-boot-starter-logging</artifactId>-->
- <!-- <exclusions>-->
- <!-- <exclusion>-->
- <!-- <groupId>*</groupId>-->
- <!-- <artifactId>*</artifactId>-->
- <!-- </exclusion>-->
- <!-- </exclusions>-->
- <!-- </dependency>-->
</dependencies>
- <build>
- <plugins>
- <plugin>
- <!-- spring boot鎻愪緵鐨刴aven鎵撳寘鎻掍欢 -->
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <!-- maven閲屾墽琛屾祴璇曠敤渚嬬殑鎻掍欢 -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- <plugin>
- <!-- 寮哄埗璁惧畾 java缂栬瘧鐗堟湰锛岃繍琛岀幆澧冪増鏈� -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
\ No newline at end of file
diff --git a/pipIrr-platform/pom.xml b/pipIrr-platform/pom.xml
index 9479a41..1732cbc 100644
--- a/pipIrr-platform/pom.xml
+++ b/pipIrr-platform/pom.xml
@@ -44,8 +44,15 @@
<mapstruct.version>1.5.5.Final</mapstruct.version>
<hutool-all.version>5.8.22</hutool-all.version>
<org-jdom2.version>2.0.6.1</org-jdom2.version>
- <compiler-plugin.version>3.11.0</compiler-plugin.version>
- <surefire-plugin.version>3.0.0</surefire-plugin.version>
+
+ <spring-boot-maven-plugin.version>3.2.0</spring-boot-maven-plugin.version>
+ <maven-jar-plugin-plugin.version>3.3.0</maven-jar-plugin-plugin.version>
+ <maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
+ <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+ <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
+ <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
+ <maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
+ <encoding>UTF-8</encoding>
</properties>
@@ -243,14 +250,7 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>2.2.1</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-filter-compression</artifactId>
- <version>2.2.1</version>
+ <version>2.2.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -297,34 +297,66 @@
<!-- spring boot鎻愪緵鐨刴aven鎵撳寘鎻掍欢 -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>3.1.3</version>
+ <version>${spring-boot-maven-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <!-- 璇ユ彃浠朵笉浼氬皢椤圭洰涓紩鍏ョ殑渚濊禆鎵撹繘鏈�缁堢殑 Jar 鏂囦欢 -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${maven-jar-plugin-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <!-- 褰撻」鐩腑渚濊禆姣旇緝澶氭椂锛屾垜浠彲浠ュ�熷姪 maven-dependency-plugin 鎻掍欢鑷姩甯垜浠笅杞戒緷璧栫殑 Jar 鏂囦欢锛屾帹鑽愬皢璇ユ彃浠剁粦瀹氬埌package鐢熷懡鍛ㄦ湡涓� -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${maven-dependency-plugin.version}</version>
+ <executions>
+ <execution>
+ <!-- 缁戝畾鐢熷懡鍛ㄦ湡 -->
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <!-- 璁剧疆渚濊禆鐨勫瓨鏀捐矾寰� -->
+ <configuration>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <!-- 璁剧疆java缂栬瘧鐗堟湰锛岃繍琛岀幆澧冪増鏈� -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin.version}</version>
+ <!-- source锛� 婧愪唬鐮佺紪璇戠増鏈紱target锛� 鐩爣骞冲彴缂栬瘧鐗堟湰锛沞ncoding锛� 瀛楃闆嗙紪鐮併�� -->
<configuration>
- <excludes>
- <exclude>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </exclude>
- </excludes>
+ <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>
+ <version>${maven-resources-plugin.version}</version>
+ <configuration>
+ <encoding>${encoding}</encoding>
</configuration>
</plugin>
<plugin>
<!-- maven閲屾墽琛屾祴璇曠敤渚嬬殑鎻掍欢 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0</version>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
+ <version>${maven-surefire-plugin.version}</version>
</plugin>
<plugin>
- <!-- 寮哄埗璁惧畾 java缂栬瘧鐗堟湰锛岃繍琛岀幆澧冪増鏈� -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${compiler-plugin.version}</version>
- <configuration>
- <source>20</source>
- <target>20</target>
- </configuration>
+ <!-- 涓嬮潰瑙ｅ喅锛氬綋杩涜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>
+ <version>${maven-bundle-plugin.version}</version>
+ <extensions>true</extensions>
</plugin>
</plugins>
</pluginManagement>
--
Gitblit v1.8.0