From 69cd9f59a0fabf12f8c9147fcba7f69817a870b3 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:40:59 +0800
Subject: [PATCH] 更新仓内抓拍2
---
igds-web/pom.xml | 219 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 166 insertions(+), 53 deletions(-)
diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index 6c3a3d2..d4e3164 100644
--- a/igds-web/pom.xml
+++ b/igds-web/pom.xml
@@ -97,13 +97,13 @@
<version>${igds.version}</version>
</dependency>
- <!-- 鏁伴噺妫�娴�
+ <!-- 鏁伴噺妫�娴�-->
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-quantity</artifactId>
<version>${igds.version}</version>
</dependency>
- -->
+
<!-- 鍑哄叆搴撴ā鍧� -鍙��-->
<dependency>
@@ -119,12 +119,14 @@
<version>${igds.version}</version>
</dependency>
- <!-- APP -鍙��-->
+ <!-- APP -鍙��
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-api-phone</artifactId>
<version>${igds.version}</version>
</dependency>
+ -->
+
<!-- 鍏朵粬閫氱敤鍝佺墝鍗忚 -->
<dependency>
<groupId>com.ld.igds</groupId>
@@ -143,12 +145,12 @@
</dependency>
- <!-- 鎺ュ彛鍖咃紝鍖呮嫭涓婃捣鎺ュ彛鍜屾皵璞℃帴鍙�
+ <!-- 鎺ュ彛鍖咃紝鍖呮嫭涓婃捣鎺ュ彛鍜屻�佹皵璞℃帴鍙ｃ�佷笁缁存帴鍙�
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-api-inte</artifactId>
<version>${igds.version}</version>
- </dependency> -->
+ </dependency>-->
<!-- 绉佹湁鍗忚-椋庢鑷磋繙
@@ -166,7 +168,80 @@
<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>
+ <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>
@@ -182,6 +257,43 @@
</exclusion>
</exclusions>
</dependency>
+ -->
+
+ <!-- 绉佹湁鍗忚-姝ｆ潵鐢靛瓙
+ <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>
+ <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>
+ -->
</dependencies>
@@ -231,57 +343,58 @@
<configuration>
<fork>true</fork>
</configuration>
+
</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