Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-06-19 c09ce992101f0c9eaae165389a7638566ac566a9

 igds-web/pom.xml

@@ -119,6 +119,12 @@
            <version>${igds.version}</version>
        </dependency>

        <!-- APP -可选-->
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-api-phone</artifactId>
            <version>${igds.version}</version>
        </dependency>
        <!-- 其他通用品牌协议 -->
        <dependency>
            <groupId>com.ld.igds</groupId>
@@ -214,54 +220,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>-->
<!--                    &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>-->
            <!--                    &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>-->

        </plugins>