From ed18e7c5d3cb3bb237cbf9eed2447ca3721258c5 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 19 十月 2023 11:29:47 +0800
Subject: [PATCH] 佛山项目修改

---
 igds-web/pom.xml |   70 ++++++++++++++++++++++-------------
 1 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index ff463ac..63ea611 100644
--- a/igds-web/pom.xml
+++ b/igds-web/pom.xml
@@ -144,12 +144,12 @@
         </dependency>
 
 
-        <!-- 鎺ュ彛鍖咃紝鍖呮嫭涓婃捣鎺ュ彛鍜屾皵璞℃帴鍙�-->
+        <!-- 鎺ュ彛鍖咃紝鍖呮嫭涓婃捣鎺ュ彛鍜屻�佹皵璞℃帴鍙ｃ�佷笁缁存帴鍙�
         <dependency>
             <groupId>com.ld.igds</groupId>
             <artifactId>igds-api-inte</artifactId>
             <version>${igds.version}</version>
-        </dependency>
+        </dependency>-->
 
 
         <!--  绉佹湁鍗忚-椋庢鑷磋繙-->
@@ -169,25 +169,25 @@
             </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銆佸埗姘満
+        <!-- 绉佹湁鍗忚-椋庢鑷磋繙IOT銆佸埗姘満-->
         <dependency>
             <groupId>com.ld.igds</groupId>
             <artifactId>igds-protocol-iot</artifactId>
@@ -202,9 +202,9 @@
                     <groupId>log4j</groupId>
                 </exclusion>
             </exclusions>
-        </dependency>-->
+        </dependency>
 
-        <!--  绉佹湁鍗忚-璐濆崥绮儏
+        <!--  绉佹湁鍗忚-璐濆崥绮儏-->
         <dependency>
             <groupId>com.ld.igds</groupId>
             <artifactId>igds-protocol-beibo</artifactId>
@@ -219,9 +219,26 @@
                     <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>
             <groupId>com.ld.igds</groupId>
             <artifactId>igds-protocol-bhzn</artifactId>
@@ -236,9 +253,9 @@
                     <groupId>log4j</groupId>
                 </exclusion>
             </exclusions>
-        </dependency>-->
+        </dependency>
 
-        <!--  绉佹湁鍗忚-姝ｆ潵鐢靛瓙 -->
+        <!--  绉佹湁鍗忚-姝ｆ潵鐢靛瓙-->
         <dependency>
             <groupId>com.ld.igds</groupId>
             <artifactId>igds-protocol-zldz</artifactId>
@@ -255,7 +272,7 @@
             </exclusions>
         </dependency>
 
-        <!--  娴峰悍杞︾墝璇嗗埆-SDK -->
+        <!--  娴峰悍杞︾墝璇嗗埆-SDK-->
         <dependency>
             <groupId>com.ld.igds</groupId>
             <artifactId>igds-protocol-sdk</artifactId>
@@ -319,6 +336,7 @@
                 <configuration>
                     <fork>true</fork>
                 </configuration>
+
             </plugin>
 
             <!-- YUI Compressor Maven鍘嬬缉鎻掍欢 寮�鍙戝寘涓嶅疄鐢�-->

--
Gitblit v1.9.3