!191 v3.2.3.1

Merge pull request !191 from 码匠君/develop
dromara · Feb 26, 2024 · e8eff86 · e8eff86
2 parents 55a4819 + 016c616
commit e8eff86
Show file tree

Hide file tree

Showing 28 changed files with 47 additions and 47 deletions.
diff --git a/README.md b/README.md
@@ -8,14 +8,14 @@
     <a href="https://github.com/spring-projects/spring-authorization-server" target="_blank"><img src="https://img.shields.io/badge/Spring%20Authorization%20Server-1.2.2-blue.svg?logo=spring" alt="Spring Authorization Server 1.2.2"></a>
     <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://img.shields.io/badge/Spring%20Boot-3.2.3-blue.svg?logo=spring" alt="Spring Boot 3.2.3"></a>
     <a href="https://spring.io/projects/spring-cloud" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud-2023.0.0-blue.svg?logo=spring" alt="Spring Cloud 2023.0.0"></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/alibaba/spring-cloud-alibaba" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud%20Alibaba-2023.0.0.0-blue.svg?logo=alibabadotcom" alt="Spring Cloud Alibaba 2023.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.13.0--2023.0.0-blue.svg?logo=tencentqq" alt="Spring Cloud Tencent 1.13.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.0-brightgreen.svg?logo=alibabadotcom" alt="Nacos 2.3.0"></a>
 </p>
 <p align="center">
-    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.2.3.0-red.svg?logo=spring" alt="Version 3.2.3.0"></a>
-    <a href="https://gitee.com/herodotus/dante-engine" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.2.3.0-red.svg?logo=spring" alt="Dante Engine 3.2.3.0"></a>
-    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.2.3.0-red.svg?logo=spring" alt="Dante OSS 3.2.3.0"></a>
+    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.2.3.1-red.svg?logo=spring" alt="Version 3.2.3.1"></a>
+    <a href="https://gitee.com/herodotus/dante-engine" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.2.3.1-red.svg?logo=spring" alt="Dante Engine 3.2.3.1"></a>
+    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.2.3.1-red.svg?logo=spring" alt="Dante OSS 3.2.3.1"></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.2.2、Spring Boot 3.2.3、Spring Cloud 2023.0.0、Spring Cloud Tencent 1.12.4-2022.0.4、Spring Cloud Alibaba 2022.0.0.0、Nacos 2.3.0 等主流技术栈开发的多租户系统，遵循SpringBoot 编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能。
+Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和服务能力开发平台，是采用领域驱动模型(DDD)设计思想的、全面拥抱 Spring Authorization Server 的、基于 OAuth2.1 协议的、支持智能电视、IoT等物联网设备认证的微服务架构。基于 Spring Authorization Server 1.2.2、Spring Boot 3.2.3、Spring Cloud 2023.0.0、Spring Cloud Tencent 1.12.4-2022.0.4、Spring Cloud Alibaba 2023.0.0.0、Nacos 2.3.0 等主流技术栈开发的多租户系统，遵循SpringBoot 编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能。
 
 ## 定位
 
@@ -155,7 +155,7 @@ Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和
 |-----------------------------|-----------------|
 | Spring Boot                 | 3.2.3           |
 | Spring Cloud                | 2023.0.0        |
-| Spring Cloud Alibaba        | 2022.0.0.0      |
+| Spring Cloud Alibaba        | 2023.0.0.0      |
 | Spring Cloud Tencent        | 1.13.0-2023.0.0 |
 | Spring Authorization Server | 1.2.2           |
 | Spring Boot Admin           | 3.2.2           |
@@ -208,14 +208,14 @@ Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和
 
 ### 二、分支说明
 
