Merge remote-tracking branch 'origin/master'

YYC

2023-10-21 d48d966dfde7a0c31bd81466559e5e8d681dc200

 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>
@@ -125,6 +125,7 @@
            <artifactId>igds-api-phone</artifactId>
            <version>${igds.version}</version>
        </dependency>

        <!-- 其他通用品牌协议 -->
        <dependency>
            <groupId>com.ld.igds</groupId>
@@ -143,15 +144,15 @@
        </dependency>


        <!-- 接口包，包括上海接口和气象接口
        <!-- 接口包，包括上海接口和、气象接口、三维接口
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-api-inte</artifactId>
            <version>${igds.version}</version>
        </dependency> -->
        </dependency>-->


        <!--  私有协议-风正致远
        <!--  私有协议-风正致远-->
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-fzzy3</artifactId>
@@ -166,8 +167,78 @@
                    <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>
@@ -183,6 +254,25 @@
                </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>
@@ -246,57 +336,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>-->
            <!--                    &lt;!&ndash;不显示js可能的错误 &ndash;&gt;-->
            <!--                    <jswarn>false</jswarn>-->
            <!--                    &lt;!&ndash;是否混淆 &ndash;&gt;-->
            <!--                    <nomunge>true</nomunge>-->
            <!--                    &lt;!&ndash;若存在已压缩的文件，会先对比源文件是否有改动 有改动便压缩，无改动就不压缩 &ndash;&gt;-->
            <!--                    <force>false</force>-->
            <!--                    &lt;!&ndash;在指定的列号后插入新行 &ndash;&gt;-->
            <!--                    <linebreakpos>-1</linebreakpos>-->
            <!--                    &lt;!&ndash;压缩之前先执行聚合文件操作 &ndash;&gt;-->
            <!--                    <preProcessAggregates>true</preProcessAggregates>-->
            <!--                    &lt;!&ndash;压缩后保存文件后缀 无后缀 &ndash;&gt;-->
            <!--                    <nosuffix>true</nosuffix>-->
            <!--                    &lt;!&ndash;源目录，即需压缩的根目录 &ndash;&gt;-->
            <!--                    <sourceDirectory>src/main/resources</sourceDirectory>-->
            <!--                    &lt;!&ndash;输出目录，即压缩后的目录 &ndash;&gt;-->
            <!--                    <outputDirectory>target/classes</outputDirectory>-->
            <!--                    <force>true</force>-->
            <!--                    &lt;!&ndash;压缩js和css文件 &ndash;&gt;-->
            <!--                    <includes>-->
            <!--                        <include>**/*.js</include>-->
            <!--                        <include>**/*.css</include>-->
            <!--                    </includes>-->
            <!--                    &lt;!&ndash; 以下目录和文件不会被压缩 &ndash;&gt;-->
            <!--                    <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>
                    <!--不显示js可能的错误 -->
                    <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和css文件 -->
                    <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>