Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-11-04 43ce77a85d8297a53dc25430fff10ead57296167

 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压缩插件 开发包不实用-->