Skip to content

Commit

Permalink
!207 v3.2.6.0
Browse files Browse the repository at this point in the history 
Merge pull request !207 from 码匠君/develop
  • Loading branch information
@herodotus-ecosystem @gitee-org
herodotus-ecosystem authored and gitee-org committed May 23, 2024
2 parents 3605c8a + 3fc91fb commit bea85f4
Show file tree
Hide file tree
Showing 32 changed files with 39 additions and 39 deletions.
26 changes: 13 additions & 13 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.4-blue.svg?logo=spring" alt="Spring Authorization Server 1.2.4"></a>
<a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://img.shields.io/badge/Spring%20Boot-3.2.5-blue.svg?logo=spring" alt="Spring Boot 3.2.5"></a>
<a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://img.shields.io/badge/Spring%20Boot-3.2.6-blue.svg?logo=spring" alt="Spring Boot 3.2.6"></a>
<a href="https://spring.io/projects/spring-cloud" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud-2023.0.1-blue.svg?logo=spring" alt="Spring Cloud 2023.0.1"></a>
<a href="https://github.com/alibaba/spring-cloud-alibaba" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud%20Alibaba-2023.0.1.0-blue.svg?logo=alibabadotcom" alt="Spring Cloud Alibaba 2023.0.1.0"></a>
<a href="https://github.com/Tencent/spring-cloud-tencent" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud%20Tencent-1.14.0--2023.0.0-blue.svg?logo=tencentqq" alt="Spring Cloud Tencent 1.14.0--2023.0.0-SNAPSHOT"></a>
<a href="https://nacos.io/zh-cn/index.html" target="_blank"><img src="https://img.shields.io/badge/Nacos-2.3.2-brightgreen.svg?logo=alibabadotcom" alt="Nacos 2.3.2"></a>
</p>
<p align="center">
<a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.2.5.4-red.svg?logo=spring" alt="Version 3.2.5.4"></a>
<a href="https://gitee.com/herodotus/dante-engine" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.2.5.4-red.svg?logo=spring" alt="Dante Engine 3.2.5.4"></a>
<a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.2.5.4-red.svg?logo=spring" alt="Dante OSS 3.2.5.4"></a>
<a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.2.6.0-red.svg?logo=spring" alt="Version 3.2.6.0"></a>
<a href="https://gitee.com/herodotus/dante-engine" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.2.6.0-red.svg?logo=spring" alt="Dante Engine 3.2.6.0"></a>
<a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.2.6.0-red.svg?logo=spring" alt="Dante OSS 3.2.6.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>
Expand Down Expand Up @@ -143,7 +143,7 @@ Dante Cloud (但丁，原 Eurynome Cloud) 是以「**高质量代码、低安

| 组件 | 版本 |
|-----------------------------|-----------------|
| Spring Boot | 3.2.5 |
| Spring Boot | 3.2.6 |
| Spring Cloud | 2023.0.1 |
| Spring Cloud Alibaba | 2023.0.1.0 |
| Spring Cloud Tencent | 1.14.0-2023.0.0 |
Expand Down Expand Up @@ -198,14 +198,14 @@ Dante Cloud (但丁，原 Eurynome Cloud) 是以「**高质量代码、低安

### 二、分支说明

