From 803697bd4f3ac5262e0acd69d6d7cc519ec45b2a Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期一, 04 九月 2023 10:28:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/pom.xml | 66 +++++++++++++++++++-------------
1 files changed, 39 insertions(+), 27 deletions(-)
diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index 8190d3a..6515ad6 100644
--- a/igds-web/pom.xml
+++ b/igds-web/pom.xml
@@ -125,7 +125,7 @@
<artifactId>igds-api-phone</artifactId>
<version>${igds.version}</version>
</dependency>
-
+
<!-- 鍏朵粬閫氱敤鍝佺墝鍗忚 -->
<dependency>
<groupId>com.ld.igds</groupId>
@@ -168,26 +168,26 @@
</exclusion>
</exclusions>
</dependency>
-
+
<!-- MODBUS-TCP -->
- <dependency>
- <groupId>com.ld.igds</groupId>
- <artifactId>igds-protocol-modbus</artifactId>
- <version>${igds.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>com.ld.igds</groupId>-->
+<!-- <artifactId>igds-protocol-modbus</artifactId>-->
+<!-- <version>${igds.version}</version>-->
+<!-- <exclusions>-->
+<!-- <exclusion>-->
+<!-- <artifactId>slf4j-log4j12</artifactId>-->
+<!-- <groupId>org.slf4j</groupId>-->
+<!-- </exclusion>-->
+<!-- <exclusion>-->
+<!-- <artifactId>log4j</artifactId>-->
+<!-- <groupId>log4j</groupId>-->
+<!-- </exclusion>-->
+<!-- </exclusions>-->
+<!-- </dependency>-->
- <!-- 绉佹湁鍗忚-椋庢鑷磋繙IOT銆佸埗姘満-->
+ <!-- 绉佹湁鍗忚-椋庢鑷磋繙IOT銆佸埗姘満
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-iot</artifactId>
@@ -203,8 +203,9 @@
</exclusion>
</exclusions>
</dependency>
+ -->
- <!-- 绉佹湁鍗忚-璐濆崥绮儏
+ <!-- 绉佹湁鍗忚-璐濆崥绮儏-->
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-beibo</artifactId>
@@ -219,9 +220,9 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>-->
+ </dependency>
- <!-- 绉佹湁鍗忚-閭︽捣鏅鸿兘
+ <!-- 绉佹湁鍗忚-閭︽捣鏅鸿兘-->
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-bhzn</artifactId>
@@ -236,9 +237,23 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>-->
-
- <!-- 娴峰悍杞︾墝璇嗗埆-SDK
+ </dependency>
+ <dependency>
+ <groupId>com.ld.igds</groupId>
+ <artifactId>igds-protocol-zldz</artifactId>
+ <version>${igds.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- 娴峰悍杞︾墝璇嗗埆-SDK -->
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-sdk</artifactId>
@@ -254,10 +269,7 @@
</exclusion>
</exclusions>
</dependency>
- -->
-
</dependencies>
-
<dependencyManagement>
<dependencies>
--
Gitblit v1.9.3