!153 v3.1.4.0

Merge pull request !153 from 码匠君/develop
dromara · Sep 21, 2023 · c534d4b · c534d4b
2 parents 15f1c84 + c83eed2
commit c534d4b
Show file tree

Hide file tree

Showing 33 changed files with 41 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -6,16 +6,16 @@
 
 <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.2-blue.svg?logo=spring" alt="Spring Authorization Server 1.1.2"></a>
-    <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://img.shields.io/badge/Spring%20Boot-3.1.3-blue.svg?logo=spring" alt="Spring Boot 3.1.3"></a>
+    <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://img.shields.io/badge/Spring%20Boot-3.1.4-blue.svg?logo=spring" alt="Spring Boot 3.1.4"></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.12.1--2022.0.4-blue.svg?logo=tencentqq" alt="Spring Cloud Tencent 1.12.1-2022.0.4"></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.3.6-red.svg?logo=spring" alt="Version 3.1.3.6"></a>
-    <a href="https://gitee.com/herodotus/dante-engine" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.1.3.6-red.svg?logo=spring" alt="Dante Engine 3.1.3.6"></a>
-    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.1.3.6-red.svg?logo=spring" alt="Dante OSS 3.1.3.6"></a>
+    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.1.4.0-red.svg?logo=spring" alt="Version 3.1.4.0"></a>
+    <a href="https://gitee.com/herodotus/dante-engine" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.1.4.0-red.svg?logo=spring" alt="Dante Engine 3.1.4.0"></a>
+    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.1.4.0-red.svg?logo=spring" alt="Dante OSS 3.1.4.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>
@@ -38,7 +38,7 @@
 
 ## 企业级技术中台微服务架构与服务能力开发平台
 
-Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和服务能力开发平台，是采用领域驱动模型(DDD)设计思想的、全面拥抱 Spring Authorization Server 的、基于 OAuth2.1 协议的、支持智能电视、IoT等物联网设备认证的微服务架构。基于 Spring Authorization Server 1.1.2、Spring Boot 3.1.3、Spring Cloud 2022.0.4、Spring Cloud Tencent 1.12.1-2022.0.4、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.2、Spring Boot 3.1.4、Spring Cloud 2022.0.4、Spring Cloud Tencent 1.12.1-2022.0.4、Spring Cloud Alibaba 2022.0.0.0、Nacos 2.2.4 等主流技术栈开发的多租户系统，遵循SpringBoot 编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能。
 
 ## 定位
 
@@ -57,7 +57,11 @@ Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和
 
 > Dante Cloud 一直秉承“简洁、高效、包容、务实”的理念，不会采取任何额外的手段来获取更多的 Star，绝对真实就像其产品一样。如果你认可和喜欢 Dante Cloud，请不要吝啬你的赞美，项目右上角点颗小星星。
 
-## Dante Cloud 3.0.0 新特性
+## 说明
+
+因 Spring Boot 2.7.X 和 3.0.X 将分别于 2023年11月18日 和 2023年11月24日 停止维护，考虑到技术发展趋势，决定停止 Dante Cloud 2.7.X 版本代码的维护，专注 3.1.X 维护及 3.2.X 开发。2.7.16.Final 版本是 Dante Cloud 2.7.X 系列最后一个版本，代码仍旧会保留，可在工程 2.7.X 分支中获取。
+
+## Dante Cloud 3.1.X 新特性
 
 ### 1. 核心基础依赖便捷切换
 
@@ -143,12 +147,12 @@ Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和
 
 | 组件                          | 版本              |
 |-----------------------------|-----------------|
-| Spring Boot                 | 3.1.3           |
+| Spring Boot                 | 3.1.4           |
 | Spring Cloud                | 2022.0.4        |
 | Spring Cloud Alibaba        | 2022.0.0.0      |
 | Spring Cloud Tencent        | 1.12.1-2022.0.4 |
 | Spring Authorization Server | 1.1.2           |
-| Spring Boot Admin           | 3.1.5           |
+| Spring Boot Admin           | 3.1.6           |
 | Nacos                       | 2.2.4           |
 | Sentinel                    | 1.8.6           |
 | Seata                       | 1.7.0           |

diff --git a/configurations/backup/alibaba/3.1.3.0/nacos_config_export_20230824162053.zip b/configurations/backup/alibaba/3.1.3.0/nacos_config_export_20230824162053.zip
diff --git a/configurations/backup/alibaba/3.1.3.1/nacos_config_export_20230824162053.zip b/configurations/backup/alibaba/3.1.3.1/nacos_config_export_20230824162053.zip
diff --git a/configurations/backup/alibaba/3.1.3.2/nacos_config_export_20230824162053.zip b/configurations/backup/alibaba/3.1.3.2/nacos_config_export_20230824162053.zip
diff --git a/configurations/backup/alibaba/3.1.3.3/nacos_config_export_20230903112422.zip b/configurations/backup/alibaba/3.1.3.3/nacos_config_export_20230903112422.zip
diff --git a/configurations/backup/alibaba/3.1.3.5/nacos_config_export_20230903112422.zip b/configurations/backup/alibaba/3.1.3.5/nacos_config_export_20230903112422.zip
diff --git a/....4/nacos_config_export_20230903112422.zip → ....0/nacos_config_export_20230914231708.zip b/....4/nacos_config_export_20230903112422.zip → ....0/nacos_config_export_20230914231708.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.3.6
+VERSION=3.1.4.0
 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-09-07T02-05-02Z
