!235 v3.3.2.0

Merge pull request !235 from 码匠君/develop
dromara · Jul 20, 2024 · 4f8483f · 4f8483f
2 parents 8a1764b + 28b124a
commit 4f8483f
Show file tree

Hide file tree

Showing 53 changed files with 1,140 additions and 70 deletions.
diff --git a/README.md b/README.md
@@ -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.3.1-blue.svg?logo=spring" alt="Spring Authorization Server 1.3.1"></a>
-    <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://img.shields.io/badge/Spring%20Boot-3.3.1-blue.svg?logo=spring" alt="Spring Boot 3.3.1"></a>
+    <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://img.shields.io/badge/Spring%20Boot-3.3.2-blue.svg?logo=spring" alt="Spring Boot 3.3.2"></a>
     <a href="https://spring.io/projects/spring-cloud" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud-2023.0.3-blue.svg?logo=spring" alt="Spring Cloud 2023.0.3"></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/alibaba/spring-cloud-alibaba" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud%20Alibaba-2023.0.1.2-blue.svg?logo=alibabadotcom" alt="Spring Cloud Alibaba 2023.0.1.2"></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.3-brightgreen.svg?logo=alibabadotcom" alt="Nacos 2.3.3"></a>
+    <a href="https://nacos.io/zh-cn/index.html" target="_blank"><img src="https://img.shields.io/badge/Nacos-2.4.0-brightgreen.svg?logo=alibabadotcom" alt="Nacos 2.4.0"></a>
 </p>
 <p align="center">
-    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.3.1.3-red.svg?logo=spring" alt="Version 3.3.1.3"></a>
-    <a href="https://www.herodotus.cn" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.3.1.3-red.svg?logo=spring" alt="Dante Engine 3.3.1.3"></a>
-    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.3.1.3-red.svg?logo=spring" alt="Dante OSS 3.3.1.3"></a>
+    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.3.2.0-red.svg?logo=spring" alt="Version 3.3.2.0"></a>
+    <a href="https://www.herodotus.cn" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.3.2.0-red.svg?logo=spring" alt="Dante Engine 3.3.2.0"></a>
+    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.3.2.0-red.svg?logo=spring" alt="Dante OSS 3.3.2.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-AGPL--3.0-blue.svg?logo=apache" alt="License AGPL 3.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>
@@ -55,7 +55,7 @@
 
 ## Dante Cloud 响应式版本特性
 
-- `Spring Boot` 已升级至 3.3.1
+- `Spring Boot` 已升级至 3.3.2
 - `Spring Authorization Server` 已升级至 1.3.1
 - 全面采用 Java 21，默认开启虚拟线程，以改善阻塞操作的处理降低系统资源的消耗
 - 支持传统的 `阻塞式` 微服务与基于 `Reactor` 和 `WebFlux` 的 `响应式` 微服务同时运行在一套系统之中
@@ -156,13 +156,13 @@
 
 | 组件                          | 版本              |
 |-----------------------------|-----------------|
-| Spring Boot                 | 3.3.1           |
+| Spring Boot                 | 3.3.2           |
 | Spring Cloud                | 2023.0.3        |
-| Spring Cloud Alibaba        | 2023.0.1.0      |
+| Spring Cloud Alibaba        | 2023.0.1.2      |
 | Spring Cloud Tencent        | 1.14.0-2023.0.0 |
 | Spring Authorization Server | 1.3.1           |
-| Spring Boot Admin           | 3.2.2           |
-| Nacos                       | 2.3.3           |
+| Spring Boot Admin           | 3.3.2           |
+| Nacos                       | 2.4.0           |
 | Sentinel                    | 1.8.7           |
 | Seata                       | 1.7.0           |
 
@@ -323,11 +323,14 @@ Dante Cloud 已通过由第三方进行的软件出厂安全测试以及等保
 
 ### 个人
 
