From 7243e0b4bd9a267a633d2e481e17646509b6868d Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 07 九月 2023 19:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/pom.xml | 140 ++++++++++++++++++++++++++++------------------
1 files changed, 86 insertions(+), 54 deletions(-)
diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index e2ef9c4..ff463ac 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>
@@ -168,8 +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>-->
- <!-- 绉佹湁鍗忚-椋庢鑷磋繙IOT銆佸埗姘満-->
+
+ <!-- 绉佹湁鍗忚-椋庢鑷磋繙IOT銆佸埗姘満
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-iot</artifactId>
@@ -184,7 +202,7 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
<!-- 绉佹湁鍗忚-璐濆崥绮儏
<dependency>
@@ -220,7 +238,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>
@@ -236,10 +271,7 @@
</exclusion>
</exclusions>
</dependency>
- -->
-
</dependencies>
-
<dependencyManagement>
<dependencies>
@@ -290,54 +322,54 @@
</plugin>
<!-- YUI Compressor Maven鍘嬬缉鎻掍欢 寮�鍙戝寘涓嶅疄鐢�-->
-<!-- <plugin>-->
-<!-- <groupId>net.alchim31.maven</groupId>-->
-<!-- <artifactId>yuicompressor-maven-plugin</artifactId>-->
-<!-- <version>1.5.1</version>-->
-<!-- <executions>-->
-<!-- <execution>-->
-<!-- <goals>-->
-<!-- <goal>compress</goal>-->
-<!-- </goals>-->
-<!-- </execution>-->
-<!-- </executions>-->
-<!-- <configuration>-->
-<!-- <encoding>UTF-8</encoding>-->
-<!-- <!–涓嶆樉绀簀s鍙兘鐨勯敊璇� –>-->
-<!-- <jswarn>false</jswarn>-->
-<!-- <!–鏄惁娣锋穯 –>-->
-<!-- <nomunge>true</nomunge>-->
-<!-- <!–鑻ュ瓨鍦ㄥ凡鍘嬬缉鐨勬枃浠讹紝浼氬厛瀵规瘮婧愭枃浠舵槸鍚︽湁鏀瑰姩 鏈夋敼鍔ㄤ究鍘嬬缉锛屾棤鏀瑰姩灏变笉鍘嬬缉 –>-->
-<!-- <force>false</force>-->
-<!-- <!–鍦ㄦ寚瀹氱殑鍒楀彿鍚庢彃鍏ユ柊琛� –>-->
-<!-- <linebreakpos>-1</linebreakpos>-->
-<!-- <!–鍘嬬缉涔嬪墠鍏堟墽琛岃仛鍚堟枃浠舵搷浣� –>-->
-<!-- <preProcessAggregates>true</preProcessAggregates>-->
-<!-- <!–鍘嬬缉鍚庝繚瀛樻枃浠跺悗缂� 鏃犲悗缂� –>-->
-<!-- <nosuffix>true</nosuffix>-->
-<!-- <!–婧愮洰褰曪紝鍗抽渶鍘嬬缉鐨勬牴鐩綍 –>-->
-<!-- <sourceDirectory>src/main/resources</sourceDirectory>-->
-<!-- <!–杈撳嚭鐩綍锛屽嵆鍘嬬缉鍚庣殑鐩綍 –>-->
-<!-- <outputDirectory>target/classes</outputDirectory>-->
-<!-- <force>true</force>-->
-<!-- <!–鍘嬬缉js鍜宑ss鏂囦欢 –>-->
-<!-- <includes>-->
-<!-- <include>**/*.js</include>-->
-<!-- <include>**/*.css</include>-->
-<!-- </includes>-->
-<!-- <!– 浠ヤ笅鐩綍鍜屾枃浠朵笉浼氳鍘嬬缉 –>-->
-<!-- <excludes>-->
-<!-- <exclude>**/*.min.js</exclude>-->
-<!-- <exclude>**/*.min.css</exclude>-->
-<!-- <exclude>**/d7/**</exclude>-->
-<!-- <exclude>**/dorado-home/**</exclude>-->
-<!-- <exclude>**/bdf2/**</exclude>-->
-<!-- <exclude>**/css/**</exclude>-->
-<!-- <exclude>**/js/**</exclude>-->
-<!-- <exclude>**/plugins/**</exclude>-->
-<!-- </excludes>-->
-<!-- </configuration>-->
-<!-- </plugin>-->
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>yuicompressor-maven-plugin</artifactId>
+ <version>1.5.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compress</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <!--涓嶆樉绀簀s鍙兘鐨勯敊璇� -->
+ <jswarn>false</jswarn>
+ <!--鏄惁娣锋穯 -->
+ <nomunge>true</nomunge>
+ <!--鑻ュ瓨鍦ㄥ凡鍘嬬缉鐨勬枃浠讹紝浼氬厛瀵规瘮婧愭枃浠舵槸鍚︽湁鏀瑰姩 鏈夋敼鍔ㄤ究鍘嬬缉锛屾棤鏀瑰姩灏变笉鍘嬬缉 -->
+ <force>false</force>
+ <!--鍦ㄦ寚瀹氱殑鍒楀彿鍚庢彃鍏ユ柊琛� -->
+ <linebreakpos>-1</linebreakpos>
+ <!--鍘嬬缉涔嬪墠鍏堟墽琛岃仛鍚堟枃浠舵搷浣� -->
+ <preProcessAggregates>true</preProcessAggregates>
+ <!--鍘嬬缉鍚庝繚瀛樻枃浠跺悗缂� 鏃犲悗缂� -->
+ <nosuffix>true</nosuffix>
+ <!--婧愮洰褰曪紝鍗抽渶鍘嬬缉鐨勬牴鐩綍 -->
+ <sourceDirectory>src/main/resources</sourceDirectory>
+ <!--杈撳嚭鐩綍锛屽嵆鍘嬬缉鍚庣殑鐩綍 -->
+ <outputDirectory>target/classes</outputDirectory>
+ <force>true</force>
+ <!--鍘嬬缉js鍜宑ss鏂囦欢 -->
+ <includes>
+ <include>**/*.js</include>
+ <include>**/*.css</include>
+ </includes>
+ <!-- 浠ヤ笅鐩綍鍜屾枃浠朵笉浼氳鍘嬬缉 -->
+ <excludes>
+ <exclude>**/*.min.js</exclude>
+ <exclude>**/*.min.css</exclude>
+ <exclude>**/d7/**</exclude>
+ <exclude>**/dorado-home/**</exclude>
+ <exclude>**/bdf2/**</exclude>
+ <exclude>**/css/**</exclude>
+ <exclude>**/js/**</exclude>
+ <exclude>**/plugins/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
--
Gitblit v1.9.3