!134 v3.1.2.1

Merge pull request !134 from 码匠君/develop
dromara · Jul 28, 2023 · b73d66d · b73d66d
2 parents db04828 + 063d758
commit b73d66d
Show file tree

Hide file tree

Showing 28 changed files with 57 additions and 57 deletions.
diff --git a/README.md b/README.md
@@ -7,15 +7,15 @@
 <p align="center">
     <a href="https://github.com/spring-projects/spring-authorization-server" target="_blank"><img src="https://img.shields.io/badge/Spring%20Authorization%20Server-1.1.1-blue.svg?logo=spring" alt="Spring Authorization Server 1.1.1"></a>
     <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://img.shields.io/badge/Spring%20Boot-3.1.2-blue.svg?logo=spring" alt="Spring Boot 3.1.2"></a>
-    <a href="https://spring.io/projects/spring-cloud" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud-2022.0.3-blue.svg?logo=spring" alt="Spring Cloud 2022.0.3"></a>
+    <a href="https://spring.io/projects/spring-cloud" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud-2022.0.4-blue.svg?logo=spring" alt="Spring Cloud 2022.0.4"></a>
     <a href="https://github.com/alibaba/spring-cloud-alibaba" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud%20Alibaba-2022.0.0.0-blue.svg?logo=alibabadotcom" alt="Spring Cloud Alibaba 2022.0.0.0"></a>
-    <a href="https://github.com/Tencent/spring-cloud-tencent" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud%20Tencent-1.11.7--2022.0.1-blue.svg?logo=tencentqq" alt="Spring Cloud Tencent 1.11.7-2022.0.1"></a>
+    <a href="https://github.com/Tencent/spring-cloud-tencent" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud%20Tencent-1.11.8--2022.0.1-blue.svg?logo=tencentqq" alt="Spring Cloud Tencent 1.11.8-2022.0.1"></a>
     <a href="https://nacos.io/zh-cn/index.html" target="_blank"><img src="https://img.shields.io/badge/Nacos-2.2.4-brightgreen.svg?logo=alibabadotcom" alt="Nacos 2.2.4"></a>
 </p>
 <p align="center">
-    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.1.2.0-red.svg?logo=spring" alt="Version 3.1.2.0"></a>
-    <a href="https://gitee.com/herodotus/dante-engine" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.1.2.0-red.svg?logo=spring" alt="Dante Engine 3.1.2.0"></a>
-    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-1.1.2-red.svg?logo=spring" alt="Dante OSS 1.1.2"></a>
+    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.1.2.1-red.svg?logo=spring" alt="Version 3.1.2.1"></a>
+    <a href="https://gitee.com/herodotus/dante-engine" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.1.2.1-red.svg?logo=spring" alt="Dante Engine 3.1.2.1"></a>
+    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-1.2.0-red.svg?logo=spring" alt="Dante OSS 1.2.0"></a>
     <a href="https://bell-sw.com/pages/downloads/#downloads" target="_blank"><img src="https://img.shields.io/badge/JDK-17%2B-green.svg?logo=openjdk" alt="Java 17"></a>
     <a href="./LICENSE"><img src="https://img.shields.io/badge/License-Apache--2.0-blue.svg?logo=apache" alt="License Apache 2.0"></a>
     <a href="https://www.herodotus.cn"><img src="https://visitor-badge.laobi.icu/badge?page_id=dante-cloud&title=Total%20Visits" alt="Total Visits"></a>
@@ -41,7 +41,7 @@
 
 ## 企业级技术中台微服务架构与服务能力开发平台
 
-Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和服务能力开发平台，是采用领域驱动模型(DDD)设计思想的、全面拥抱 Spring Authorization Server 的、基于 OAuth2.1 协议的、支持智能电视、IoT等物联网设备认证的微服务架构。基于 Spring Authorization Server 1.1.1、Spring Boot 3.1.2、Spring Cloud 2022.0.3、Spring Cloud Tencent 1.11.7-2022.0.1、Spring Cloud Alibaba 2022.0.0.0、Nacos 2.2.4 等主流技术栈开发的多租户系统，遵循SpringBoot 编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能。
+Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和服务能力开发平台，是采用领域驱动模型(DDD)设计思想的、全面拥抱 Spring Authorization Server 的、基于 OAuth2.1 协议的、支持智能电视、IoT等物联网设备认证的微服务架构。基于 Spring Authorization Server 1.1.1、Spring Boot 3.1.2、Spring Cloud 2022.0.4、Spring Cloud Tencent 1.11.8-2022.0.1、Spring Cloud Alibaba 2022.0.0.0、Nacos 2.2.4 等主流技术栈开发的多租户系统，遵循SpringBoot 编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能。
 
 ## 定位
 
@@ -147,14 +147,14 @@ Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和
 | 组件                          | 版本              |
 |-----------------------------|-----------------|
 | Spring Boot                 | 3.1.2           |
-| Spring Cloud                | 2022.0.3        |
+| Spring Cloud                | 2022.0.4        |
 | Spring Cloud Alibaba        | 2022.0.0.0      |
-| Spring Cloud Tencent        | 1.11.7-2022.0.1 |
+| Spring Cloud Tencent        | 1.11.8-2022.0.1 |
 | Spring Authorization Server | 1.1.1           |
 | Spring Boot Admin           | 3.1.3           |
 | Nacos                       | 2.2.4           |
