From d62cbd8da3bd2422de2923a6e7d999822730d632 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期六, 16 九月 2023 11:55:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-web/pom.xml |   78 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index 1753995..52d0223 100644
--- a/igds-web/pom.xml
+++ b/igds-web/pom.xml
@@ -10,6 +10,7 @@
         <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>
@@ -125,6 +126,7 @@
             <artifactId>igds-api-phone</artifactId>
             <version>${igds.version}</version>
         </dependency>
+
         <!-- 鍏朵粬閫氱敤鍝佺墝鍗忚 -->
         <dependency>
             <groupId>com.ld.igds</groupId>
@@ -143,7 +145,7 @@
         </dependency>
 
 
-        <!-- 鎺ュ彛鍖咃紝鍖呮嫭涓婃捣鎺ュ彛鍜屾皵璞℃帴鍙�-->
+        <!-- 鎺ュ彛鍖咃紝鍖呮嫭涓婃捣鎺ュ彛鍜屻�佹皵璞℃帴鍙ｃ�佷笁缁存帴鍙�-->
         <dependency>
             <groupId>com.ld.igds</groupId>
             <artifactId>igds-api-inte</artifactId>
@@ -168,6 +170,58 @@
             </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銆佸埗姘満-->
+        <dependency>
+            <groupId>com.ld.igds</groupId>
+            <artifactId>igds-protocol-iot</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-beibo</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>
@@ -185,7 +239,24 @@
             </exclusions>
         </dependency>-->
 
-        <!--  娴峰悍杞︾墝璇嗗埆-SDK -->
+        <!--  绉佹湁鍗忚-姝ｆ潵鐢靛瓙
+        <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>
@@ -200,7 +271,7 @@
                     <groupId>log4j</groupId>
                 </exclusion>
             </exclusions>
-        </dependency>
+        </dependency>-->
     </dependencies>
 
     <dependencyManagement>
@@ -249,6 +320,7 @@
                 <configuration>
                     <fork>true</fork>
                 </configuration>
+
             </plugin>
 
             <!-- YUI Compressor Maven鍘嬬缉鎻掍欢 寮�鍙戝寘涓嶅疄鐢�-->

--
Gitblit v1.9.3