Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

克 刘

2020-04-10 9481bba85450164a1e402de7e383389decd46388

 pom.xml

@@ -43,7 +43,8 @@
        <spring-cloud-dependencies.version>Greenwich.SR5</spring-cloud-dependencies.version>
        <spring-boot-dependencies.version>2.1.12.RELEASE</spring-boot-dependencies.version>
        <spring-boot-maven-plugin.version>2.1.12.RELEASE</spring-boot-maven-plugin.version>
        <mysql-connector-java.version>5.1.38</mysql-connector-java.version>
<!--        <mysql-connector-java.version>5.1.38</mysql-connector-java.version>-->
        <mysql-connector-java.version>8.0.13</mysql-connector-java.version>
        <aliyun-sdk-oss>3.4.2</aliyun-sdk-oss>
        <qiniu-java-sdk>7.2.18</qiniu-java-sdk>
        <fastdfs-client.version>1.26.7</fastdfs-client.version>
@@ -84,12 +85,13 @@
        <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>
        <docker.image.prefix>kidgrow</docker.image.prefix>
        <!--docker harbor地址-->
        <docker.repostory>192.168.2.240:8081</docker.repostory>
        <docker.repostory>182.92.99.224:8081</docker.repostory>
    </properties>

    <dependencies>
@@ -154,6 +156,7 @@
            <version>${javax.activatio.version}</version>
        </dependency>
        <!-- jaxb模块引用 - end -->

    </dependencies>

    <dependencyManagement>
@@ -226,6 +229,21 @@
            </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>
                <groupId>com.kidgrow</groupId>
                <artifactId>kidgrow-uaa-api</artifactId>
                <version>${project.version}</version>
            </dependency>
@@ -253,6 +271,11 @@
            <dependency>
                <groupId>com.kidgrow</groupId>
                <artifactId>kidgrow-searchcenter-server</artifactId>
                <version>${project.version}</version>
            </dependency>
            <dependency>
                <groupId>com.kidgrow</groupId>
                <artifactId>kidgrow-rabbitmq-spring-boot-starter</artifactId>
                <version>${project.version}</version>
            </dependency>
            <dependency>
@@ -343,6 +366,12 @@
                <groupId>com.baomidou</groupId>
                <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>
@@ -551,18 +580,8 @@
                </plugin>
                <plugin>
                    <groupId>com.spotify</groupId>
                    <artifactId>docker-maven-plugin</artifactId>
                    <artifactId>dockerfile-maven-plugin</artifactId>
                    <version>${docker-maven-plugin.version}</version>
                    <configuration>
                        <!-- Dockerfile目录指定 -->
                        <dockerfile>Dockerfile</dockerfile>
                        <repository>${docker.repostory}/${docker.image.prefix}/${project.artifactId}</repository>
                        <!-- 生成镜像标签 如不指定 默认为latest -->
                        <tag>1.0.0</tag>
                        <buildArgs>
                            <JAR_FILE>./target/${project.build.finalName}.jar</JAR_FILE>
                        </buildArgs>
                    </configuration>
                </plugin>
            </plugins>
        </pluginManagement>