From c8e56594e03e0e7d0bf9c34e3375d95b34cf9c54 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 27 Nov 2020 18:09:07 +0800
Subject: [PATCH] 配合新的套餐功能，修正套餐的扣款顺序（修复）
---
pom.xml | 98 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 82 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6fb9366..b4fcfd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,14 +43,15 @@
<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>
<easypoi.version>4.1.0</easypoi.version>
<poi.version>4.1.0</poi.version>
<druid-starter>1.1.10</druid-starter>
- <mybatis-plus-boot-starter.version>3.3.1</mybatis-plus-boot-starter.version>
+ <mybatis-plus-boot-starter.version>3.4.0</mybatis-plus-boot-starter.version>
<p6spy.version>3.8.6</p6spy.version>
<swagger.version>2.9.2</swagger.version>
<guava.version>28.1-jre</guava.version>
@@ -58,7 +59,7 @@
<swagger.mg.ui.version>1.0.6</swagger.mg.ui.version>
<swagger.butler.version>2.0.1</swagger.butler.version>
<commons-collections4.version>4.4</commons-collections4.version>
- <fastjson.version>1.2.62</fastjson.version>
+ <fastjson.version>1.2.70</fastjson.version>
<httpclient.version>4.5.6</httpclient.version>
<modle-mapper.version>2.3.4</modle-mapper.version>
<security-oauth2.version>2.4.0.RELEASE</security-oauth2.version>
@@ -73,7 +74,7 @@
<easyCaptcha.version>1.6.2</easyCaptcha.version>
<userAgent.version>1.21</userAgent.version>
<oauth2-resource.version>5.1.7.RELEASE</oauth2-resource.version>
- <docker-maven-plugin.version>1.2.2</docker-maven-plugin.version>
+ <docker-maven-plugin.version>1.4.10</docker-maven-plugin.version>
<velocity.version>1.7</velocity.version>
<commons-configuration2.version>2.6</commons-configuration2.version>
<txlcn.version>5.0.2.RELEASE</txlcn.version>
@@ -84,7 +85,15 @@
<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>182.92.99.224:8081</docker.repostory>
+ <com.belerweb.pinyin4j.version>2.5.1</com.belerweb.pinyin4j.version>
+ <net.coobird.thumbnailator.version>0.4.11</net.coobird.thumbnailator.version>
</properties>
<dependencies>
@@ -149,11 +158,42 @@
<version>${javax.activatio.version}</version>
</dependency>
<!-- jaxb模块引用 - end -->
+ <dependency>
+ <groupId>com.belerweb</groupId>
+ <artifactId>pinyin4j</artifactId>
+ <version>${com.belerweb.pinyin4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.coobird</groupId>
+ <artifactId>thumbnailator</artifactId>
+ <version>${net.coobird.thumbnailator.version}</version>
+ </dependency>
+
</dependencies>
<dependencyManagement>
<dependencies>
<!-- 自定义 starter -->
+ <dependency>
+ <groupId>com.kidgrow</groupId>
+ <artifactId>kidgrow-plugin-sms-center-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.kidgrow</groupId>
+ <artifactId>kidgrow-plugin-sms-biz</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.kidgrow</groupId>
+ <artifactId>kidgrow-plugin-sms-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.kidgrow</groupId>
+ <artifactId>kidgrow-plugin-sms</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>com.kidgrow</groupId>
<artifactId>kidgrow-config</artifactId>
@@ -221,6 +261,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>
@@ -248,6 +303,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>
@@ -338,6 +398,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>
@@ -500,17 +566,17 @@
</dependencyManagement>
<repositories>
-<!-- <repository>-->
-<!-- <id>nexus-releases</id>-->
-<!-- <name>team repository</name>-->
-<!-- <url>http://192.168.2.240:8091/repository/maven-releases/</url>-->
-<!-- <releases>-->
-<!-- <enabled>true</enabled>-->
-<!-- </releases>-->
-<!-- <snapshots>-->
-<!-- <enabled>false</enabled>-->
-<!-- </snapshots>-->
-<!-- </repository>-->
+ <repository>
+ <id>nexus-releases</id>
+ <name>team repository</name>
+ <url>http://192.168.2.240:8091/repository/maven-releases/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
<repository>
<id>alimaven</id>
<name>aliyun maven</name>
@@ -546,7 +612,7 @@
</plugin>
<plugin>
<groupId>com.spotify</groupId>
- <artifactId>docker-maven-plugin</artifactId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
<version>${docker-maven-plugin.version}</version>
</plugin>
</plugins>
--
Gitblit v1.8.0