🚀 feat: v3.3.1.3

- 主要更新 - [升级] Spring Cloud 版本升级至 2023.0.3 - [升级] Spring Cloud Tencent 版本升级至 1.13.2-2023.0.0 - [新增] 新增 QueryDsl 和 Blaze Persistence 支持，提升 JPA 查询语句编写便捷性 - 其它更新 - [修复] 修复图形验证码字体类型后缀编写错误 - [重构] 合并社交登录模块和代码相关模块合并至 assistant-module-access，减少不必要的代码模块拆分。重构相关代码修改为采用更符合 Spring 规范的用法。 - [升级] 更新 Antisamy XSS 防护配置 - [升级] 加强 Docker Compose 服务启动顺序控制检查的准确性，以保证服务按照正确顺序启动 - [升级] Kafka 镜像版本升级至 3.7.1 - [升级] minio docker 镜像版本升级至 RELEASE.2024-07-10T18-41-49Z - 依赖更新 - [升级] antisamy 版本升级至 1.7.6 - [升级] aws-java-sdk-s3 版本升级至 1.12.760 - [升级] hutool 版本升级至 6.0.0-M14 - [升级] hutool 5.x 版本升级至 5.8.29 - [升级] aliyun-java-sdk-core 版本升级至 4.7.0 - [升级] alipay-sdk-java 版本升级至 4.39.134.ALL - [升级] quasar webjars 版本升级至 2.16.6 - [升级] sweetalert2 webjars 版本升级至 11.12.2 - [升级] checker-qual 版本升级至 3.45.0 - [升级] mysql 版本升级至 9.0.0
dromara · Jul 12, 2024 · 007cbc6 · 007cbc6
1 parent c880fd6
commit 007cbc6
Show file tree

Hide file tree

Showing 33 changed files with 40 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -7,15 +7,15 @@
 <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-cloud" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud-2023.0.2-blue.svg?logo=spring" alt="Spring Cloud 2023.0.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/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>
 </p>
 <p align="center">
-    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.3.1.2-red.svg?logo=spring" alt="Version 3.3.1.2"></a>
-    <a href="https://www.herodotus.cn" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.3.1.2-red.svg?logo=spring" alt="Dante Engine 3.3.1.2"></a>
-    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.3.1.2-red.svg?logo=spring" alt="Dante OSS 3.3.1.2"></a>
+    <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="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>
@@ -157,7 +157,7 @@
 | 组件                          | 版本              |
 |-----------------------------|-----------------|
 | Spring Boot                 | 3.3.1           |
-| Spring Cloud                | 2023.0.2        |
+| Spring Cloud                | 2023.0.3        |
 | Spring Cloud Alibaba        | 2023.0.1.0      |
 | Spring Cloud Tencent        | 1.14.0-2023.0.0 |
 | Spring Authorization Server | 1.3.1           |
@@ -213,10 +213,10 @@
 
 | 分支名称                   | 对应 Spring 生态版本                          | 对应 JDK 版本 | 用途                 | 现状                                                          |
 |------------------------|-----------------------------------------|-----------|--------------------|-------------------------------------------------------------|
