From fc84c758bd44479ce2ab12805e954f9b39ec77ae Mon Sep 17 00:00:00 2001 From: smallchill Date: Wed, 26 Feb 2020 16:00:39 +0800 Subject: [PATCH] :tada: 2.4.0.RELEASE --- README.md | 2 +- blade-common/pom.xml | 2 +- blade-example-api/blade-dubbo-provider-api/pom.xml | 2 +- blade-example-api/blade-stream-api/pom.xml | 2 +- blade-example-api/pom.xml | 4 ++-- blade-example/blade-dubbo-consumer/pom.xml | 2 +- blade-example/blade-dubbo-provider/pom.xml | 2 +- blade-example/blade-easypoi/pom.xml | 2 +- blade-example/blade-mq-kafka/pom.xml | 2 +- blade-example/blade-mq-rabbit/pom.xml | 2 +- blade-example/blade-seata-order/pom.xml | 2 +- blade-example/blade-seata-storage/pom.xml | 2 +- blade-example/blade-stream-consumer/pom.xml | 2 +- blade-example/blade-stream-provider/pom.xml | 2 +- blade-example/blade-websocket/pom.xml | 2 +- blade-example/pom.xml | 4 ++-- blade-gateway/pom.xml | 2 +- blade-service-api/blade-demo-api/pom.xml | 2 +- blade-service-api/pom.xml | 4 ++-- blade-service/blade-demo/pom.xml | 8 ++------ blade-service/pom.xml | 4 ++-- pom.xml | 8 ++++---- script/docker/app/.env | 2 +- 23 files changed, 31 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index f394968f6..0f59c9857 100644 --- a/README.md +++ b/README.md @@ -40,4 +40,4 @@ ## 举报有奖 * 向官方提供有用线索并成功捣毁盗版个人或窝点，将会看成果给予 500～10000 不等的现金奖励 -* 官方唯一指定QQ：85088620 \ No newline at end of file +* 官方唯一指定QQ：1272154962 \ No newline at end of file diff --git a/blade-common/pom.xml b/blade-common/pom.xml index 60065e96c..9906b4b4a 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ BladeX-Biz org.springblade - 2.3.1.RELEASE + 2.4.0.RELEASE 4.0.0 diff --git a/blade-example-api/blade-dubbo-provider-api/pom.xml b/blade-example-api/blade-dubbo-provider-api/pom.xml index ccf39d8f4..ba755c556 100644 --- a/blade-example-api/blade-dubbo-provider-api/pom.xml +++ b/blade-example-api/blade-dubbo-provider-api/pom.xml @@ -5,7 +5,7 @@ blade-example-api org.springblade - 2.3.1.RELEASE + 2.4.0.RELEASE 4.0.0 diff --git a/blade-example-api/blade-stream-api/pom.xml b/blade-example-api/blade-stream-api/pom.xml index 6a1191ef5..1ec88fc3f 100644 --- a/blade-example-api/blade-stream-api/pom.xml +++ b/blade-example-api/blade-stream-api/pom.xml @@ -5,7 +5,7 @@ blade-example-api org.springblade - 2.3.1.RELEASE + 2.4.0.RELEASE 4.0.0 diff --git a/blade-example-api/pom.xml b/blade-example-api/pom.xml index 4cec810e1..1ab6d1536 100644 --- a/blade-example-api/pom.xml +++ b/blade-example-api/pom.xml @@ -5,13 +5,13 @@ BladeX-Biz org.springblade - 2.3.1.RELEASE + 2.4.0.RELEASE 4.0.0 blade-example-api ${project.artifactId} - 2.3.1.RELEASE + 2.4.0.RELEASE pom BladeX 微服务范例API集合 diff --git a/blade-example/blade-dubbo-consumer/pom.xml b/blade-example/blade-dubbo-consumer/pom.xml index 8f9d5dc6c..9ea3d0a31 100644 --- a/blade-example/blade-dubbo-consumer/pom.xml +++ b/blade-example/blade-dubbo-consumer/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.3.1.RELEASE + 2.4.0.RELEASE 4.0.0 diff --git a/blade-example/blade-dubbo-provider/pom.xml b/blade-example/blade-dubbo-provider/pom.xml index e96f6f8d6..b33ef3234 100644 --- a/blade-example/blade-dubbo-provider/pom.xml +++ b/blade-example/blade-dubbo-provider/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.3.1.RELEASE + 2.4.0.RELEASE 4.0.0 diff --git a/blade-example/blade-easypoi/pom.xml b/blade-example/blade-easypoi/pom.xml index 7e0287a51..7f1fc6278 100644 --- a/blade-example/blade-easypoi/pom.xml +++ b/blade-example/blade-easypoi/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.3.1.RELEASE + 2.4.0.RELEASE 4.0.0 diff --git a/blade-example/blade-mq-kafka/pom.xml b/blade-example/blade-mq-kafka/pom.xml index 173c0f98f..eb136d858 100644 --- a/blade-example/blade-mq-kafka/pom.xml +++ b/blade-example/blade-mq-kafka/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.3.1.RELEASE + 2.4.0.RELEASE 4.0.0 diff --git a/blade-example/blade-mq-rabbit/pom.xml b/blade-example/blade-mq-rabbit/pom.xml index 7a7043a05..65d66ee42 100644 --- a/blade-example/blade-mq-rabbit/pom.xml +++ b/blade-example/blade-mq-rabbit/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.3.1.RELEASE + 2.4.0.RELEASE 4.0.0 diff --git a/blade-example/blade-seata-order/pom.xml b/blade-example/blade-seata-order/pom.xml index fe7f0dbd3..bd82cf8fd 100644 --- a/blade-example/blade-seata-order/pom.xml +++ b/blade-example/blade-seata-order/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.3.1.RELEASE + 2.4.0.RELEASE 4.0.0 diff --git a/blade-example/blade-seata-storage/pom.xml b/blade-example/blade-seata-storage/pom.xml index 6dfcd6373..b0e039e51 100644 --- a/blade-example/blade-seata-storage/pom.xml +++ b/blade-example/blade-seata-storage/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.3.1.RELEASE + 2.4.0.RELEASE 4.0.0 diff --git a/blade-example/blade-stream-consumer/pom.xml b/blade-example/blade-stream-consumer/pom.xml index 85235afa8..a2c8c0ecf 100644 --- a/blade-example/blade-stream-consumer/pom.xml +++ b/blade-example/blade-stream-consumer/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.3.1.RELEASE + 2.4.0.RELEASE 4.0.0 diff --git a/blade-example/blade-stream-provider/pom.xml b/blade-example/blade-stream-provider/pom.xml index 4905272ad..192c31d69 100644 --- a/blade-example/blade-stream-provider/pom.xml +++ b/blade-example/blade-stream-provider/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.3.1.RELEASE + 2.4.0.RELEASE 4.0.0 diff --git a/blade-example/blade-websocket/pom.xml b/blade-example/blade-websocket/pom.xml index ffedf8365..5ed4edeea 100644 --- a/blade-example/blade-websocket/pom.xml +++ b/blade-example/blade-websocket/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.3.1.RELEASE + 2.4.0.RELEASE 4.0.0 diff --git a/blade-example/pom.xml b/blade-example/pom.xml index 42d85c460..b6feec5e1 100644 --- a/blade-example/pom.xml +++ b/blade-example/pom.xml @@ -5,13 +5,13 @@ BladeX-Biz org.springblade - 2.3.1.RELEASE + 2.4.0.RELEASE 4.0.0 blade-example ${project.artifactId} - 2.3.1.RELEASE + 2.4.0.RELEASE pom BladeX 微服务范例集合 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index d363e5688..cc43a3568 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ BladeX-Biz org.springblade - 2.3.1.RELEASE + 2.4.0.RELEASE 4.0.0 diff --git a/blade-service-api/blade-demo-api/pom.xml b/blade-service-api/blade-demo-api/pom.xml index dc218319c..afdda3f34 100644 --- a/blade-service-api/blade-demo-api/pom.xml +++ b/blade-service-api/blade-demo-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.3.1.RELEASE + 2.4.0.RELEASE 4.0.0 diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index 1dc3db7e2..0dc44357f 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,14 +5,14 @@ BladeX-Biz org.springblade - 2.3.1.RELEASE + 2.4.0.RELEASE 4.0.0 blade-service-api ${project.artifactId} - 2.3.1.RELEASE + 2.4.0.RELEASE pom BladeX 微服务API集合 diff --git a/blade-service/blade-demo/pom.xml b/blade-service/blade-demo/pom.xml index 3b60c9467..5f99a8c0d 100644 --- a/blade-service/blade-demo/pom.xml +++ b/blade-service/blade-demo/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-service - 2.3.1.RELEASE + 2.4.0.RELEASE 4.0.0 @@ -27,11 +27,7 @@ org.springblade - blade-starter-minio - - - org.springblade - blade-starter-qiniu + blade-starter-oss-all org.springblade diff --git a/blade-service/pom.xml b/blade-service/pom.xml index 5a6e2f040..6b2f88da4 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -7,12 +7,12 @@ org.springblade BladeX-Biz - 2.3.1.RELEASE + 2.4.0.RELEASE blade-service ${project.artifactId} - 2.3.1.RELEASE + 2.4.0.RELEASE pom BladeX 微服务集合 diff --git a/pom.xml b/pom.xml index ea4a3ecd1..9dbd8fab3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ org.springblade BladeX-Biz - 2.3.1.RELEASE + 2.4.0.RELEASE pom - 2.3.1.RELEASE + 2.4.0.RELEASE 1.8 @@ -40,14 +40,14 @@ org.springblade.platform blade-bom - ${project.version} + ${bladex.project.version} pom import org.springblade blade-common - ${project.version} + ${bladex.project.version} org.springframework.boot diff --git a/script/docker/app/.env b/script/docker/app/.env index 44890564d..c8448c721 100644 --- a/script/docker/app/.env +++ b/script/docker/app/.env @@ -1,2 +1,2 @@ REGISTER=192.168.0.157/blade -TAG=2.3.1.RELEASE +TAG=2.4.0.RELEASE