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 |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index 52d0223..7809de5 100644
--- a/igds-web/pom.xml
+++ b/igds-web/pom.xml
@@ -10,7 +10,6 @@
         <groupId>com.ld.igds</groupId>
         <artifactId>igds-parent-pom</artifactId>
         <version>4.0.0-RELEASE</version>
-        <relativePath>../igds-parent-pom/pom.xml</relativePath>
     </parent>
 
     <dependencies>
@@ -188,7 +187,7 @@
         </dependency>-->
 
 
-        <!-- 绉佹湁鍗忚-椋庢鑷磋繙IOT銆佸埗姘満-->
+        <!-- 绉佹湁鍗忚-椋庢鑷磋繙IOT銆佸埗姘満
         <dependency>
             <groupId>com.ld.igds</groupId>
             <artifactId>igds-protocol-iot</artifactId>
@@ -203,9 +202,9 @@
                     <groupId>log4j</groupId>
                 </exclusion>
             </exclusions>
-        </dependency>
+        </dependency>-->
 
-        <!--  绉佹湁鍗忚-璐濆崥绮儏
+        <!--  绉佹湁鍗忚-璐濆崥绮儏-->
         <dependency>
             <groupId>com.ld.igds</groupId>
             <artifactId>igds-protocol-beibo</artifactId>
@@ -220,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>
@@ -254,7 +270,7 @@
                     <groupId>log4j</groupId>
                 </exclusion>
             </exclusions>
-        </dependency> -->
+        </dependency>-->
 
         <!--  娴峰悍杞︾墝璇嗗埆-SDK
         <dependency>

--
Gitblit v1.9.3