Merge remote-tracking branch 'origin/dev' into dev

克 刘

2020-04-02 81aaee286ba7f54ef1b713fedd6d24a9294745df

 pom.xml

@@ -85,6 +85,7 @@
        <javax.activatio.version>1.1.1</javax.activatio.version>
        <jaxb-runtime.version>2.3.0</jaxb-runtime.version>
        <jaxb-impl.version>2.3.0</jaxb-impl.version>
        <zuul-ratelimit.version>2.0.4.RELEASE</zuul-ratelimit.version>
        <sonar.exclusions>kidgrow-jobs/**/* kidgrow-web/**/*</sonar.exclusions>
        <docker.baseImage>openjdk:8-jre-alpine</docker.baseImage>
        <docker.volumes>/tmp</docker.volumes>
@@ -155,6 +156,7 @@
            <version>${javax.activatio.version}</version>
        </dependency>
        <!-- jaxb模块引用 - end -->

    </dependencies>

    <dependencyManagement>
@@ -223,6 +225,21 @@
            <dependency>
                <groupId>com.kidgrow</groupId>
                <artifactId>kidgrow-usercenter-server</artifactId>
                <version>${project.version}</version>
            </dependency>
            <dependency>
                <groupId>com.kidgrow</groupId>
                <artifactId>kidgrow-opration-center-api</artifactId>
                <version>${project.version}</version>
            </dependency>
            <dependency>
                <groupId>com.kidgrow</groupId>
                <artifactId>kidgrow-opration-center-biz</artifactId>
                <version>${project.version}</version>
            </dependency>
            <dependency>
                <groupId>com.kidgrow</groupId>
                <artifactId>kidgrow-opration-center-server</artifactId>
                <version>${project.version}</version>
            </dependency>
            <dependency>
@@ -350,6 +367,12 @@
                <artifactId>mybatis-plus</artifactId>
                <version>${mybatis-plus-boot-starter.version}</version>
            </dependency>
            <!--网关限流插件-->
            <dependency>
                <groupId>com.marcosbarbero.cloud</groupId>
                <artifactId>spring-cloud-zuul-ratelimit</artifactId>
                <version>${zuul-ratelimit.version}</version>
            </dependency>
            <dependency>
                <groupId>p6spy</groupId>
                <artifactId>p6spy</artifactId>