Skip to content

Commit bea85f4

Browse files
herodotus-ecosystemgitee-org
herodotus-ecosystem
authored and
gitee-org
committed
!207 v3.2.6.0
Merge pull request !207 from 码匠君/develop
2 parents 3605c8a + 3fc91fb commit bea85f4

File tree

32 files changed

+39
-39
lines changed

32 files changed

+39
-39
lines changed

‎README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66

77
<p align="center">
88
<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>
9-
<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>
9+
<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>
1010
<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>
1111
<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>
1212
<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>
1313
<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>
1414
</p>
1515
<p align="center">
16-
<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>
17-
<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>
18-
<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>
16+
<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>
17+
<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>
18+
<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>
1919
<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>
2020
<a href="./LICENSE"><img src="https://img.shields.io/badge/License-Apache--2.0-blue.svg?logo=apache" alt="License Apache 2.0"></a>
2121
<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>
@@ -143,7 +143,7 @@ Dante Cloud (但丁，原 Eurynome Cloud) 是以「**高质量代码、低安
143143

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

199199
### 二、分支说明
200200

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

210210
## [5]、工程结构
211211

‎configurations/backup/alibaba/3.2.5.1/nacos_config_export_20240114153144.zip

-12 KB
Binary file not shown.

‎configurations/backup/alibaba/3.2.5.2/nacos_config_export_20240114153144.zip

-12 KB
Binary file not shown.

‎configurations/backup/alibaba/3.2.5.3/nacos_config_export_20240114153144.zip

-12 KB
Binary file not shown.

‎configurations/backup/alibaba/3.2.5.0/nacos_config_export_20240114153144.zip renamed to ‎configurations/backup/alibaba/3.2.6.0/nacos_config_export_20240114153144.zip

File renamed without changes.

‎configurations/backup/tencent/3.2.5.1/polaris_config_202401141533.zip

-12.6 KB
Binary file not shown.

‎configurations/backup/tencent/3.2.5.2/polaris_config_202401141533.zip

-12.6 KB
Binary file not shown.

‎configurations/backup/tencent/3.2.5.3/polaris_config_202401141533.zip

-12.6 KB
Binary file not shown.

‎configurations/backup/tencent/3.2.5.0/polaris_config_202401141533.zip renamed to ‎configurations/backup/tencent/3.2.6.0/polaris_config_202401141533.zip

File renamed without changes.

‎configurations/docker/docker-compose/linux/herodotus/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION=3.2.5.4
1+
VERSION=3.2.6.0
22
GATEWAY_SERVICE_NAME=dante-cloud-gateway
33
GATEWAY_SERVICE_PORT=8847
44
UAA_SERVICE_NAME=dante-cloud-uaa

‎configurations/docker/docker-compose/windows/herodotus/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION=3.2.5.4
1+
VERSION=3.2.6.0
22
GATEWAY_SERVICE_NAME=dante-cloud-gateway
33
GATEWAY_SERVICE_PORT=8847
44
UAA_SERVICE_NAME=dante-cloud-uaa

‎dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<groupId>cn.herodotus.engine</groupId>
3434
<artifactId>dependencies</artifactId>
35-
<version>3.2.5.4</version>
35+
<version>3.2.6.0</version>
3636
<relativePath/>
3737
</parent>
3838

‎modules/dante-module-common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>modules</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.5.4</version>
35+
<version>3.2.6.0</version>
3636
</parent>
3737

3838
<artifactId>dante-module-common</artifactId>

‎modules/dante-module-metadata/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>modules</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.5.4</version>
35+
<version>3.2.6.0</version>
3636
</parent>
3737

3838
<artifactId>dante-module-metadata</artifactId>

‎modules/dante-module-social/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>modules</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.5.4</version>
35+
<version>3.2.6.0</version>
3636
</parent>
3737

3838
<artifactId>dante-module-social</artifactId>

‎modules/dante-module-strategy/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>modules</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.5.4</version>
35+
<version>3.2.6.0</version>
3636
</parent>
3737

3838
<artifactId>dante-module-strategy</artifactId>

‎modules/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>dante-cloud</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.5.4</version>
35+
<version>3.2.6.0</version>
3636
</parent>
3737

3838
<artifactId>modules</artifactId>

‎packages/authentication-spring-boot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>packages</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.5.4</version>
35+
<version>3.2.6.0</version>
3636
</parent>
3737