-| Sentinel                    | 1.8.5           |
-| Seata                       | 1.5.2           |
+| Sentinel                    | 1.8.6           |
+| Seata                       | 1.7.0           |
 
 > Spring 全家桶版本对应关系，详见：[版本说明](https://github.com/alibaba/spring-cloud-alibaba/wiki/%E7%89%88%E6%9C%AC%E8%AF%B4%E6%98%8E)
 

diff --git a/....3/nacos_config_export_20230713230305.zip → ....1/nacos_config_export_20230713230305.zip b/....3/nacos_config_export_20230713230305.zip → ....1/nacos_config_export_20230713230305.zip
diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env
@@ -1,4 +1,4 @@
-VERSION=3.1.2.0
+VERSION=3.1.2.1
 GATEWAY_SERVICE_NAME=dante-cloud-gateway
 GATEWAY_SERVICE_PORT=8847
 UAA_SERVICE_NAME=dante-cloud-uaa

diff --git a/configurations/docker/docker-compose/linux/herodotus/env.oss.yml b/configurations/docker/docker-compose/linux/herodotus/env.oss.yml
@@ -1,7 +1,7 @@
 version: '3.8'
 services:
   minio:
-    image: quay.io/minio/minio:RELEASE.2023-07-18T17-49-40Z
+    image: quay.io/minio/minio:RELEASE.2023-07-21T21-12-44Z
     container_name: minio
     hostname: minio
     ports:

diff --git a/configurations/docker/docker-compose/windows/herodotus/.env b/configurations/docker/docker-compose/windows/herodotus/.env
@@ -1,4 +1,4 @@
-VERSION=3.1.2.0
+VERSION=3.1.2.1
 GATEWAY_SERVICE_NAME=dante-cloud-gateway
 GATEWAY_SERVICE_PORT=8847
 UAA_SERVICE_NAME=dante-cloud-uaa

diff --git a/configurations/docker/docker-compose/windows/herodotus/env.oss.yml b/configurations/docker/docker-compose/windows/herodotus/env.oss.yml
@@ -1,7 +1,7 @@
 version: '3.8'
 services:
   minio:
-    image: quay.io/minio/minio:RELEASE.2023-07-18T17-49-40Z
+    image: quay.io/minio/minio:RELEASE.2023-07-21T21-12-44Z
     container_name: minio
     hostname: minio
     ports:

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -32,13 +32,13 @@
     <parent>
         <groupId>cn.herodotus.engine</groupId>
         <artifactId>dependencies</artifactId>
-        <version>3.1.2.0</version>
+        <version>3.1.2.1</version>
         <relativePath/>
     </parent>
 
     <groupId>cn.herodotus.dante</groupId>
     <artifactId>dependencies</artifactId>
-    <version>3.1.2.0</version>
+    <version>3.1.2.1</version>
     <packaging>pom</packaging>
 
     <name>dante-cloud-dependencies</name>
@@ -58,7 +58,7 @@
     </developers>
 
     <properties>
-        <dante-oss-bom.version>1.1.2</dante-oss-bom.version>
+        <dante-oss-bom.version>1.2.0</dante-oss-bom.version>
     </properties>
 
     <!-- 管理依赖版本号,子项目不会默认依赖 -->

diff --git a/modules/dante-module-common/pom.xml b/modules/dante-module-common/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.2.0</version>
+        <version>3.1.2.1</version>
     </parent>
 
     <artifactId>dante-module-common</artifactId>
-    <version>3.1.2.0</version>
+    <version>3.1.2.1</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/modules/dante-module-metadata/pom.xml b/modules/dante-module-metadata/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.2.0</version>
+        <version>3.1.2.1</version>
     </parent>
 
     <artifactId>dante-module-metadata</artifactId>
-    <version>3.1.2.0</version>
+    <version>3.1.2.1</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/modules/dante-module-security/pom.xml b/modules/dante-module-security/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.2.0</version>
+        <version>3.1.2.1</version>
     </parent>
 
     <artifactId>dante-module-security</artifactId>
-    <version>3.1.2.0</version>
+    <version>3.1.2.1</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/modules/dante-module-social/pom.xml b/modules/dante-module-social/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.2.0</version>
+        <version>3.1.2.1</version>
     </parent>
 
     <artifactId>dante-module-social</artifactId>
-    <version>3.1.2.0</version>
+    <version>3.1.2.1</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/modules/dante-module-strategy/pom.xml b/modules/dante-module-strategy/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.2.0</version>
+        <version>3.1.2.1</version>
     </parent>
 
     <artifactId>dante-module-strategy</artifactId>
-    <version>3.1.2.0</version>
+    <version>3.1.2.1</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/modules/pom.xml b/modules/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.2.0</version>
+        <version>3.1.2.1</version>
     </parent>
 
     <artifactId>modules</artifactId>
-    <version>3.1.2.0</version>
+    <version>3.1.2.1</version>
     <packaging>pom</packaging>
 
     <name>dante-cloud-modules</name>

diff --git a/packages/authentication-spring-boot-starter/pom.xml b/packages/authentication-spring-boot-starter/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.2.0</version>
+        <version>3.1.2.1</version>
     </parent>
 
     <artifactId>authentication-spring-boot-starter</artifactId>
-    <version>3.1.2.0</version>
+    <version>3.1.2.1</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/packages/facility-spring-boot-starter/pom.xml b/packages/facility-spring-boot-starter/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.2.0</version>
+        <version>3.1.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/packages/pom.xml b/packages/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.2.0</version>
+        <version>3.1.2.1</version>
     </parent>
 
     <artifactId>packages</artifactId>
-    <version>3.1.2.0</version>
+    <version>3.1.2.1</version>
     <packaging>pom</packaging>
 
     <name>dante-cloud-packages</name>

diff --git a/packages/service-spring-boot-starter/pom.xml b/packages/service-spring-boot-starter/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.2.0</version>
+        <version>3.1.2.1</version>
     </parent>
 
     <artifactId>service-spring-boot-starter</artifactId>
-    <version>3.1.2.0</version>
+    <version>3.1.2.1</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/platform/dante-cloud-gateway/pom.xml b/platform/dante-cloud-gateway/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.2.0</version>
+        <version>3.1.2.1</version>
     </parent>
 
     <artifactId>dante-cloud-gateway</artifactId>
-    <version>3.1.2.0</version>
+    <version>3.1.2.1</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/platform/dante-cloud-message/pom.xml b/platform/dante-cloud-message/pom.xml
@@ -31,11 +31,11 @@
     <parent>
         <groupId>cn.herodotus.dante</groupId>
         <artifactId>platform</artifactId>
-        <version>3.1.2.0</version>
+        <version>3.1.2.1</version>
     </parent>
 
     <artifactId>dante-cloud-message</artifactId>
-    <version>3.1.2.0</version>
+    <version>3.1.2.1</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/platform/dante-cloud-monitor/pom.xml b/platform/dante-cloud-monitor/pom.xml
@@ -30,11 +30,11 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.2.0</version>
+        <version>3.1.2.1</version>
     </parent>
 
     <artifactId>dante-cloud-monitor</artifactId>
-    <version>3.1.2.0</version>
+    <version>3.1.2.1</version>
     <name>dante-cloud-monitor</name>
     <description>dante-cloud-monitor</description>
     <dependencies>

diff --git a/platform/dante-cloud-uaa/pom.xml b/platform/dante-cloud-uaa/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.2.0</version>
+        <version>3.1.2.1</version>
     </parent>
 
     <artifactId>dante-cloud-uaa</artifactId>
-    <version>3.1.2.0</version>
+    <version>3.1.2.1</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/platform/dante-cloud-upms/pom.xml b/platform/dante-cloud-upms/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.2.0</version>
+        <version>3.1.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dante-cloud-upms</artifactId>
-    <version>3.1.2.0</version>
+    <version>3.1.2.1</version>
 
     <dependencies>
         <dependency>

diff --git a/platform/pom.xml b/platform/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.2.0</version>
+        <version>3.1.2.1</version>
     </parent>
 
     <artifactId>platform</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -32,12 +32,12 @@
     <parent>
         <groupId>cn.herodotus.dante</groupId>
         <artifactId>dependencies</artifactId>
-        <version>3.1.2.0</version>
+        <version>3.1.2.1</version>
         <relativePath>dependencies/pom.xml</relativePath>
     </parent>
 
     <artifactId>dante-cloud</artifactId>
-    <version>3.1.2.0</version>
+    <version>3.1.2.1</version>
     <packaging>pom</packaging>
 
     <name>dante-cloud</name>

diff --git a/services/dante-cloud-bpmn-ability/pom.xml b/services/dante-cloud-bpmn-ability/pom.xml
@@ -31,11 +31,11 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.2.0</version>
+        <version>3.1.2.1</version>
     </parent>
 
     <artifactId>dante-cloud-bpmn-ability</artifactId>
-    <version>3.1.2.0</version>
+    <version>3.1.2.1</version>
 
     <name>dante-cloud-bpmn-ability</name>
     <description>基于Camunda工作流的服务</description>

diff --git a/services/dante-cloud-bpmn-logic/pom.xml b/services/dante-cloud-bpmn-logic/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.2.0</version>
+        <version>3.1.2.1</version>
     </parent>
 
     <artifactId>dante-cloud-bpmn-logic</artifactId>
-    <version>3.1.2.0</version>
+    <version>3.1.2.1</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/services/dante-cloud-oss-ability/pom.xml b/services/dante-cloud-oss-ability/pom.xml
@@ -31,11 +31,11 @@
     <parent>
         <groupId>cn.herodotus.dante</groupId>
         <artifactId>services</artifactId>
-        <version>3.1.2.0</version>
+        <version>3.1.2.1</version>
     </parent>
 
     <artifactId>dante-cloud-oss-ability</artifactId>
-    <version>3.1.2.0</version>
+    <version>3.1.2.1</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/services/pom.xml b/services/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.2.0</version>
+        <version>3.1.2.1</version>
     </parent>
 
     <artifactId>services</artifactId>
-    <version>3.1.2.0</version>
+    <version>3.1.2.1</version>
     <packaging>pom</packaging>
 
     <name>dante-cloud-services</name>