| 分支名称 | 对应 Spring 生态版本 | 对应 JDK 版本 | 用途 | 现状 |
|------------------------|-----------------------------------------|-----------|--------------------|---------------------------------------------------------|
| master | Spring Boot 3.2 和 Spring Cloud 2023.0.1 | JDK 17 | 主要发布分支 | 可使用，但 Spring Cloud Alibaba、Tencent 等生态并未发布正式适配版，请谨慎选择使用 |
| develop | Spring Boot 3.2 和 Spring Cloud 2023.0.1 | JDK 17 | Development 分支 | 新功能、ISSUE 均以此分支作为开发，发布后会 PR 至 master 分支。开发分支不保证可用 |
| reactive-develop | Spring Boot 3.2 和 Spring Cloud 2023.0.1 | JDK 21 | 响应式 Development 分支 | 下一代响应式微服务版本开发分支。开发分支不保证可用 |
| 3.1.X | Spring Boot 3.1 和 Spring Cloud 2022.0.X | JDK 17 | Stable 代码分支 | 稳定可用版本分支，2024年5月，Spring Boot 3.3 发布后将会停止维护 |
| 2.7.X | Spring Boot 2.7 和 Spring Cloud 2021.0.X | JDK 8 | 历史代码分支 | 基于 Spring Boot 2.7 时代开发的代码分支，不再维护 |
| spring-security-oauth2 | Spring Boot 2.6 和 Spring Cloud 2021.0.X | JDK 8 | 历史代码分支 | 基于原 Spring Security OAuth2 实现的微服务，因相关组件均不在维护，所以该版本不再维护 |
| 分支名称 | 对应 Spring 生态版本 | 对应 JDK 版本 | 用途 | 现状 |
|------------------------|-----------------------------------------|-----------|--------------------|-------------------------------------------------------------|
| master | Spring Boot 3.2 和 Spring Cloud 2023.0.1 | JDK 17 | 主要发布分支 | 可使用，但 Spring Cloud Alibaba、Tencent 等生态并未发布正式适配版，请谨慎选择使用 |
| develop | Spring Boot 3.2 和 Spring Cloud 2023.0.1 | JDK 17 | Development 分支 | 新功能、ISSUE 均以此分支作为开发，发布后会 PR 至 master 分支。开发分支不保证可用 |
| reactive-develop | Spring Boot 3.2 和 Spring Cloud 2023.0.1 | JDK 21 | 响应式 Development 分支 | 下一代响应式微服务版本开发分支。开发分支不保证可用 |
| 3.1.X | Spring Boot 3.1 和 Spring Cloud 2022.0.X | JDK 17 | 历史代码，不再维护 | 基于 Spring Boot 3.1 时代开发的代码分支，稳定可用，不再维护 |
| 2.7.X | Spring Boot 2.7 和 Spring Cloud 2021.0.X | JDK 8 | 历史代码，不再维护 | 基于 Spring Boot 2.7 时代开发的代码分支，稳定可用，不再维护 |
| spring-security-oauth2 | Spring Boot 2.6 和 Spring Cloud 2021.0.X | JDK 8 | 历史代码，不再维护 | 基于原 Spring Security OAuth2 实现的微服务，稳定可用，因相关组件均不在维护，所以该版本不再维护 |

## [5]、工程结构

Expand Down
Binary file removed configurations/backup/alibaba/3.2.5.1/nacos_config_export_20240114153144.zip
View file
Binary file not shown.
Binary file removed configurations/backup/alibaba/3.2.5.2/nacos_config_export_20240114153144.zip
View file
Binary file not shown.
Binary file removed configurations/backup/alibaba/3.2.5.3/nacos_config_export_20240114153144.zip
View file
Binary file not shown.
0 ....0/nacos_config_export_20240114153144.zip → ....0/nacos_config_export_20240114153144.zip
View file
File renamed without changes.
Binary file removed configurations/backup/tencent/3.2.5.1/polaris_config_202401141533.zip
View file
Binary file not shown.
Binary file removed configurations/backup/tencent/3.2.5.2/polaris_config_202401141533.zip
View file
Binary file not shown.
Binary file removed configurations/backup/tencent/3.2.5.3/polaris_config_202401141533.zip
View file
Binary file not shown.
0 ...t/3.2.5.0/polaris_config_202401141533.zip → ...t/3.2.6.0/polaris_config_202401141533.zip
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion configurations/docker/docker-compose/linux/herodotus/.env
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=3.2.5.4
VERSION=3.2.6.0
GATEWAY_SERVICE_NAME=dante-cloud-gateway
GATEWAY_SERVICE_PORT=8847
UAA_SERVICE_NAME=dante-cloud-uaa
Expand Down
2 changes: 1 addition & 1 deletion configurations/docker/docker-compose/windows/herodotus/.env
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=3.2.5.4
VERSION=3.2.6.0
GATEWAY_SERVICE_NAME=dante-cloud-gateway
GATEWAY_SERVICE_PORT=8847
UAA_SERVICE_NAME=dante-cloud-uaa
Expand Down
2 changes: 1 addition & 1 deletion dependencies/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<parent>
<groupId>cn.herodotus.engine</groupId>
<artifactId>dependencies</artifactId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>
<relativePath/>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/dante-module-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<parent>
<artifactId>modules</artifactId>
<groupId>cn.herodotus.dante</groupId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>
</parent>

