Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-11-04 43ce77a85d8297a53dc25430fff10ead57296167

 igds-web/pom.xml

@@ -169,7 +169,7 @@
            </exclusions>
        </dependency>

        <!-- MODBUS-TCP -->
        <!-- MODBUS-TCP
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-modbus</artifactId>
@@ -184,7 +184,7 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        </dependency>-->


        <!-- 私有协议-风正致远IOT、制氮机
@@ -204,7 +204,7 @@
            </exclusions>
        </dependency>-->

        <!--  私有协议-贝博粮情
        <!--  私有协议-贝博粮情-->
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-beibo</artifactId>
@@ -219,9 +219,26 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>-->
        </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>
@@ -236,7 +253,7 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        </dependency>-->

        <!--  私有协议-正来电子
        <dependency>
@@ -253,7 +270,7 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency> -->
        </dependency>-->

        <!--  海康车牌识别-SDK
        <dependency>
@@ -319,6 +336,7 @@
                <configuration>
                    <fork>true</fork>
                </configuration>

            </plugin>

            <!-- YUI Compressor Maven压缩插件 开发包不实用-->