3838
<artifactId>authentication-spring-boot-starter</artifactId>

‎packages/facility-spring-boot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<parent>
3131
<artifactId>packages</artifactId>
3232
<groupId>cn.herodotus.dante</groupId>
33-
<version>3.2.5.4</version>
33+
<version>3.2.6.0</version>
3434
</parent>
3535
<modelVersion>4.0.0</modelVersion>
3636

‎packages/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>dante-cloud</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.5.4</version>
35+
<version>3.2.6.0</version>
3636
</parent>
3737

3838
<artifactId>packages</artifactId>

‎packages/service-spring-boot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>packages</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.5.4</version>
35+
<version>3.2.6.0</version>
3636
</parent>
3737

3838
<artifactId>service-spring-boot-starter</artifactId>

‎platform/dante-cloud-gateway/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>platform</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.5.4</version>
35+
<version>3.2.6.0</version>
3636
</parent>
3737

3838
<artifactId>dante-cloud-gateway</artifactId>

‎platform/dante-cloud-message/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<parent>
3232
<groupId>cn.herodotus.dante</groupId>
3333
<artifactId>platform</artifactId>
34-
<version>3.2.5.4</version>
34+
<version>3.2.6.0</version>
3535
</parent>
3636

3737
<artifactId>dante-cloud-message</artifactId>

‎platform/dante-cloud-monitor/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
<parent>
3131
<artifactId>platform</artifactId>
3232
<groupId>cn.herodotus.dante</groupId>
33-
<version>3.2.5.4</version>
33+
<version>3.2.6.0</version>
3434
</parent>
3535

3636
<artifactId>dante-cloud-monitor</artifactId>
37-
<version>3.2.5.4</version>
37+
<version>3.2.6.0</version>
3838
<name>dante-cloud-monitor</name>
3939
<description>dante-cloud-monitor</description>
4040
<dependencies>

‎platform/dante-cloud-uaa/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>platform</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.5.4</version>
35+
<version>3.2.6.0</version>
3636
</parent>
3737

3838
<artifactId>dante-cloud-uaa</artifactId>

‎platform/dante-cloud-upms/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
<parent>
3131
<artifactId>platform</artifactId>
3232
<groupId>cn.herodotus.dante</groupId>
33-
<version>3.2.5.4</version>
33+
<version>3.2.6.0</version>
3434
</parent>
3535
<modelVersion>4.0.0</modelVersion>
3636

3737
<artifactId>dante-cloud-upms</artifactId>
38-
<version>3.2.5.4</version>
38+
<version>3.2.6.0</version>
3939

4040
<dependencies>
4141
<dependency>

‎platform/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>dante-cloud</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.5.4</version>
35+
<version>3.2.6.0</version>
3636
</parent>
3737

3838
<artifactId>platform</artifactId>

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<groupId>cn.herodotus.dante</groupId>
3434
<artifactId>dependencies</artifactId>
35-
<version>3.2.5.4</version>
35+
<version>3.2.6.0</version>
3636
<relativePath>dependencies/pom.xml</relativePath>
3737
</parent>
3838

‎services/dante-cloud-bpmn-ability/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
<parent>
3232
<artifactId>services</artifactId>
3333
<groupId>cn.herodotus.dante</groupId>
34-
<version>3.2.5.4</version>
34+
<version>3.2.6.0</version>
3535
</parent>
3636

3737
<artifactId>dante-cloud-bpmn-ability</artifactId>
38-
<version>3.2.5.4</version>
38+
<version>3.2.6.0</version>
3939

4040
<name>dante-cloud-bpmn-ability</name>
4141
<description>基于Camunda工作流的服务</description>

‎services/dante-cloud-bpmn-logic/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>services</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.5.4</version>
35+
<version>3.2.6.0</version>
3636
</parent>
3737

3838
<artifactId>dante-cloud-bpmn-logic</artifactId>

‎services/dante-cloud-oss-ability/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<parent>
3232
<groupId>cn.herodotus.dante</groupId>
3333
<artifactId>services</artifactId>
34-
<version>3.2.5.4</version>
34+
<version>3.2.6.0</version>
3535
</parent>
3636

3737
<artifactId>dante-cloud-oss-ability</artifactId>

‎services/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>dante-cloud</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.5.4</version>
35+
<version>3.2.6.0</version>
3636
</parent>
3737

3838
<artifactId>services</artifactId>

0 commit comments

Comments
 (0)