From 43ce77a85d8297a53dc25430fff10ead57296167 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 04 十一月 2023 15:43:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/pom.xml | 64 ++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 23 deletions(-)
diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index ff463ac..7809de5 100644
--- a/igds-web/pom.xml
+++ b/igds-web/pom.xml
@@ -144,7 +144,7 @@
</dependency>
- <!-- 鎺ュ彛鍖咃紝鍖呮嫭涓婃捣鎺ュ彛鍜屾皵璞℃帴鍙�-->
+ <!-- 鎺ュ彛鍖咃紝鍖呮嫭涓婃捣鎺ュ彛鍜屻�佹皵璞℃帴鍙ｃ�佷笁缁存帴鍙�-->
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-api-inte</artifactId>
@@ -169,22 +169,22 @@
</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>-->
+ <!-- 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>-->
<!-- 绉佹湁鍗忚-椋庢鑷磋繙IOT銆佸埗姘満
@@ -204,7 +204,7 @@
</exclusions>
</dependency>-->
- <!-- 绉佹湁鍗忚-璐濆崥绮儏
+ <!-- 绉佹湁鍗忚-璐濆崥绮儏-->
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-beibo</artifactId>
@@ -219,7 +219,24 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>-->
+ </dependency>
+
+ <!-- 绉佹湁鍗忚-DLT645鐢佃〃鍗忚-->
+ <dependency>
+ <groupId>com.ld.igds</groupId>
+ <artifactId>igds-protocol-es</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>
@@ -238,7 +255,7 @@
</exclusions>
</dependency>-->
- <!-- 绉佹湁鍗忚-姝ｆ潵鐢靛瓙 -->
+ <!-- 绉佹湁鍗忚-姝ｆ潵鐢靛瓙
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-zldz</artifactId>
@@ -253,9 +270,9 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
- <!-- 娴峰悍杞︾墝璇嗗埆-SDK -->
+ <!-- 娴峰悍杞︾墝璇嗗埆-SDK
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-sdk</artifactId>
@@ -270,7 +287,7 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
</dependencies>
<dependencyManagement>
@@ -319,6 +336,7 @@
<configuration>
<fork>true</fork>
</configuration>
+
</plugin>
<!-- YUI Compressor Maven鍘嬬缉鎻掍欢 寮�鍙戝寘涓嶅疄鐢�-->
--
Gitblit v1.9.3