+    image: quay.io/minio/minio:RELEASE.2023-09-20T22-49-55Z
     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.3.6
+VERSION=3.1.4.0
 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-09-07T02-05-02Z
+    image: quay.io/minio/minio:RELEASE.2023-09-20T22-49-55Z
     container_name: minio
     hostname: minio
     ports:

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <groupId>cn.herodotus.engine</groupId>
         <artifactId>dependencies</artifactId>
-        <version>3.1.3.6</version>
+        <version>3.1.4.0</version>
         <relativePath/>
     </parent>
 

diff --git a/modules/dante-module-common/pom.xml b/modules/dante-module-common/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.3.6</version>
+        <version>3.1.4.0</version>
     </parent>
 
     <artifactId>dante-module-common</artifactId>

diff --git a/modules/dante-module-metadata/pom.xml b/modules/dante-module-metadata/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.3.6</version>
+        <version>3.1.4.0</version>
     </parent>
 
     <artifactId>dante-module-metadata</artifactId>

diff --git a/modules/dante-module-security/pom.xml b/modules/dante-module-security/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.3.6</version>
+        <version>3.1.4.0</version>
     </parent>
 
     <artifactId>dante-module-security</artifactId>

diff --git a/modules/dante-module-social/pom.xml b/modules/dante-module-social/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.3.6</version>
+        <version>3.1.4.0</version>
     </parent>
 
     <artifactId>dante-module-social</artifactId>

diff --git a/modules/dante-module-strategy/pom.xml b/modules/dante-module-strategy/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.3.6</version>
+        <version>3.1.4.0</version>
     </parent>
 
     <artifactId>dante-module-strategy</artifactId>

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

diff --git a/packages/authentication-spring-boot-starter/pom.xml b/packages/authentication-spring-boot-starter/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.3.6</version>
+        <version>3.1.4.0</version>
     </parent>
 
     <artifactId>authentication-spring-boot-starter</artifactId>

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.3.6</version>
+        <version>3.1.4.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

diff --git a/packages/service-spring-boot-starter/pom.xml b/packages/service-spring-boot-starter/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.3.6</version>
+        <version>3.1.4.0</version>
     </parent>
 
     <artifactId>service-spring-boot-starter</artifactId>

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

diff --git a/platform/dante-cloud-message/pom.xml b/platform/dante-cloud-message/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>cn.herodotus.dante</groupId>
         <artifactId>platform</artifactId>
-        <version>3.1.3.6</version>
+        <version>3.1.4.0</version>
     </parent>
 
     <artifactId>dante-cloud-message</artifactId>

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.3.6</version>
+        <version>3.1.4.0</version>
     </parent>
 
     <artifactId>dante-cloud-monitor</artifactId>
-    <version>3.1.3.6</version>
+    <version>3.1.4.0</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,7 +32,7 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.3.6</version>
+        <version>3.1.4.0</version>
     </parent>
 
     <artifactId>dante-cloud-uaa</artifactId>

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.3.6</version>
+        <version>3.1.4.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dante-cloud-upms</artifactId>
-    <version>3.1.3.6</version>
+    <version>3.1.4.0</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.3.6</version>
+        <version>3.1.4.0</version>
     </parent>
 
     <artifactId>platform</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <groupId>cn.herodotus.dante</groupId>
         <artifactId>dependencies</artifactId>
-        <version>3.1.3.6</version>
+        <version>3.1.4.0</version>
         <relativePath>dependencies/pom.xml</relativePath>
     </parent>
 

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.3.6</version>
+        <version>3.1.4.0</version>
     </parent>
 
     <artifactId>dante-cloud-bpmn-ability</artifactId>
-    <version>3.1.3.6</version>
+    <version>3.1.4.0</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,7 +32,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.3.6</version>
+        <version>3.1.4.0</version>
     </parent>
 
     <artifactId>dante-cloud-bpmn-logic</artifactId>

diff --git a/services/dante-cloud-oss-ability/pom.xml b/services/dante-cloud-oss-ability/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>cn.herodotus.dante</groupId>
         <artifactId>services</artifactId>
-        <version>3.1.3.6</version>
+        <version>3.1.4.0</version>
     </parent>
 
     <artifactId>dante-cloud-oss-ability</artifactId>

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