-| master                 | Spring Boot 3.3 和 Spring Cloud 2023.0.2 | JDK 17    | 主要发布分支             | 推荐使用代码分支                                                    |
-| develop                | Spring Boot 3.3 和 Spring Cloud 2023.0.2 | JDK 17    | Development 分支     | 新功能、ISSUE 均以此分支作为开发，发布后会 PR 至 master 分支。开发分支不保证可用           |
-| reactive-master        | Spring Boot 3.3 和 Spring Cloud 2023.0.2 | JDK 21    | 响应式版本主要发布分支        | 推荐使用代码分支                                                    |
-| reactive-develop       | Spring Boot 3.3 和 Spring Cloud 2023.0.2 | JDK 21    | 响应式 Development 分支 | 下一代响应式微服务版本开发分支。开发分支不保证可用                                   |
+| master                 | Spring Boot 3.3 和 Spring Cloud 2023.0.3 | JDK 17    | 主要发布分支             | 推荐使用代码分支                                                    |
+| develop                | Spring Boot 3.3 和 Spring Cloud 2023.0.3 | JDK 17    | Development 分支     | 新功能、ISSUE 均以此分支作为开发，发布后会 PR 至 master 分支。开发分支不保证可用           |
+| reactive-master        | Spring Boot 3.3 和 Spring Cloud 2023.0.3 | JDK 21    | 响应式版本主要发布分支        | 推荐使用代码分支                                                    |
+| reactive-develop       | Spring Boot 3.3 和 Spring Cloud 2023.0.3 | JDK 21    | 响应式 Development 分支 | 下一代响应式微服务版本开发分支。开发分支不保证可用                                   |
 | 3.1.X                  | Spring Boot 3.1 和 Spring Cloud 2022.0.X | JDK 17    | 历史代码，不再维护          | 基于 Spring Boot 3.1 时代开发的代码分支，稳定可用，不再维护                      |
 | 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 实现的微服务，稳定可用，因相关组件均不在维护，所以该版本不再维护 |

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/configurations/backup/alibaba/3.3.1.3/nacos_config_export_20240531173140.zip b/configurations/backup/alibaba/3.3.1.3/nacos_config_export_20240531173140.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/configurations/backup/tencent/3.3.1.3/polaris_config_202405311904.zip b/configurations/backup/tencent/3.3.1.3/polaris_config_202405311904.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.3.1.2
+VERSION=3.3.1.3
 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
@@ -30,7 +30,7 @@ services:
       - "9849:9849"
 
   kafka:
-    image: quay.io/herodotus-cloud/kafka:3.7.0
+    image: quay.io/herodotus-cloud/kafka:3.7.1
     container_name: kafka
     hostname: broker
     environment:

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-06-29T01-20-47Z
+    image: quay.io/minio/minio:RELEASE.2024-07-10T18-41-49Z
     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.3.1.2
+VERSION=3.3.1.3
 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
@@ -29,7 +29,7 @@ services:
       - "9849:9849"
 
   kafka:
-    image: quay.io/herodotus-cloud/kafka:3.7.0
+    image: quay.io/herodotus-cloud/kafka:3.7.1
     container_name: kafka
     hostname: broker
     environment:

diff --git a/configurations/docker/docker-compose/windows/herodotus/env.full.base.yml b/configurations/docker/docker-compose/windows/herodotus/env.full.base.yml
@@ -29,7 +29,7 @@ services:
       - "9849:9849"
 
   kafka:
-    image: quay.io/herodotus-cloud/kafka:3.7.0
+    image: quay.io/herodotus-cloud/kafka:3.7.1
     container_name: kafka
     hostname: broker
     environment:

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-06-29T01-20-47Z
+    image: quay.io/minio/minio:RELEASE.2024-07-10T18-41-49Z
     container_name: minio
     hostname: minio
     ports:

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>cn.herodotus.engine</groupId>
         <artifactId>dependencies</artifactId>
-        <version>3.3.1.2</version>
+        <version>3.3.1.3</version>
         <relativePath/>
     </parent>
 

diff --git a/modules/dante-module-common/pom.xml b/modules/dante-module-common/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.1.2</version>
+        <version>3.3.1.3</version>
     </parent>
 
     <artifactId>dante-module-common</artifactId>

diff --git a/modules/dante-module-metadata/pom.xml b/modules/dante-module-metadata/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.1.2</version>
+        <version>3.3.1.3</version>
     </parent>
 
     <artifactId>dante-module-metadata</artifactId>

diff --git a/modules/dante-module-social/pom.xml b/modules/dante-module-social/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.1.2</version>
+        <version>3.3.1.3</version>
     </parent>
 
     <artifactId>dante-module-social</artifactId>

