🎉 2.6.2.RELEASE,升级支持Seata1.1,支持阿里云oss

2020-03-04 13:10:18 +08:00 · 2020-03-04 13:10:18 +08:00 · 942701ce01
parent 4cd8f66276
commit 942701ce01
26 changed files with 46 additions and 46 deletions
--- 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>
--- 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>
--- 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>

--- 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>

--- 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>

--- 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>
--- 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>

--- 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>

--- 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
--- 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>

--- 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
--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>
--- 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>

--- 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>

--- 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>
--- 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>

--- 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 -->
--- 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