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 |   94 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 91 insertions(+), 3 deletions(-)

diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index 1753995..7809de5 100644
--- a/igds-web/pom.xml
+++ b/igds-web/pom.xml
@@ -125,6 +125,7 @@
             <artifactId>igds-api-phone</artifactId>
             <version>${igds.version}</version>
         </dependency>
+
         <!-- 鍏朵粬閫氱敤鍝佺墝鍗忚 -->
         <dependency>
             <groupId>com.ld.igds</groupId>
@@ -143,7 +144,7 @@
         </dependency>
 
 
-        <!-- 鎺ュ彛鍖咃紝鍖呮嫭涓婃捣鎺ュ彛鍜屾皵璞℃帴鍙�-->
+        <!-- 鎺ュ彛鍖咃紝鍖呮嫭涓婃捣鎺ュ彛鍜屻�佹皵璞℃帴鍙ｃ�佷笁缁存帴鍙�-->
         <dependency>
             <groupId>com.ld.igds</groupId>
             <artifactId>igds-api-inte</artifactId>
@@ -155,6 +156,75 @@
         <dependency>
             <groupId>com.ld.igds</groupId>
             <artifactId>igds-protocol-fzzy3</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銆佸埗姘満
+        <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>
+
+        <!--  绉佹湁鍗忚-DLT645鐢佃〃鍗忚-->
+        <dependency>
+            <groupId>com.ld.igds</groupId>
+            <artifactId>igds-protocol-es</artifactId>
             <version>${igds.version}</version>
             <exclusions>
                 <exclusion>
@@ -185,7 +255,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 +287,7 @@
                     <groupId>log4j</groupId>
                 </exclusion>
             </exclusions>
-        </dependency>
+        </dependency>-->
     </dependencies>
 
     <dependencyManagement>
@@ -249,6 +336,7 @@
                 <configuration>
                     <fork>true</fork>
                 </configuration>
+
             </plugin>
 
             <!-- YUI Compressor Maven鍘嬬缉鎻掍欢 寮�鍙戝寘涓嶅疄鐢�-->

--
Gitblit v1.9.3