-| 序号 |                    昵称                    |         合规         | 序号 |                     昵称                     |         合规         | 序号 |                    昵称                    |         合规         | 序号 |                        昵称                        |         合规         |
-|:--:|:----------------------------------------:|:------------------:|:--:|:------------------------------------------:|:------------------:|:--:|:----------------------------------------:|:------------------:|:--:|:------------------------------------------------:|:------------------:|
-| 1  | [Kaiser_Li](https://gitee.com/Kaiser_Li) | :white_check_mark: | 2  | [宁哥](https://gitee.com/seabuckthorn-syrup) | :white_check_mark: | 3  | [Nicolas](https://gitee.com/ailifeshow)  | :white_check_mark: | 4  |      [龍飝龘龘](https://gitee.com/autumnchendq)      | :white_check_mark: |
-| 5  |  [RSJB](https://gitee.com/jinjiaxing1)   | :white_check_mark: | 6  |        [ipi](https://gitee.com/ipi)        | :white_check_mark: | 7  | [zhouhailong](https://gitee.com/l-cloud) | :white_check_mark: | 8  |          [Ge](https://gitee.com/gtkwww)          | :white_check_mark: |
-| 9  |  [KohRong](https://gitee.com/loong024)   | :white_check_mark: | 10 |       [梦行](https://gitee.com/mx2913)       | :white_check_mark: | 11 |     [骆铘](https://gitee.com/clxhhsy)      | :white_check_mark: | 12 | [OnPeaceOfMind](https://gitee.com/onpeaceofmind) | :white_check_mark: |
+| 序号 |                      昵称                       |         合规         | 序号 |                       昵称                       |         合规         | 序号 |                    昵称                    |         合规         | 序号 |                        昵称                        |         合规         |
+|:--:|:---------------------------------------------:|:------------------:|:--:|:----------------------------------------------:|:------------------:|:--:|:----------------------------------------:|:------------------:|:--:|:------------------------------------------------:|:------------------:|
+| 1  |   [Kaiser_Li](https://gitee.com/Kaiser_Li)    | :white_check_mark: | 2  |   [宁哥](https://gitee.com/seabuckthorn-syrup)   | :white_check_mark: | 3  | [Nicolas](https://gitee.com/ailifeshow)  | :white_check_mark: | 4  |      [龍飝龘龘](https://gitee.com/autumnchendq)      | :white_check_mark: |
+| 5  |     [RSJB](https://gitee.com/jinjiaxing1)     | :white_check_mark: | 6  |          [ipi](https://gitee.com/ipi)          | :white_check_mark: | 7  | [zhouhailong](https://gitee.com/l-cloud) | :white_check_mark: | 8  |          [Ge](https://gitee.com/gtkwww)          | :white_check_mark: |
+| 9  |     [KohRong](https://gitee.com/loong024)     | :white_check_mark: | 10 |         [梦行](https://gitee.com/mx2913)         | :white_check_mark: | 11 |     [骆铘](https://gitee.com/clxhhsy)      | :white_check_mark: | 12 | [OnPeaceOfMind](https://gitee.com/onpeaceofmind) | :white_check_mark: |
+| 13 | [SaltedFish](https://gitee.com/null_183_5304) | :white_check_mark: | 14 | [cryptoneedle](https://gitee.com/cryptoneedle) | :white_check_mark: | 15 |    [微笑的小虎](https://gitee.com/jfh1214)    | :white_check_mark: | 16 |       [wui](https://gitee.com/qazwuzhuhe)        | :white_check_mark: |
+| 17 |       [wiysy](https://gitee.com/wiysy)        | :white_check_mark: | 18 |    [p911gt3rs](https://gitee.com/p911gt3rs)    | :white_check_mark: | 19 |   [郝召豪](https://gitee.com/menghan1997)   | :white_check_mark: | 20 |         [zjoye](https://gitee.com/zjoye)         | :white_check_mark: |
+| 21 |       [尹建](https://gitee.com/westcars)        | :white_check_mark: | 22 |        [常相守](https://gitee.com/canzii)         | :white_check_mark: | 23 |    [yunnet](https://gitee.com/yunnet)    | :white_check_mark: | 24 |       [拔土豆的程序员](https://gitee.com/lizhifu)       | :white_check_mark: |
 
 ## [14]、鸣谢
 

diff --git a/configurations/backup/alibaba/3.3.1.1/nacos_config_export_20240531173140.zip b/configurations/backup/alibaba/3.3.1.1/nacos_config_export_20240531173140.zip
diff --git a/configurations/backup/alibaba/3.3.1.2/nacos_config_export_20240531173140.zip b/configurations/backup/alibaba/3.3.1.2/nacos_config_export_20240531173140.zip
diff --git a/....0/nacos_config_export_20240531173140.zip → ....0/nacos_config_export_20240531173140.zip b/....0/nacos_config_export_20240531173140.zip → ....0/nacos_config_export_20240531173140.zip
diff --git a/configurations/backup/tencent/3.3.1.1/polaris_config_202405311904.zip b/configurations/backup/tencent/3.3.1.1/polaris_config_202405311904.zip
diff --git a/configurations/backup/tencent/3.3.1.2/polaris_config_202405311904.zip b/configurations/backup/tencent/3.3.1.2/polaris_config_202405311904.zip
diff --git a/...t/3.3.1.0/polaris_config_202405311904.zip → ...t/3.3.2.0/polaris_config_202405311904.zip b/...t/3.3.1.0/polaris_config_202405311904.zip → ...t/3.3.2.0/polaris_config_202405311904.zip
diff --git a/configurations/docker/context/development/Dockerfile b/configurations/docker/context/development/Dockerfile
@@ -9,7 +9,7 @@
 ### 在 debian 下则没有这问题。以目前了解的情况看，猜测 alpine 下，为了缩小体系，缺失的内容应该不只是字体库，还有其它内容。
 ### 当然也可能是个人能力有限，一直没有找到正确解决的办法。如果你有更好的解决办法，欢迎提 ISSUE 和 PR。
 
-FROM quay.io/herodotus-cloud/liberica-openjdk-debian:17.0.11-10
+FROM quay.io/herodotus-cloud/liberica-openjdk-debian:17.0.12-10
 
 # 作者
 MAINTAINER herodotus <herodotus@aliyun.com>

diff --git a/configurations/docker/context/development/Dockerfile-Monitor b/configurations/docker/context/development/Dockerfile-Monitor
@@ -9,7 +9,7 @@
 ### 在 debian 下则没有这问题。以目前了解的情况看，猜测 alpine 下，为了缩小体系，缺失的内容应该不只是字体库，还有其它内容。
 ### 当然也可能是个人能力有限，一直没有找到正确解决的办法。如果你有更好的解决办法，欢迎提 ISSUE 和 PR。
 
-FROM quay.io/herodotus-cloud/liberica-openjdk-debian:17.0.11-10
+FROM quay.io/herodotus-cloud/liberica-openjdk-debian:17.0.12-10
 #FROM openjdk:17-jdk
 # 作者
 MAINTAINER herodotus <herodotus@aliyun.com>

diff --git a/configurations/docker/context/production/Dockerfile b/configurations/docker/context/production/Dockerfile
@@ -9,7 +9,7 @@
 ### 在 debian 下则没有这问题。以目前了解的情况看，猜测 alpine 下，为了缩小体系，缺失的内容应该不只是字体库，还有其它内容。
 ### 当然也可能是个人能力有限，一直没有找到正确解决的办法。如果你有更好的解决办法，欢迎提 ISSUE 和 PR。
 
-FROM quay.io/herodotus-cloud/liberica-openjdk-debian:17.0.11-10
+FROM quay.io/herodotus-cloud/liberica-openjdk-debian:17.0.12-10
 
 # 作者
 MAINTAINER herodotus <herodotus@aliyuan.com>

diff --git a/configurations/docker/context/production/Dockerfile-Monitor b/configurations/docker/context/production/Dockerfile-Monitor
@@ -9,7 +9,7 @@
 ### 在 debian 下则没有这问题。以目前了解的情况看，猜测 alpine 下，为了缩小体系，缺失的内容应该不只是字体库，还有其它内容。
 ### 当然也可能是个人能力有限，一直没有找到正确解决的办法。如果你有更好的解决办法，欢迎提 ISSUE 和 PR。
 
-FROM quay.io/herodotus-cloud/liberica-openjdk-debian:17.0.11-10
+FROM quay.io/herodotus-cloud/liberica-openjdk-debian:17.0.12-10
 #FROM openjdk:17-jdk
 # 作者
 MAINTAINER herodotus <herodotus@aliyun.com>

diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env
@@ -1,4 +1,4 @@
-VERSION=3.3.1.3
+VERSION=3.3.2.0
 SPRING_PROFILES_ACTIVE=alibaba
 PROFILE=development
 DATABASE=postgresql

diff --git a/configurations/docker/docker-compose/linux/herodotus/env.base.yml b/configurations/docker/docker-compose/linux/herodotus/env.base.yml
@@ -1,6 +1,6 @@
 services:
   nacos:
-    image: quay.io/herodotus-cloud/nacos-server:v2.3.2
+    image: quay.io/herodotus-cloud/nacos-server:v2.4.0
     container_name: nacos
     hostname: nacos
     environment:

diff --git a/configurations/docker/docker-compose/linux/herodotus/env.full.debezium.yml b/configurations/docker/docker-compose/linux/herodotus/env.full.debezium.yml
@@ -1,6 +1,6 @@
 services:
   nacos:
-    image: quay.io/herodotus-cloud/nacos-server:v2.3.2
+    image: quay.io/herodotus-cloud/nacos-server:v2.4.0
     container_name: nacos
     hostname: nacos
     restart: always
@@ -31,7 +31,7 @@ services:
       - "9849:9849"
 
   zookeeper:
-    image: debezium/zookeeper:2.6
+    image: debezium/zookeeper:2.7
     container_name: zookeeper
     hostname: zookeeper
     restart: always
@@ -43,7 +43,7 @@ services:
       - "3888:3888"
 
   kafka:
-    image: debezium/kafka:2.6
+    image: debezium/kafka:2.7
     container_name: kafka
     hostname: kafka
     restart: always
@@ -62,7 +62,7 @@ services:
       - zookeeper
 
   connect:
-    image: debezium/connect:2.6
+    image: debezium/connect:2.7
     container_name: connect
     hostname: connect
     restart: always

diff --git a/configurations/docker/docker-compose/linux/herodotus/env.full.tencent.yml b/configurations/docker/docker-compose/linux/herodotus/env.full.tencent.yml
@@ -15,7 +15,7 @@ services:
       - "9091:9091"
 
   zookeeper:
-    image: debezium/zookeeper:2.6
+    image: debezium/zookeeper:2.7
     container_name: zookeeper
     hostname: zookeeper
     environment:
@@ -26,7 +26,7 @@ services:
       - "3888:3888"
 
   kafka:
-    image: debezium/kafka:2.6
+    image: debezium/kafka:2.7
     container_name: kafka
     hostname: kafka
     ports:

diff --git a/configurations/docker/docker-compose/linux/herodotus/env.oss.yml b/configurations/docker/docker-compose/linux/herodotus/env.oss.yml
@@ -1,6 +1,6 @@
 services:
   minio:
-    image: quay.io/minio/minio:RELEASE.2024-07-10T18-41-49Z
+    image: quay.io/minio/minio:RELEASE.2024-07-16T23-46-41Z
     container_name: minio
     hostname: minio
     ports:

diff --git a/configurations/docker/docker-compose/linux/herodotus/env.quick-start.yaml b/configurations/docker/docker-compose/linux/herodotus/env.quick-start.yaml
@@ -2,7 +2,7 @@ version: '3.8'
 services:
 
   nacos:
-    image: quay.io/herodotus-cloud/nacos-server:v2.3.2
+    image: quay.io/herodotus-cloud/nacos-server:v2.4.0
     container_name: dante-nacos
     hostname: dante-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=3.3.1.3
+VERSION=3.3.2.0
 SPRING_PROFILES_ACTIVE=alibaba
 PROFILE=development
 DATABASE=postgresql

diff --git a/configurations/docker/docker-compose/windows/herodotus/env.base.yml b/configurations/docker/docker-compose/windows/herodotus/env.base.yml
@@ -1,6 +1,6 @@
 services:
   nacos:
-    image: quay.io/herodotus-cloud/nacos-server:v2.3.2
+    image: quay.io/herodotus-cloud/nacos-server:v2.4.0
     container_name: nacos
     environment:
       MODE: standalone

diff --git a/configurations/docker/docker-compose/windows/herodotus/env.full.base.yml b/configurations/docker/docker-compose/windows/herodotus/env.full.base.yml
@@ -1,6 +1,6 @@
 services:
   nacos:
-    image: quay.io/herodotus-cloud/nacos-server:v2.3.3
+    image: quay.io/herodotus-cloud/nacos-server:v2.4.0
     container_name: nacos
     environment:
       MODE: standalone

diff --git a/configurations/docker/docker-compose/windows/herodotus/env.full.debezium.yml b/configurations/docker/docker-compose/windows/herodotus/env.full.debezium.yml
@@ -1,6 +1,6 @@
 services:
   nacos:
-    image: quay.io/herodotus-cloud/nacos-server:v2.3.2
+    image: quay.io/herodotus-cloud/nacos-server:v2.4.0
     container_name: nacos
     hostname: nacos
     restart: always
@@ -31,7 +31,7 @@ services:
       - "9849:9849"
 
   zookeeper:
-    image: debezium/zookeeper:2.6
+    image: debezium/zookeeper:2.7
     container_name: zookeeper
     hostname: zookeeper
     restart: always
@@ -43,7 +43,7 @@ services:
       - "3888:3888"
 
   kafka:
-    image: debezium/kafka:2.6
+    image: debezium/kafka:2.7
     container_name: kafka
     hostname: kafka
     restart: always
@@ -62,7 +62,7 @@ services:
       - zookeeper
 
   connect:
-    image: debezium/connect:2.6
+    image: debezium/connect:2.7
     container_name: connect
     hostname: connect
     restart: always

diff --git a/configurations/docker/docker-compose/windows/herodotus/env.full.tencent.yml b/configurations/docker/docker-compose/windows/herodotus/env.full.tencent.yml
@@ -15,7 +15,7 @@ services:
       - "9091:9091"
 
   zookeeper:
-    image: debezium/zookeeper:2.6
+    image: debezium/zookeeper:2.7
     container_name: zookeeper
     environment:
       ZOOKEEPER_SERVER_ID: 1
@@ -25,7 +25,7 @@ services:
       - "3888:3888"
 
   kafka:
-    image: debezium/kafka:2.6
+    image: debezium/kafka:2.7
     container_name: kafka
     ports:
       - "9092:9092"

diff --git a/configurations/docker/docker-compose/windows/herodotus/env.oss.yml b/configurations/docker/docker-compose/windows/herodotus/env.oss.yml
@@ -1,6 +1,6 @@
 services:
   minio:
-    image: quay.io/minio/minio:RELEASE.2024-07-10T18-41-49Z
+    image: quay.io/minio/minio:RELEASE.2024-07-16T23-46-41Z
     container_name: minio
     hostname: minio
     ports: