Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-08-15 c9529bd19a8d61666b71824dd751682c1e9dc288

 pom.xml

@@ -14,6 +14,10 @@
        <module>goal-manage/goal-manage-rpc-provider</module>
        <module>emergency/emergency-service</module>
        <module>emergency/emergency-rpc-provider</module>
        <module>equipment/equipment-service</module>
        <module>equipment/equipment-rpc-provider</module>
        <module>incident-manage/incident-manage-service</module>
        <module>incident-manage/incident-manage-rpc-provider</module>
        <module>safePlatfrom-out-web</module>
    </modules>

@@ -34,6 +38,7 @@
        <poi.version>4.1.2</poi.version>
        <com.alibaba.cloud.version>2.2.8.RELEASE</com.alibaba.cloud.version>
        <jta.starter.version>2.7.1</jta.starter.version>
        <commons.utils.version>1.9.4</commons.utils.version>
    </properties>

    <parent>
@@ -127,6 +132,13 @@
                <version>${com.alibaba.cloud.version}</version>
            </dependency>


            <dependency>
                <groupId>commons-beanutils</groupId>
                <artifactId>commons-beanutils</artifactId>
                <version>${commons.utils.version}</version>
            </dependency>

        </dependencies>
    </dependencyManagement>

@@ -183,6 +195,7 @@
            <version>${poi.version}</version>
        </dependency>


        <!-- redis连接 -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -222,6 +235,10 @@
            <artifactId>dubbo-registry-nacos</artifactId>
        </dependency>
        <dependency>
            <groupId>commons-beanutils</groupId>
            <artifactId>commons-beanutils</artifactId>
        </dependency>
        <dependency>
            <groupId>io.minio</groupId>
            <artifactId>minio</artifactId>
        </dependency>
@@ -240,6 +257,11 @@

    <build>
        <plugins>
            <!-- 修改打包插件
                修改打包方式jar为pom后
                默认打包方式为spring-boot-maven-plugin
                    等到后期打包的时候他会一直提示你，你引入的依赖不存在
             -->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
@@ -249,6 +271,13 @@
                    <target>1.8</target>
                </configuration>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>
                <configuration>
                    <skipTests>true</skipTests>    <!--默认关掉单元测试 -->
                </configuration>
            </plugin>
        </plugins>
    </build>