<artifactId>dante-module-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion modules/dante-module-metadata/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<parent>
<artifactId>modules</artifactId>
<groupId>cn.herodotus.dante</groupId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>
</parent>

<artifactId>dante-module-metadata</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion modules/dante-module-social/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<parent>
<artifactId>modules</artifactId>
<groupId>cn.herodotus.dante</groupId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>
</parent>

<artifactId>dante-module-social</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion modules/dante-module-strategy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<parent>
<artifactId>modules</artifactId>
<groupId>cn.herodotus.dante</groupId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>
</parent>

<artifactId>dante-module-strategy</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion modules/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<parent>
<artifactId>dante-cloud</artifactId>
<groupId>cn.herodotus.dante</groupId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>
</parent>

<artifactId>modules</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion packages/authentication-spring-boot-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<parent>
<artifactId>packages</artifactId>
<groupId>cn.herodotus.dante</groupId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>
</parent>

<artifactId>authentication-spring-boot-starter</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion packages/facility-spring-boot-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<parent>
<artifactId>packages</artifactId>
<groupId>cn.herodotus.dante</groupId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion packages/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<parent>
<artifactId>dante-cloud</artifactId>
<groupId>cn.herodotus.dante</groupId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>
</parent>

<artifactId>packages</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion packages/service-spring-boot-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<parent>
<artifactId>packages</artifactId>
<groupId>cn.herodotus.dante</groupId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>
</parent>

<artifactId>service-spring-boot-starter</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion platform/dante-cloud-gateway/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<parent>
<artifactId>platform</artifactId>
<groupId>cn.herodotus.dante</groupId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>
</parent>

<artifactId>dante-cloud-gateway</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion platform/dante-cloud-message/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<parent>
<groupId>cn.herodotus.dante</groupId>
<artifactId>platform</artifactId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>
</parent>

<artifactId>dante-cloud-message</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions platform/dante-cloud-monitor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
<parent>
<artifactId>platform</artifactId>
<groupId>cn.herodotus.dante</groupId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>
</parent>

<artifactId>dante-cloud-monitor</artifactId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>
<name>dante-cloud-monitor</name>
<description>dante-cloud-monitor</description>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion platform/dante-cloud-uaa/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<parent>
<artifactId>platform</artifactId>
<groupId>cn.herodotus.dante</groupId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>
</parent>

<artifactId>dante-cloud-uaa</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions platform/dante-cloud-upms/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
<parent>
<artifactId>platform</artifactId>
<groupId>cn.herodotus.dante</groupId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>dante-cloud-upms</artifactId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion platform/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<parent>
<artifactId>dante-cloud</artifactId>
<groupId>cn.herodotus.dante</groupId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>
</parent>

<artifactId>platform</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<parent>
<groupId>cn.herodotus.dante</groupId>
<artifactId>dependencies</artifactId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>
<relativePath>dependencies/pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions services/dante-cloud-bpmn-ability/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
<parent>
<artifactId>services</artifactId>
<groupId>cn.herodotus.dante</groupId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>
</parent>

<artifactId>dante-cloud-bpmn-ability</artifactId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>

<name>dante-cloud-bpmn-ability</name>
<description>基于Camunda工作流的服务</description>
Expand Down
2 changes: 1 addition & 1 deletion services/dante-cloud-bpmn-logic/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<parent>
<artifactId>services</artifactId>
<groupId>cn.herodotus.dante</groupId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>
</parent>

<artifactId>dante-cloud-bpmn-logic</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion services/dante-cloud-oss-ability/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<parent>
<groupId>cn.herodotus.dante</groupId>
<artifactId>services</artifactId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>
</parent>

<artifactId>dante-cloud-oss-ability</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion services/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<parent>
<artifactId>dante-cloud</artifactId>
<groupId>cn.herodotus.dante</groupId>
<version>3.2.5.4</version>
<version>3.2.6.0</version>
</parent>

<artifactId>services</artifactId>
Expand Down

0 comments on commit bea85f4

Please sign in to comment.