-| 分支名称                   | 对应 Spring 生态版本                          | 对应 JDK 版本 | 用途                 | 现状                                                     |
-|------------------------|-----------------------------------------|-----------|--------------------|--------------------------------------------------------|
-| master                 | Spring Boot 3.2 和 Spring Cloud 2023.0.0 | JDK 17    | 主要发布分支             | 可使用，但 Spring Cloud Alibaba、Tencent 等生态并为完全适配，部分功能受限    |
-| develop                | Spring Boot 3.2 和 Spring Cloud 2023.0.0 | JDK 17    | Development 分支     | 新功能、ISSUE 均以此分支作为开发，发布后会 PR 至 master 分支。开发分支不保证可用      |
-| reactive-develop       | Spring Boot 3.2 和 Spring Cloud 2023.0.0 | 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.0 | JDK 17    | 主要发布分支             | 可使用，但 Spring Cloud Alibaba、Tencent 等生态并未发布正式适配版，请谨慎选择使用 |
+| develop                | Spring Boot 3.2 和 Spring Cloud 2023.0.0 | JDK 17    | Development 分支     | 新功能、ISSUE 均以此分支作为开发，发布后会 PR 至 master 分支。开发分支不保证可用       |
+| reactive-develop       | Spring Boot 3.2 和 Spring Cloud 2023.0.0 | 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 实现的微服务，因相关组件均不在维护，所以该版本不再维护  |
 
 ## [5]、工程结构
 

diff --git a/....3/nacos_config_export_20240114153144.zip → ....1/nacos_config_export_20240114153144.zip b/....3/nacos_config_export_20240114153144.zip → ....1/nacos_config_export_20240114153144.zip
diff --git a/...t/3.2.2.3/polaris_config_202401141533.zip → ...t/3.2.3.1/polaris_config_202401141533.zip b/...t/3.2.2.3/polaris_config_202401141533.zip → ...t/3.2.3.1/polaris_config_202401141533.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.2.3.0
+VERSION=3.2.3.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.2024-02-17T01-15-57Z
+    image: quay.io/minio/minio:RELEASE.2024-02-26T09-33-48Z
     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.2.3.0
+VERSION=3.2.3.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.2024-02-17T01-15-57Z
+    image: quay.io/minio/minio:RELEASE.2024-02-26T09-33-48Z
     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.2.3.0</version>
+        <version>3.2.3.1</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.2.3.0</version>
+        <version>3.2.3.1</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.2.3.0</version>
+        <version>3.2.3.1</version>
     </parent>
 
     <artifactId>dante-module-metadata</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.2.3.0</version>
+        <version>3.2.3.1</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.2.3.0</version>
+        <version>3.2.3.1</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.2.3.0</version>
+        <version>3.2.3.1</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.2.3.0</version>
+        <version>3.2.3.1</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.2.3.0</version>
+        <version>3.2.3.1</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.2.3.0</version>
+        <version>3.2.3.1</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.2.3.0</version>
+        <version>3.2.3.1</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.2.3.0</version>
+        <version>3.2.3.1</version>
     </parent>
 
     <artifactId>dante-cloud-gateway</artifactId>
@@ -61,10 +61,10 @@
             <artifactId>facility-spring-boot-starter</artifactId>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>cn.herodotus.engine</groupId>-->
-<!--            <artifactId>facility-gateway-spring-boot-starter</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>cn.herodotus.engine</groupId>
+            <artifactId>facility-gateway-spring-boot-starter</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

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.2.3.0</version>
+        <version>3.2.3.1</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.2.3.0</version>
+        <version>3.2.3.1</version>
     </parent>
 
     <artifactId>dante-cloud-monitor</artifactId>
-    <version>3.2.3.0</version>
+    <version>3.2.3.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,7 +32,7 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.2.3.0</version>
+        <version>3.2.3.1</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.2.3.0</version>
+        <version>3.2.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dante-cloud-upms</artifactId>
-    <version>3.2.3.0</version>
+    <version>3.2.3.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.2.3.0</version>
+        <version>3.2.3.1</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.2.3.0</version>
+        <version>3.2.3.1</version>
         <relativePath>dependencies/pom.xml</relativePath>
     </parent>
 
@@ -77,7 +77,7 @@
                 <profile>development</profile>
                 <database>postgresql</database>
                 <!--基础设施：tencent、alibaba、spring-->
-                <facility>tencent</facility>
+                <facility>alibaba</facility>
                 <!--代码构建控制-->
                 <!--跳过构建源代码包-->
                 <skip.build.source.package>false</skip.build.source.package>

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.2.3.0</version>
+        <version>3.2.3.1</version>
     </parent>
 
     <artifactId>dante-cloud-bpmn-ability</artifactId>
-    <version>3.2.3.0</version>
+    <version>3.2.3.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,7 +32,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.2.3.0</version>
+        <version>3.2.3.1</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.2.3.0</version>
+        <version>3.2.3.1</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.2.3.0</version>
+        <version>3.2.3.1</version>
     </parent>
 
     <artifactId>services</artifactId>