From c42614978ff12013a1eabebd0289b27169a5784f Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 06 五月 2025 17:25:56 +0800 Subject: [PATCH] 1、实现万功能token(0000-0000-1234-9876-5); 2、web端单独实现命令结果等待器,并相应修改相关部分; 3、web端实现透传命令; 4、修改一些不当注释; 5、优化一些代码。 --- pipIrr-platform/pipIrr-mw/pom.xml | 35 +++++++++++++++++++++++++++++------ 1 files changed, 29 insertions(+), 6 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pom.xml b/pipIrr-platform/pipIrr-mw/pom.xml index 57010d3..69e82be 100644 --- a/pipIrr-platform/pipIrr-mw/pom.xml +++ b/pipIrr-platform/pipIrr-mw/pom.xml @@ -15,8 +15,12 @@ <description>姝ゆā鍧椾负鍏朵粬涓棿浠舵ā鍧楃殑鐖剁骇妯″潡锛屽彧瀹氫箟渚濊禆</description> <modules> - <module>pipIrr-mw-accept</module> + <module>pipIrr-mw-rtu</module> + <module>pipIrr-mw-rtu3rd</module> + <module>pipIrr-mw-simulate-rtu</module> + <module>pipIrr-mw-simulate-rtu202404</module> <module>pipIrr-mwTest-server</module> + <module>pipIrr-mwTest-client</module> </modules> <dependencies> @@ -24,7 +28,11 @@ <groupId>com.dy</groupId> <artifactId>pipIrr-common</artifactId> <version>1.0.0</version> - <scope>provided</scope> + <!-- + scope涓嶈兘鐢╬rovided锛屽惁鍒橲erver.java鐨勮繍琛屼笉璧锋潵 + scope涓嶈兘鐢╮untime锛屽惁鍒欎笉鑳界紪杈� + --> + <scope>compile</scope> <optional>true</optional> <exclusions> <exclusion> @@ -38,7 +46,7 @@ <groupId>com.dy</groupId> <artifactId>pipIrr-global</artifactId> <version>1.0.0</version> - <scope>provided</scope> + <scope>compile</scope> <optional>true</optional> <exclusions> <exclusion> @@ -75,9 +83,8 @@ <artifactId>jackson-dataformat-yaml</artifactId> <exclusions> <exclusion> - <!-- 鎺掗櫎鎺変緷璧� --> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> + <groupId>*</groupId> + <artifactId>*</artifactId> </exclusion> </exclusions> </dependency> @@ -118,6 +125,22 @@ <artifactId>jdom2</artifactId> </dependency> + <!-- 鑾峰緱绯荤粺淇℃伅 --> + <dependency> + <groupId>com.github.oshi</groupId> + <artifactId>oshi-core</artifactId> + <version>6.6.2</version> + </dependency> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + <version>5.12.1</version> + </dependency> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna-platform</artifactId> + <version>5.12.1</version> + </dependency> <!-- 娴嬭瘯 --> <dependency> -- Gitblit v1.8.0