!158 v3.1.5.0

Merge pull request !158 from 码匠君/develop
dromara · Oct 19, 2023 · 2f132e2 · 2f132e2
2 parents cb754ad + 265be3d
commit 2f132e2
Show file tree

Hide file tree

Showing 38 changed files with 91 additions and 61 deletions.
diff --git a/.gitee/ISSUE_TEMPLATE/discuss.yml b/.gitee/ISSUE_TEMPLATE/discuss.yml
@@ -0,0 +1,30 @@
+name: 咨询探讨
+description: 对本项目功能设计和实现的咨询或探讨
+title: "[咨询探讨]: "
+labels: ["question"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        感谢提出咨询或探讨话题，我们将认真分析、坦诚探讨，在相互交流中探寻更优的解决思路和方式！
+  - type: textarea
+    id: related-problem
+    attributes:
+      label: 你想咨询或探讨的问题是否和某个问题相关？
+      description: 清晰并简洁地描述问题是什么，例如，当我...时，我总是感到困扰。
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: 你考虑过哪些替代解决方案？
+      description: 清晰并简洁地描述你考虑过的任何替代解决方案或功能。
+    validations:
+      required: true
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: 你有其他上下文或截图吗？
+      description: 在此处添加有关功能请求的任何其他上下文或截图。
+    validations:
+      required: false
diff --git a/README.md b/README.md
@@ -5,17 +5,17 @@
 ---
 
 <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.4-blue.svg?logo=spring" alt="Spring Boot 3.1.4"></a>
+    <a href="https://github.com/spring-projects/spring-authorization-server" target="_blank"><img src="https://img.shields.io/badge/Spring%20Authorization%20Server-1.1.3-blue.svg?logo=spring" alt="Spring Authorization Server 1.1.3"></a>
+    <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://img.shields.io/badge/Spring%20Boot-3.1.5-blue.svg?logo=spring" alt="Spring Boot 3.1.5"></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://github.com/Tencent/spring-cloud-tencent" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud%20Tencent-1.12.2--2022.0.4-blue.svg?logo=tencentqq" alt="Spring Cloud Tencent 1.12.2-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.4.3-red.svg?logo=spring" alt="Version 3.1.4.3"></a>
-    <a href="https://gitee.com/herodotus/dante-engine" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.1.4.3-red.svg?logo=spring" alt="Dante Engine 3.1.4.3"></a>
-    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.1.4.3-red.svg?logo=spring" alt="Dante OSS 3.1.4.3"></a>
+    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.1.5.0-red.svg?logo=spring" alt="Version 3.1.5.0"></a>
+    <a href="https://gitee.com/herodotus/dante-engine" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.1.5.0-red.svg?logo=spring" alt="Dante Engine 3.1.5.0"></a>
+    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.1.5.0-red.svg?logo=spring" alt="Dante OSS 3.1.5.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.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 编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能。
+Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和服务能力开发平台，是采用领域驱动模型(DDD)设计思想的、全面拥抱 Spring Authorization Server 的、基于 OAuth2.1 协议的、支持智能电视、IoT等物联网设备认证的微服务架构。基于 Spring Authorization Server 1.1.3、Spring Boot 3.1.5、Spring Cloud 2022.0.4、Spring Cloud Tencent 1.12.2-2022.0.4、Spring Cloud Alibaba 2022.0.0.0、Nacos 2.2.4 等主流技术栈开发的多租户系统，遵循SpringBoot 编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能。
 
 ## 定位
 
@@ -153,11 +153,11 @@ Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和
 
 | 组件                          | 版本              |
 |-----------------------------|-----------------|
-| Spring Boot                 | 3.1.4           |
+| Spring Boot                 | 3.1.5           |
 | 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 Cloud Tencent        | 1.12.2-2022.0.4 |
+| Spring Authorization Server | 1.1.3           |
 | Spring Boot Admin           | 3.1.7           |
 | Nacos                       | 2.2.4           |
 | Sentinel                    | 1.8.6           |

diff --git a/configurations/backup/alibaba/3.1.5.0/nacos_config_export_20231002222404.zip b/configurations/backup/alibaba/3.1.5.0/nacos_config_export_20231002222404.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.4.3
+VERSION=3.1.5.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.base.debezium.yml b/configurations/docker/docker-compose/linux/herodotus/env.base.debezium.yml
@@ -25,7 +25,7 @@ services:
       - "9849:9849"
 
   zookeeper:
-    image: debezium/zookeeper:2.3
+    image: debezium/zookeeper:2.4
     container_name: zookeeper
     hostname: zookeeper
     restart: always
@@ -37,7 +37,7 @@ services:
       - "3888:3888"
 
   kafka:
-    image: debezium/kafka:2.3
+    image: debezium/kafka:2.4
     container_name: kafka
     hostname: kafka
     restart: always
@@ -56,7 +56,7 @@ services:
       - zookeeper
 
   connect:
-    image: debezium/connect:2.3
+    image: debezium/connect:2.4
     container_name: connect
     hostname: connect
     restart: always

diff --git a/configurations/docker/docker-compose/linux/herodotus/env.base.tencent.yml b/configurations/docker/docker-compose/linux/herodotus/env.base.tencent.yml
@@ -14,7 +14,7 @@ services:
       - "9090:9090"
 
   zookeeper:
-    image: debezium/zookeeper:2.3
+    image: debezium/zookeeper:2.4
     container_name: zookeeper
     hostname: zookeeper
     environment:
@@ -25,7 +25,7 @@ services:
       - "3888:3888"
 
   kafka:
-    image: debezium/kafka:2.3
+    image: debezium/kafka:2.4
     container_name: kafka
     hostname: kafka
     ports:

diff --git a/configurations/docker/docker-compose/linux/herodotus/env.base.yml b/configurations/docker/docker-compose/linux/herodotus/env.base.yml
@@ -24,7 +24,7 @@ services:
       - "9849:9849"
 
   zookeeper:
-    image: debezium/zookeeper:2.3
+    image: debezium/zookeeper:2.4
     container_name: zookeeper
     hostname: zookeeper
     environment:
@@ -35,7 +35,7 @@ services:
       - "3888:3888"
 
   kafka:
-    image: debezium/kafka:2.3
+    image: debezium/kafka:2.4
     container_name: kafka
     hostname: kafka
     ports:

diff --git a/configurations/docker/docker-compose/linux/herodotus/env.debezium.example.yml b/configurations/docker/docker-compose/linux/herodotus/env.debezium.example.yml
@@ -11,7 +11,7 @@ services:
       - "5432:5432"
 
   zookeeper:
-    image: debezium/zookeeper:2.3
+    image: debezium/zookeeper:2.4
     container_name: zookeeper
     restart: always
     ports:
@@ -20,7 +20,7 @@ services:
       - "3888:3888"
 
   kafka:
-    image: debezium/kafka:2.3
+    image: debezium/kafka:2.4
     container_name: kafka
     restart: always
     ports:
@@ -32,7 +32,7 @@ services:
       - zookeeper
 
   connect:
-    image: debezium/connect:2.3
+    image: debezium/connect:2.4
     container_name: connect
     restart: always
     ports:

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-10-07T15-07-38Z
+    image: quay.io/minio/minio:RELEASE.2023-10-14T05-17-22Z 
     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.4.3
+VERSION=3.1.5.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.base.debezium.yml b/configurations/docker/docker-compose/windows/herodotus/env.base.debezium.yml
@@ -25,7 +25,7 @@ services:
       - "9849:9849"
 
   zookeeper:
-    image: debezium/zookeeper:2.3
+    image: debezium/zookeeper:2.4
     container_name: zookeeper
     hostname: zookeeper
     restart: always
@@ -37,7 +37,7 @@ services:
       - "3888:3888"
 
   kafka:
-    image: debezium/kafka:2.3
+    image: debezium/kafka:2.4
     container_name: kafka
     hostname: kafka
     restart: always
@@ -56,7 +56,7 @@ services:
       - zookeeper
 
   connect:
-    image: debezium/connect:2.3
+    image: debezium/connect:2.4
     container_name: connect
     hostname: connect
     restart: always

diff --git a/configurations/docker/docker-compose/windows/herodotus/env.base.tencent.yml b/configurations/docker/docker-compose/windows/herodotus/env.base.tencent.yml
@@ -14,7 +14,7 @@ services:
       - "9090:9090"
 
   zookeeper:
-    image: debezium/zookeeper:2.3
+    image: debezium/zookeeper:2.4
     container_name: zookeeper
     environment:
       ZOOKEEPER_SERVER_ID: 1
@@ -24,7 +24,7 @@ services:
       - "3888:3888"
 
   kafka:
-    image: debezium/kafka:2.3
+    image: debezium/kafka:2.4
     container_name: kafka
     ports:
       - "9092:9092"

diff --git a/configurations/docker/docker-compose/windows/herodotus/env.base.without.elk.yml b/configurations/docker/docker-compose/windows/herodotus/env.base.without.elk.yml
@@ -23,7 +23,7 @@ services:
       - "9849:9849"
 
   zookeeper:
-    image: debezium/zookeeper:2.3
+    image: debezium/zookeeper:2.4
     container_name: zookeeper
     environment:
       ZOOKEEPER_SERVER_ID: 1
@@ -33,7 +33,7 @@ services:
       - "3888:3888"
 
   kafka:
-    image: debezium/kafka:2.3
+    image: debezium/kafka:2.4
     container_name: kafka
     ports:
       - "9092:9092"

diff --git a/configurations/docker/docker-compose/windows/herodotus/env.base.yml b/configurations/docker/docker-compose/windows/herodotus/env.base.yml
@@ -23,7 +23,7 @@ services:
       - "9849:9849"
 
   zookeeper:
-    image: debezium/zookeeper:2.3
+    image: debezium/zookeeper:2.4
     container_name: zookeeper
     environment:
       ZOOKEEPER_SERVER_ID: 1
@@ -33,7 +33,7 @@ services:
       - "3888:3888"
 
   kafka:
-    image: debezium/kafka:2.3
+    image: debezium/kafka:2.4
     container_name: kafka
     ports:
       - "9092:9092"

diff --git a/configurations/docker/docker-compose/windows/herodotus/env.debezium.example.yml b/configurations/docker/docker-compose/windows/herodotus/env.debezium.example.yml
@@ -11,7 +11,7 @@ services:
       - "5432:5432"
 
   zookeeper:
-    image: debezium/zookeeper:2.3
+    image: debezium/zookeeper:2.4
     container_name: zookeeper
     restart: always
     ports:
@@ -20,7 +20,7 @@ services:
       - "3888:3888"
 
   kafka:
-    image: debezium/kafka:2.3
+    image: debezium/kafka:2.4
     container_name: kafka
     restart: always
     ports:
@@ -32,7 +32,7 @@ services:
       - zookeeper
 
   connect:
-    image: debezium/connect:2.3
+    image: debezium/connect:2.4
     container_name: connect
     restart: always
     ports:

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-10-07T15-07-38Z
+    image: quay.io/minio/minio:RELEASE.2023-10-14T05-17-22Z 
     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.4.3</version>
+        <version>3.1.5.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.4.3</version>
+        <version>3.1.5.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.4.3</version>
+        <version>3.1.5.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.4.3</version>
+        <version>3.1.5.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.4.3</version>
+        <version>3.1.5.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.4.3</version>
+        <version>3.1.5.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.4.3</version>
+        <version>3.1.5.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.4.3</version>
+        <version>3.1.5.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.4.3</version>
+        <version>3.1.5.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.4.3</version>
+        <version>3.1.5.0</version>
     </parent>
 
     <artifactId>packages</artifactId>