From 942701ce01ab58d94911a5a5b7e065acc8889113 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Wed, 4 Mar 2020 13:10:18 +0800
Subject: [PATCH] =?UTF-8?q?:tada:=202.6.2.RELEASE,=E5=8D=87=E7=BA=A7?=
=?UTF-8?q?=E6=94=AF=E6=8C=81Seata1.1,=E6=94=AF=E6=8C=81=E9=98=BF=E9=87=8C?=
=?UTF-8?q?=E4=BA=91oss?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 6 +++---
blade-auth/pom.xml | 2 +-
blade-common/pom.xml | 2 +-
blade-gateway/pom.xml | 2 +-
blade-ops/blade-admin/pom.xml | 2 +-
blade-ops/blade-develop/pom.xml | 2 +-
blade-ops/blade-resource/pom.xml | 2 +-
blade-ops/blade-seata-order/pom.xml | 2 +-
.../src/main/resources/application-dev.yml | 14 +++++++-------
blade-ops/blade-seata-storage/pom.xml | 2 +-
.../src/main/resources/application-dev.yml | 14 +++++++-------
blade-ops/pom.xml | 2 +-
blade-service-api/blade-demo-api/pom.xml | 2 +-
blade-service-api/blade-desk-api/pom.xml | 2 +-
blade-service-api/blade-dict-api/pom.xml | 2 +-
blade-service-api/blade-system-api/pom.xml | 2 +-
blade-service-api/blade-user-api/pom.xml | 2 +-
blade-service-api/pom.xml | 4 ++--
blade-service/blade-demo/pom.xml | 2 +-
blade-service/blade-desk/pom.xml | 2 +-
blade-service/blade-log/pom.xml | 2 +-
blade-service/blade-system/pom.xml | 2 +-
blade-service/blade-user/pom.xml | 2 +-
blade-service/pom.xml | 4 ++--
pom.xml | 10 +++++-----
script/docker/.env | 2 +-
26 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/README.md b/README.md
index f48ce6d..921520f 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
<p align="center">
- <img src="https://img.shields.io/badge/Release-V2.6.1-green.svg" alt="Downloads">
+ <img src="https://img.shields.io/badge/Release-V2.6.2-green.svg" alt="Downloads">
<img src="https://img.shields.io/badge/JDK-1.8+-green.svg" alt="Build Status">
<img src="https://img.shields.io/badge/license-Apache%202-blue.svg" alt="Build Status">
- <img src="https://img.shields.io/badge/Spring%20Cloud-Hoxton.SR1-blue.svg" alt="Coverage Status">
- <img src="https://img.shields.io/badge/Spring%20Boot-2.2.4.RELEASE-blue.svg" alt="Downloads">
+ <img src="https://img.shields.io/badge/Spring%20Cloud-Hoxton.SR2-blue.svg" alt="Coverage Status">
+ <img src="https://img.shields.io/badge/Spring%20Boot-2.2.5.RELEASE-blue.svg" alt="Downloads">
<a target="_blank" href="https://bladex.vip">
<img src="https://img.shields.io/badge/Author-Small%20Chill-ff69b4.svg" alt="Downloads">
</a>
diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml
index 30c30d0..4807d45 100644
--- a/blade-auth/pom.xml
+++ b/blade-auth/pom.xml
@@ -8,7 +8,7 @@
<parent>
<artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
<artifactId>blade-auth</artifactId>
diff --git a/blade-common/pom.xml b/blade-common/pom.xml
index 6a27646..f09aa45 100644
--- a/blade-common/pom.xml
+++ b/blade-common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml
index 3870c3c..48544d1 100644
--- a/blade-gateway/pom.xml
+++ b/blade-gateway/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml
index 50a7cb4..4eefae8 100644
--- a/blade-ops/blade-admin/pom.xml
+++ b/blade-ops/blade-admin/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml
index 51b3d53..efa56c7 100644
--- a/blade-ops/blade-develop/pom.xml
+++ b/blade-ops/blade-develop/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>blade-ops</artifactId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml
index af1faf1..be49f6a 100644
--- a/blade-ops/blade-resource/pom.xml
+++ b/blade-ops/blade-resource/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/blade-ops/blade-seata-order/pom.xml b/blade-ops/blade-seata-order/pom.xml
index 839076b..9a042ed 100644
--- a/blade-ops/blade-seata-order/pom.xml
+++ b/blade-ops/blade-seata-order/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/blade-ops/blade-seata-order/src/main/resources/application-dev.yml b/blade-ops/blade-seata-order/src/main/resources/application-dev.yml
index 14e5433..4f39516 100644
--- a/blade-ops/blade-seata-order/src/main/resources/application-dev.yml
+++ b/blade-ops/blade-seata-order/src/main/resources/application-dev.yml
@@ -11,7 +11,6 @@ spring:
# seata配置
seata:
- tx-service-group: blade-seata-order-group
#registry:
# type: nacos
# nacos:
@@ -20,12 +19,13 @@ seata:
# type: nacos
# nacos:
# server-addr: localhost
+ tx-service-group: blade-seata-order-group
service:
- grouplist: 127.0.0.1:8091
- vgroup-mapping: default
+ grouplist:
+ default: 127.0.0.1:8091
+ vgroup-mapping:
+ blade-seata-order-group: default
disable-global-transaction: false
client:
- support:
- spring:
- datasource-autoproxy: false
- rm-report-success-enable: false
+ rm:
+ report-success-enable: false
diff --git a/blade-ops/blade-seata-storage/pom.xml b/blade-ops/blade-seata-storage/pom.xml
index 61e570c..aceac62 100644
--- a/blade-ops/blade-seata-storage/pom.xml
+++ b/blade-ops/blade-seata-storage/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/blade-ops/blade-seata-storage/src/main/resources/application-dev.yml b/blade-ops/blade-seata-storage/src/main/resources/application-dev.yml
index 3118022..8e8a376 100644
--- a/blade-ops/blade-seata-storage/src/main/resources/application-dev.yml
+++ b/blade-ops/blade-seata-storage/src/main/resources/application-dev.yml
@@ -11,7 +11,6 @@ spring:
# seata配置
seata:
- tx-service-group: blade-seata-storage-group
#registry:
# type: nacos
# nacos:
@@ -20,12 +19,13 @@ seata:
# type: nacos
# nacos:
# server-addr: localhost
+ tx-service-group: blade-seata-storage-group
service:
- grouplist: 127.0.0.1:8091
- vgroup-mapping: default
+ grouplist:
+ default: 127.0.0.1:8091
+ vgroup-mapping:
+ blade-seata-storage-group: default
disable-global-transaction: false
client:
- support:
- spring:
- datasource-autoproxy: false
- rm-report-success-enable: false
+ rm:
+ report-success-enable: false
diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml
index d1dd745..1dcdaad 100644
--- a/blade-ops/pom.xml
+++ b/blade-ops/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/blade-service-api/blade-demo-api/pom.xml b/blade-service-api/blade-demo-api/pom.xml
index 11e595b..f7c5ece 100644
--- a/blade-service-api/blade-demo-api/pom.xml
+++ b/blade-service-api/blade-demo-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml
index c59fdf8..5537491 100644
--- a/blade-service-api/blade-desk-api/pom.xml
+++ b/blade-service-api/blade-desk-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/blade-service-api/blade-dict-api/pom.xml b/blade-service-api/blade-dict-api/pom.xml
index 4a7e48a..0258ad7 100644
--- a/blade-service-api/blade-dict-api/pom.xml
+++ b/blade-service-api/blade-dict-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/blade-service-api/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml
index 8928f00..038b9b5 100644
--- a/blade-service-api/blade-system-api/pom.xml
+++ b/blade-service-api/blade-system-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/blade-service-api/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml
index 4a0fb24..c67feab 100644
--- a/blade-service-api/blade-user-api/pom.xml
+++ b/blade-service-api/blade-user-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml
index c7b39a3..1309cf5 100644
--- a/blade-service-api/pom.xml
+++ b/blade-service-api/pom.xml
@@ -5,13 +5,13 @@
<parent>
<artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>blade-service-api</artifactId>
<name>${project.artifactId}</name>
- <version>2.6.1</version>
+ <version>2.6.2</version>
<packaging>pom</packaging>
<description>SpringBlade 微服务API集合</description>
diff --git a/blade-service/blade-demo/pom.xml b/blade-service/blade-demo/pom.xml
index 8687f7a..3d14754 100644
--- a/blade-service/blade-demo/pom.xml
+++ b/blade-service/blade-demo/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml
index 6a7bfeb..516448c 100644
--- a/blade-service/blade-desk/pom.xml
+++ b/blade-service/blade-desk/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>blade-service</artifactId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/blade-service/blade-log/pom.xml b/blade-service/blade-log/pom.xml
index 8d562d0..e96b700 100644
--- a/blade-service/blade-log/pom.xml
+++ b/blade-service/blade-log/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml
index 8135b5a..1d7b70b 100644
--- a/blade-service/blade-system/pom.xml
+++ b/blade-service/blade-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml
index f1ed881..033c67e 100644
--- a/blade-service/blade-user/pom.xml
+++ b/blade-service/blade-user/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/blade-service/pom.xml b/blade-service/pom.xml
index b767548..a04e6db 100644
--- a/blade-service/pom.xml
+++ b/blade-service/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>SpringBlade</artifactId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
<artifactId>blade-service</artifactId>
<name>${project.artifactId}</name>
- <version>2.6.1</version>
+ <version>2.6.2</version>
<packaging>pom</packaging>
<description>SpringBlade 微服务集合</description>
diff --git a/pom.xml b/pom.xml
index d446294..23d5105 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
<groupId>org.springblade</groupId>
<artifactId>SpringBlade</artifactId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
<packaging>pom</packaging>
<properties>
- <blade.tool.version>2.6.1</blade.tool.version>
- <blade.project.version>2.6.1</blade.project.version>
+ <blade.tool.version>2.6.2</blade.tool.version>
+ <blade.project.version>2.6.2</blade.project.version>
<java.version>1.8</java.version>
<maven.plugin.version>3.8.1</maven.plugin.version>
@@ -24,8 +24,8 @@
<alibaba.cloud.version>2.2.0.RELEASE</alibaba.cloud.version>
<spring.boot.admin.version>2.2.2</spring.boot.admin.version>
- <spring.boot.version>2.2.4.RELEASE</spring.boot.version>
- <spring.cloud.version>Hoxton.SR1</spring.cloud.version>
+ <spring.boot.version>2.2.5.RELEASE</spring.boot.version>
+ <spring.cloud.version>Hoxton.SR2</spring.cloud.version>
<spring.platform.version>Cairo-SR8</spring.platform.version>
<!-- 推荐使用Harbor -->
diff --git a/script/docker/.env b/script/docker/.env
index 247f0b4..537b2c8 100644
--- a/script/docker/.env
+++ b/script/docker/.env
@@ -1,2 +1,2 @@
REGISTER=192.168.0.157/blade
-TAG=2.6.1
+TAG=2.6.2