Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

zhangfeng

2022-12-23 5bd5f3bcd6d2cb375feb0756505691b551339716

 pom.xml

@@ -9,6 +9,12 @@
    <packaging>pom</packaging>
    <version>1.0-SNAPSHOT</version>

    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
        <version>2.7.1</version>
    </parent>

    <modules>
        <module>goal-manage/goal-manage-service</module>
        <module>goal-manage/goal-manage-rpc-provider</module>
@@ -25,9 +31,9 @@
        <project.build.sourceencoding>UTF-8</project.build.sourceencoding>
        <project.reporting.outputencoding>UTF-8</project.reporting.outputencoding>
        <java.version>1.8</java.version>
        <dubbo.version>3.0.8</dubbo.version>
        <nacos.client.version>2.1.0</nacos.client.version>
        <minio.version>8.4.2</minio.version>
        <dubbo.version>3.1.2</dubbo.version>
        <nacos.client.version>2.1.2</nacos.client.version>
        <minio.version>8.4.5</minio.version>
        <okhttp.version>4.10.0</okhttp.version>
        <fastjson.version>1.2.47</fastjson.version>
        <mysql.connector.version>8.0.29</mysql.connector.version>
@@ -36,16 +42,12 @@
        <account.rpc.model.version>1.0-SNAPSHOT</account.rpc.model.version>
        <mybatis.plus.version>3.5.2</mybatis.plus.version>
        <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>
        <com.alibaba.cloud.version>2.2.9.RELEASE</com.alibaba.cloud.version>
        <jta.starter.version>2.7.5</jta.starter.version>
        <commons.utils.version>1.9.4</commons.utils.version>
        <redission.version>3.18.0</redission.version>
        <rocketmq.starter.version>2.2.2</rocketmq.starter.version>
    </properties>

    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
        <version>2.6.7</version>
    </parent>

    <dependencyManagement>
        <dependencies>
@@ -139,6 +141,12 @@
                <version>${commons.utils.version}</version>
            </dependency>

            <dependency>
                <groupId>org.redisson</groupId>
                <artifactId>redisson-spring-boot-starter</artifactId>
                <version>${redission.version}</version>
            </dependency>

        </dependencies>
    </dependencyManagement>

@@ -202,6 +210,10 @@
            <artifactId>spring-boot-starter-data-redis</artifactId>
        </dependency>
        <dependency>
            <groupId>org.redisson</groupId>
            <artifactId>redisson-spring-boot-starter</artifactId>
        </dependency>
        <dependency>
            <groupId>org.aspectj</groupId>
            <artifactId>aspectjweaver</artifactId>
            <version>1.9.9.1</version>