From 7e92584190223b2967e6a5473d9c23e0e05b2437 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 19 八月 2024 21:00:59 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-mw/pom.xml | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pom.xml b/pipIrr-platform/pipIrr-mw/pom.xml index 379d653..95e7429 100644 --- a/pipIrr-platform/pipIrr-mw/pom.xml +++ b/pipIrr-platform/pipIrr-mw/pom.xml @@ -15,7 +15,7 @@ <description>姝ゆā鍧椾负鍏朵粬涓棿浠舵ā鍧楃殑鐖剁骇妯″潡锛屽彧瀹氫箟渚濊禆</description> <modules> - <module>pipIrr-mw-accept</module> + <module>pipIrr-mw-rtu</module> <module>pipIrr-mwTest-server</module> <module>pipIrr-mwTest-client</module> </modules> @@ -25,7 +25,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> @@ -39,7 +43,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> @@ -118,6 +122,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