!96 v2.7.9.2

Merge pull request !96 from 码匠君/develop
dromara · Mar 19, 2023 · 2894292 · 2894292
2 parents 670b31b + 9cba5d2
commit 2894292
Show file tree

Hide file tree

Showing 28 changed files with 68 additions and 66 deletions.
diff --git a/README.md b/README.md
@@ -9,10 +9,10 @@
     <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://shields.io/badge/Spring%20Boot-2.7.9-blue" alt="Spring Boot 2.7.9"></a>
     <a href="https://spring.io/projects/spring-cloud" target="_blank"><img src="https://shields.io/badge/Spring%20Cloud-2021.0.6-blue" alt="Spring Cloud 2021.0.6"></a>
     <a href="https://github.com/alibaba/spring-cloud-alibaba" target="_blank"><img src="https://shields.io/badge/Spring%20Cloud%20Alibaba-2021.0.4.0-blue" alt="Spring Cloud Alibaba 2021.0.4.0"></a>
-    <a href="https://nacos.io/zh-cn/index.html" target="_blank"><img src="https://shields.io/badge/Nacos-2.2.0-brightgreen" alt="Nacos 2.2.0"></a>
+    <a href="https://nacos.io/zh-cn/index.html" target="_blank"><img src="https://shields.io/badge/Nacos-2.2.1-brightgreen" alt="Nacos 2.2.1"></a>
 </p>
 <p align="center">
-    <a href="#" target="_blank"><img src="https://shields.io/badge/Version-2.7.9.1-red" alt="Version 2.7.9.1"></a>
+    <a href="#" target="_blank"><img src="https://shields.io/badge/Version-2.7.9.2-red" alt="Version 2.7.9.2"></a>
     <a href="https://www.oracle.com/java/technologies/javase-downloads.html" target="_blank"><img src="https://img.shields.io/badge/JDK-8%2C11%2C17-green" alt="Java 8,11,17"></a>
     <a href="./LICENSE"><img src="https://shields.io/badge/License-Apache--2.0-blue" alt="License Apache 2.0"></a>
     <a href="https://blog.csdn.net/Pointer_v" target="_blank"><img src="https://shields.io/badge/Author-%E7%A0%81%E5%8C%A0%E5%90%9B-orange" alt="码匠君"></a>
@@ -37,11 +37,11 @@
 
 自11月24日，Spring Boot 3.0 以及 Spring Cloud 2022.0.0、Spring Cloud Tencent 等全新版本发布，整个Java 社区也步入的 Java 17 和 Spring Boot 3 的新时代。紧跟 Java 技术和 Spring 社区的发展，让更多质量更好、性能更优的新特性服务于实际的开发工作，Dante Cloud 也同步进行升级及适配，开发了全新的 3.0 版本。
 
