From 7d885c1d4c86f40927af50e6e7bfa13aac0c2180 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 21 十二月 2023 21:47:15 +0800 Subject: [PATCH] 1、common模块优化代码,Command命令中增加RTU命令结果返回webRul; 2、通信中间件增加了接收http下发RTU命令和内部命令的Controler; 3、RTU模拟器和控制器增加了上报完数据是否关闭TCP连接的控制。 --- pipIrr-platform/pipIrr-web/pom.xml | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 50 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pom.xml b/pipIrr-platform/pipIrr-web/pom.xml index 10b9f31..06ace49 100644 --- a/pipIrr-platform/pipIrr-web/pom.xml +++ b/pipIrr-platform/pipIrr-web/pom.xml @@ -19,10 +19,13 @@ <modules> <module>pipIrr-web-demo</module> + <module>pipIrr-web-sso</module> <module>pipIrr-web-base</module> <module>pipIrr-web-remote</module> <module>pipIrr-web-statistics</module> <module>pipIrr-web-gis</module> + <module>pipIrr-web-sell</module> + <module>pipIrr-web-project</module> </modules> <dependencies> @@ -79,6 +82,12 @@ <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-yaml</artifactId> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> </dependency> <!-- 绯荤粺鐩戠 --> @@ -104,8 +113,9 @@ <!--mysql椹卞姩--> <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> + <groupId>com.mysql</groupId> + <artifactId>mysql-connector-j</artifactId> + <version>8.0.33</version> </dependency> <!--druid-spring-boot杩炴帴姹�--> <dependency> @@ -136,7 +146,7 @@ <version>2.0.40</version> </dependency> - <!-- vo po杞崲 --> + <!-- vo po杞崲 鍏ㄥ眬娌℃湁涓嬮潰渚濊禆锛屾墍浠ユ澶勫繀椤诲姞鐗堟湰鍙�--> <dependency> <groupId>org.mapstruct</groupId> <artifactId>mapstruct</artifactId> @@ -160,6 +170,43 @@ <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> -- Gitblit v1.8.0