diff --git a/modules/dante-module-strategy/pom.xml b/modules/dante-module-strategy/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.1.2</version>
+        <version>3.3.1.3</version>
     </parent>
 
     <artifactId>dante-module-strategy</artifactId>

diff --git a/modules/pom.xml b/modules/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.1.2</version>
+        <version>3.3.1.3</version>
     </parent>
 
     <artifactId>modules</artifactId>

diff --git a/packages/authentication-spring-boot-starter/pom.xml b/packages/authentication-spring-boot-starter/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.1.2</version>
+        <version>3.3.1.3</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
@@ -26,7 +26,7 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.1.2</version>
+        <version>3.3.1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/packages/pom.xml b/packages/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.1.2</version>
+        <version>3.3.1.3</version>
     </parent>
 
     <artifactId>packages</artifactId>

diff --git a/packages/service-spring-boot-starter/pom.xml b/packages/service-spring-boot-starter/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.1.2</version>
+        <version>3.3.1.3</version>
     </parent>
 
     <artifactId>service-spring-boot-starter</artifactId>

diff --git a/platform/dante-cloud-gateway/pom.xml b/platform/dante-cloud-gateway/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.1.2</version>
+        <version>3.3.1.3</version>
     </parent>
 
     <artifactId>dante-cloud-gateway</artifactId>

diff --git a/platform/dante-cloud-message/pom.xml b/platform/dante-cloud-message/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>cn.herodotus.dante</groupId>
         <artifactId>platform</artifactId>
-        <version>3.3.1.2</version>
+        <version>3.3.1.3</version>
     </parent>
 
     <artifactId>dante-cloud-message</artifactId>

diff --git a/platform/dante-cloud-monitor/pom.xml b/platform/dante-cloud-monitor/pom.xml
@@ -26,11 +26,11 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.1.2</version>
+        <version>3.3.1.3</version>
     </parent>
 
     <artifactId>dante-cloud-monitor</artifactId>
-    <version>3.3.1.2</version>
+    <version>3.3.1.3</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
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.1.2</version>
+        <version>3.3.1.3</version>
     </parent>
 
     <artifactId>dante-cloud-uaa</artifactId>

diff --git a/platform/dante-cloud-upms/pom.xml b/platform/dante-cloud-upms/pom.xml
@@ -26,12 +26,12 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.1.2</version>
+        <version>3.3.1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dante-cloud-upms</artifactId>
-    <version>3.3.1.2</version>
+    <version>3.3.1.3</version>
 
     <dependencies>
         <dependency>

diff --git a/platform/pom.xml b/platform/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.1.2</version>
+        <version>3.3.1.3</version>
     </parent>
 
     <artifactId>platform</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>cn.herodotus.dante</groupId>
         <artifactId>dependencies</artifactId>
-        <version>3.3.1.2</version>
+        <version>3.3.1.3</version>
         <relativePath>dependencies/pom.xml</relativePath>
     </parent>
 

diff --git a/services/dante-cloud-bpmn-ability/pom.xml b/services/dante-cloud-bpmn-ability/pom.xml
@@ -27,11 +27,11 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.1.2</version>
+        <version>3.3.1.3</version>
     </parent>
 
     <artifactId>dante-cloud-bpmn-ability</artifactId>
-    <version>3.3.1.2</version>
+    <version>3.3.1.3</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
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.1.2</version>
+        <version>3.3.1.3</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
@@ -27,7 +27,7 @@
     <parent>
         <groupId>cn.herodotus.dante</groupId>
         <artifactId>services</artifactId>
-        <version>3.3.1.2</version>
+        <version>3.3.1.3</version>
     </parent>
 
     <artifactId>dante-cloud-oss-ability</artifactId>

diff --git a/services/pom.xml b/services/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.1.2</version>
+        <version>3.3.1.3</version>
     </parent>
 
     <artifactId>services</artifactId>