-基于 Spring Authorization Server 1.1.0、Spring Boot 3.0.4、Spring Cloud 2022.0.1、Spring Cloud Tencent 1.9.0-2022.0.1、Spring Cloud Alibaba 2021.0.4.0、Nacos 2.2.0 等主流技术栈开发的 Dante Cloud v3.0.0 已经正式发布，关注请移步 [v3.0.0 分支](https://gitee.com/dromara/dante-cloud/tree/3.0.0/)
+基于 Spring Authorization Server 1.1.0、Spring Boot 3.0.4、Spring Cloud 2022.0.1、Spring Cloud Tencent 1.9.0-2022.0.1、Spring Cloud Alibaba 2021.0.4.0、Nacos 2.2.1 等主流技术栈开发的 Dante Cloud v3.0.0 已经正式发布，关注请移步 [v3.0.0 分支](https://gitee.com/dromara/dante-cloud/tree/3.0.0/)
 
 ## 企业级技术中台微服务架构与服务能力开发平台
 
-Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和服务能力开发平台，是采用领域驱动模型(DDD)设计思想的、全面拥抱 Spring Authorization Server 的、基于 OAuth2.1 协议的微服务架构。基于 Spring Boot 2.7.9、Spring Cloud 2021.0.6、Spring Cloud Alibaba 2021.0.4.0、Spring Authorization Server 0.4.0、Nacos 2.2.0 等最新版本开发，遵循 SpringBoot 编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流、多租户等功能，代码简洁，架构清晰，非常适合学习和企业作为基础框架使用。
+Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和服务能力开发平台，是采用领域驱动模型(DDD)设计思想的、全面拥抱 Spring Authorization Server 的、基于 OAuth2.1 协议的微服务架构。基于 Spring Boot 2.7.9、Spring Cloud 2021.0.6、Spring Cloud Alibaba 2021.0.4.0、Spring Authorization Server 0.4.0、Nacos 2.2.1 等最新版本开发，遵循 SpringBoot 编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流、多租户等功能，代码简洁，架构清晰，非常适合学习和企业作为基础框架使用。
 
 ## 平台定位
 
@@ -153,17 +153,17 @@ Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和
 
 ### （1）Spring 全家桶及核心技术版本
 
-| 组件                          | 版本                          |
-| ----------------------------- |-----------------------------|
-| `Spring Boot`                 | 2.7.9 / 3.0.4               |
-| `Spring Cloud`                | 2021.0.6 / 2022.0.1         |
+| 组件                          | 版本                         |
+| ----------------------------- |----------------------------|
+| `Spring Boot`                 | 2.7.9 / 3.0.4              |
+| `Spring Cloud`                | 2021.0.6 / 2022.0.1        |
 | `Spring Cloud Alibaba`        | 2021.0.4.0 / 2022.0.0.0-RC1 |
-| `Spring Cloud Tencent`        | - / 1.9.0-2022.0.1          |
-| `Spring Authorization Server` | 0.4.1 / 1.1.0               |
-| `Spring Boot Admin`           | 2.7.10 / 3.0.0              |
-| `Nacos`                       | 2.2.0 / 2.2.1-RC            |
-| `Sentinel`                    | 1.8.5                       |
-| `Seata`                       | 1.5.2                       |
+| `Spring Cloud Tencent`        | 1.9.0-2022.0.1         |
+| `Spring Authorization Server` | 0.4.1 / 1.1.0              |
+| `Spring Boot Admin`           | 2.7.10 / 3.0.0             |
+| `Nacos`                       | 2.2.1          |
+| `Sentinel`                    | 1.8.5                      |
+| `Seata`                       | 1.5.2                      |
 
 > Spring 全家桶版本对应关系，详见：[版本说明](https://github.com/alibaba/spring-cloud-alibaba/wiki/%E7%89%88%E6%9C%AC%E8%AF%B4%E6%98%8E)
 
@@ -284,14 +284,16 @@ dante-cloud
 
 ### 赞助人列表
 
-| 赞助人       | 赞助时间       |
-|-----------|------------|
-| 偷土豆的人     | 2021-11-24 |
-| lorron    | 2022-04-04 |
-| 在云端       | 2022-12-26 |
+| 赞助人      | 赞助时间   |
+| ----------- | ---------- |
+| 偷土豆的人  | 2021-11-24 |
+| lorron      | 2022-04-04 |
+| 在云端      | 2022-12-26 |
 | 西晽        | 2022-12-27 |
-| p911gt3rs | 2023-01-03 |
-| jacsty    | 2023-01-31 |
+| p911gt3rs   | 2023-01-03 |
+| jacsty      | 2023-01-31 |
+| hubert_rust | 2023-03-16 |
+| Zkey Z      | 2023-03-18 |
 
 ### 开源项目
 

diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env
@@ -1,4 +1,4 @@
-VERSION=2.7.9.1
+VERSION=2.7.9.2
 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.base.debezium.yml b/configurations/docker/docker-compose/linux/herodotus/env.base.debezium.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   nacos:
-    image: nacos/nacos-server:v2.2.0
+    image: nacos/nacos-server:v2.2.1
     container_name: nacos
     hostname: nacos
     restart: always

diff --git a/configurations/docker/docker-compose/linux/herodotus/env.base.yml b/configurations/docker/docker-compose/linux/herodotus/env.base.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   nacos:
-    image: nacos/nacos-server:v2.2.0
+    image: nacos/nacos-server:v2.2.1
     container_name: nacos
     hostname: nacos
     environment:

diff --git a/configurations/docker/docker-compose/windows/herodotus/.env b/configurations/docker/docker-compose/windows/herodotus/.env
@@ -1,4 +1,4 @@
-VERSION=2.7.9.1
+VERSION=2.7.9.2
 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.base.debezium.yml b/configurations/docker/docker-compose/windows/herodotus/env.base.debezium.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   nacos:
-    image: nacos/nacos-server:v2.2.0
+    image: nacos/nacos-server:v2.2.1
     container_name: nacos
     hostname: nacos
     restart: always

diff --git a/configurations/docker/docker-compose/windows/herodotus/env.base.yml b/configurations/docker/docker-compose/windows/herodotus/env.base.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   nacos:
-    image: nacos/nacos-server:v2.2.0
+    image: nacos/nacos-server:v2.2.1
     container_name: nacos
     environment:
       MODE: standalone

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -32,13 +32,13 @@
     <parent>
         <groupId>cn.herodotus.engine</groupId>
         <artifactId>dependencies</artifactId>
-        <version>2.7.9.1</version>
+        <version>2.7.9.2</version>
         <relativePath/>
     </parent>
 
     <groupId>cn.herodotus.dante</groupId>
     <artifactId>dependencies</artifactId>
-    <version>2.7.9.1</version>
+    <version>2.7.9.2</version>
     <packaging>pom</packaging>
 
     <name>dante-cloud-dependencies</name>

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>2.7.9.1</version>
+        <version>2.7.9.2</version>
     </parent>
 
     <artifactId>dante-module-common</artifactId>
-    <version>2.7.9.1</version>
+    <version>2.7.9.2</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>2.7.9.1</version>
+        <version>2.7.9.2</version>
     </parent>
 
     <artifactId>dante-module-security</artifactId>
-    <version>2.7.9.1</version>
+    <version>2.7.9.2</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>2.7.9.1</version>
+        <version>2.7.9.2</version>
     </parent>
 
     <artifactId>dante-module-strategy</artifactId>
-    <version>2.7.9.1</version>
+    <version>2.7.9.2</version>
     <packaging>jar</packaging>
 
     <dependencies>

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

diff --git a/modules/dante-module-upms-rest/pom.xml b/modules/dante-module-upms-rest/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.9.1</version>
+        <version>2.7.9.2</version>
     </parent>
 
     <artifactId>dante-module-upms-rest</artifactId>
-    <version>2.7.9.1</version>
+    <version>2.7.9.2</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>2.7.9.1</version>
+        <version>2.7.9.2</version>
     </parent>
 
     <artifactId>modules</artifactId>
-    <version>2.7.9.1</version>
+    <version>2.7.9.2</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>2.7.9.1</version>
+        <version>2.7.9.2</version>
     </parent>
 
     <artifactId>authentication-spring-boot-starter</artifactId>
-    <version>2.7.9.1</version>
+    <version>2.7.9.2</version>
     <packaging>jar</packaging>
 
     <dependencies>

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>2.7.9.1</version>
+        <version>2.7.9.2</version>
     </parent>
 
     <artifactId>packages</artifactId>
-    <version>2.7.9.1</version>
+    <version>2.7.9.2</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>2.7.9.1</version>
+        <version>2.7.9.2</version>
     </parent>
 
     <artifactId>service-spring-boot-starter</artifactId>
-    <version>2.7.9.1</version>
+    <version>2.7.9.2</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>2.7.9.1</version>
+        <version>2.7.9.2</version>
     </parent>
 
     <artifactId>dante-cloud-gateway</artifactId>
-    <version>2.7.9.1</version>
+    <version>2.7.9.2</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>2.7.9.1</version>
+        <version>2.7.9.2</version>
     </parent>
 
     <artifactId>dante-cloud-message</artifactId>
-    <version>2.7.9.1</version>
+    <version>2.7.9.2</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>2.7.9.1</version>
+        <version>2.7.9.2</version>
     </parent>
 
     <artifactId>dante-cloud-monitor</artifactId>
-    <version>2.7.9.1</version>
+    <version>2.7.9.2</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>2.7.9.1</version>
+        <version>2.7.9.2</version>
     </parent>
 
     <artifactId>dante-cloud-uaa</artifactId>
-    <version>2.7.9.1</version>
+    <version>2.7.9.2</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>2.7.9.1</version>
+        <version>2.7.9.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dante-cloud-upms</artifactId>
-    <version>2.7.9.1</version>
+    <version>2.7.9.2</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>2.7.9.1</version>
+        <version>2.7.9.2</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>2.7.9.1</version>
+        <version>2.7.9.2</version>
         <relativePath>dependencies/pom.xml</relativePath>
     </parent>
 
     <artifactId>dante-cloud</artifactId>
-    <version>2.7.9.1</version>
+    <version>2.7.9.2</version>
     <packaging>pom</packaging>
 
     <name>dante-cloud</name>

diff --git a/readme/architecture.jpg b/readme/architecture.jpg
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>2.7.9.1</version>
+        <version>2.7.9.2</version>
     </parent>
 
     <artifactId>dante-cloud-bpmn-ability</artifactId>
-    <version>2.7.9.1</version>
+    <version>2.7.9.2</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>2.7.9.1</version>
+        <version>2.7.9.2</version>
     </parent>
 
     <artifactId>dante-cloud-bpmn-logic</artifactId>
-    <version>2.7.9.1</version>
+    <version>2.7.9.2</version>
     <packaging>jar</packaging>
 
     <dependencies>