🍱 feat: v3.0.3.0

- 主要更新 - [升级] Spring Boot 版本升级至 3.0.3 - [升级] 适配 Spring Authorization Server 1.1.0-M1 - 其它更新 - [修复] 修复单体版 MySQL 数据库初始化脚本错误。fix:#I6HRDP (ISSUED by 柳敏莘) - [修复] 修复查询接口中包含 properties 数组属性会导致 Gateway UrlDecode失败的问题 fix:#I6HOLA (ISSUED by dens) - 依赖更新 - [升级] spring-security-cas 版本升级至 5.8.2 - [升级] tencentcloud-sdk-java-sms 版本升级至 3.1.702 - [升级] alipay-sdk-java 版本升级至 4.35.65.ALL
dromara · Mar 1, 2023 · 3136374 · 3136374
1 parent 6fae4ad
commit 3136374
Show file tree

Hide file tree

Showing 27 changed files with 62 additions and 56 deletions.
diff --git a/README.md b/README.md
@@ -5,15 +5,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.0.1-blue" alt="Spring Authorization Server 1.0.1"></a>
-    <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://shields.io/badge/Spring%20Boot-3.0.2-blue" alt="Spring Boot 3.0.2"></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.0-blue" alt="Spring Authorization Server 1.1.0"></a>
+    <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://shields.io/badge/Spring%20Boot-3.0.3-blue" alt="Spring Boot 3.0.3"></a>
     <a href="https://spring.io/projects/spring-cloud" target="_blank"><img src="https://shields.io/badge/Spring%20Cloud-2022.0.1-blue" alt="Spring Cloud 2022.0.1"></a>
-    <a href="https://github.com/alibaba/spring-cloud-alibaba" target="_blank"><img src="https://shields.io/badge/Spring%20Cloud%20Alibaba-2022.0.0.0-RC1-blue" alt="Spring Cloud Alibaba 2022.0.0.0-RC1"></a>
+    <a href="https://github.com/alibaba/spring-cloud-alibaba" target="_blank"><img src="https://shields.io/badge/Spring%20Cloud%20Alibaba-2022.0.0.0-blue" 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.9.0--2022.0.1-blue" alt="Spring Cloud Tencent 1.9.0-2022.0.1"></a>
-    <a href="https://nacos.io/zh-cn/index.html" target="_blank"><img src="https://shields.io/badge/Nacos-2.2.1-RC-brightgreen" alt="Nacos 2.2.1-RC"></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-3.0.2.3-red" alt="Version 3.0.2.3"></a>
+    <a href="#" target="_blank"><img src="https://shields.io/badge/Version-3.0.3.0-red" alt="Version 3.0.3.0"></a>
     <a href="https://bell-sw.com/pages/downloads/#downloads" target="_blank"><img src="https://img.shields.io/badge/JDK-17%2B-green" alt="Java 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>
@@ -36,7 +36,7 @@
 
 ## 企业级技术中台微服务架构与服务能力开发平台
 
-Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和服务能力开发平台，是全面拥抱 Spring Authorization Server 的、基于 OAuth2.1 协议的微服务架构。基于 Spring Authorization Server 1.0.1、Spring Boot 3.0.2、Spring Cloud 2022.0.1、Spring Cloud Tencent 1.9.0-2022.0.1、Spring Cloud Alibaba 2022.0.0.0-RC1、Nacos 2.2.1-RC 等主流技术栈开发的多租户系统，遵循 SpringBoot 编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能。
+Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和服务能力开发平台，是采用领域驱动模型(DDD)设计思想的、全面拥抱 Spring Authorization Server 的、基于 OAuth2.1 协议的微服务架构。基于 Spring Authorization Server 1.1.0、Spring Boot 3.0.3、Spring Cloud 2022.0.1、Spring Cloud Tencent 1.9.0-2022.0.1、Spring Cloud Alibaba 2022.0.0.0、Nacos 2.2.1 等主流技术栈开发的多租户系统，遵循 SpringBoot 编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能。
 
 ## 平台定位
 
@@ -131,13 +131,13 @@ Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和
 
 | 组件                          | 版本             |
 |-----------------------------|----------------|
-| Spring Boot                 | 3.0.2          |
+| Spring Boot                 | 3.0.3          |
 | Spring Cloud                | 2022.0.1       |
-| Spring Cloud Alibaba        | 2022.0.0.0-RC1 |
+| Spring Cloud Alibaba        | 2022.0.0.0 |
 | Spring Cloud Tencent        | 1.9.0-2022.0.1 |
-| Spring Authorization Server | 1.0.1          |
+| Spring Authorization Server | 1.1.0          |
 | Spring Boot Admin           | 3.0.0          |
-| Nacos                       | 2.2.1-RC       |
+| Nacos                       | 2.2.1       |
 | Sentinel                    | 1.8.5          |
 | Seata                       | 1.5.2          |
 

diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env
@@ -1,4 +1,4 @@
-VERSION=3.0.2.3
+VERSION=3.0.3.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 b/configurations/docker/docker-compose/windows/herodotus/.env
@@ -1,4 +1,4 @@
-VERSION=3.0.2.3
+VERSION=3.0.3.0
 GATEWAY_SERVICE_NAME=dante-cloud-gateway
 GATEWAY_SERVICE_PORT=8847
 UAA_SERVICE_NAME=dante-cloud-uaa

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -32,13 +32,13 @@
     <parent>
         <groupId>cn.herodotus.engine</groupId>
         <artifactId>dependencies</artifactId>
-        <version>3.0.2.3</version>
+        <version>3.0.3.0</version>
         <relativePath/>
     </parent>
 
     <groupId>cn.herodotus.dante</groupId>
     <artifactId>dependencies</artifactId>
-    <version>3.0.2.3</version>
+    <version>3.0.3.0</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>3.0.2.3</version>
+        <version>3.0.3.0</version>
     </parent>
 
     <artifactId>dante-module-common</artifactId>
-    <version>3.0.2.3</version>
+    <version>3.0.3.0</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>3.0.2.3</version>
+        <version>3.0.3.0</version>
     </parent>
 
     <artifactId>dante-module-security</artifactId>
-    <version>3.0.2.3</version>
+    <version>3.0.3.0</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>3.0.2.3</version>
+        <version>3.0.3.0</version>
     </parent>
 
     <artifactId>dante-module-strategy</artifactId>
-    <version>3.0.2.3</version>
+    <version>3.0.3.0</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>3.0.2.3</version>
+        <version>3.0.3.0</version>
     </parent>
 
     <artifactId>dante-module-upms-logic</artifactId>
-    <version>3.0.2.3</version>
+    <version>3.0.3.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/.../src/main/java/cn/herodotus/dante/module/upms/logic/service/system/SysElementService.java b/.../src/main/java/cn/herodotus/dante/module/upms/logic/service/system/SysElementService.java
@@ -76,7 +76,7 @@ public BaseRepository<SysElement, String> getRepository() {
         return sysElementRepository;
     }
 
-    public Page<SysElement> findByCondition(int pageNumber, int pageSize, String path) {
+    public Page<SysElement> findByCondition(int pageNumber, int pageSize, String path, String title) {
         Pageable pageable = PageRequest.of(pageNumber, pageSize);
 
         Specification<SysElement> specification = (root, criteriaQuery, criteriaBuilder) -> {
@@ -87,6 +87,10 @@ public Page<SysElement> findByCondition(int pageNumber, int pageSize, String pat
                 predicates.add(criteriaBuilder.like(root.get("path"), like(path)));
             }
 
+            if (ObjectUtils.isNotEmpty(title)) {
+                predicates.add(criteriaBuilder.like(root.get("title"), like(title)));
+            }
+
             Predicate[] predicateArray = new Predicate[predicates.size()];
             criteriaQuery.where(criteriaBuilder.and(predicates.toArray(predicateArray)));
             return criteriaQuery.getRestriction();

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>3.0.2.3</version>
+        <version>3.0.3.0</version>
     </parent>
 
     <artifactId>dante-module-upms-rest</artifactId>
-    <version>3.0.2.3</version>
+    <version>3.0.3.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/...main/java/cn/herodotus/dante/module/upms/rest/controller/system/SysElementController.java b/...main/java/cn/herodotus/dante/module/upms/rest/controller/system/SysElementController.java
@@ -99,12 +99,14 @@ public Result<List<Tree<String>>> findTree() {
             @Parameter(name = "pageNumber", required = true, description = "当前页码"),
             @Parameter(name = "pageSize", required = true, description = "每页显示数量"),
             @Parameter(name = "path", description = "组件路径"),
+            @Parameter(name = "title", description = "组件标题"),
     })
     @GetMapping("/condition")
     public Result<Map<String, Object>> findByCondition(@NotBlank @RequestParam("pageNumber") Integer pageNumber,
                                                        @NotBlank @RequestParam("pageSize") Integer pageSize,
-                                                       @RequestParam(value = "path", required = false) String path) {
-        Page<SysElement> pages = sysElementService.findByCondition(pageNumber, pageSize, path);
+                                                       @RequestParam(value = "path", required = false) String path,
+                                                       @RequestParam(value = "title", required = false) String title) {
+        Page<SysElement> pages = sysElementService.findByCondition(pageNumber, pageSize, path, title);
         return result(pages);
     }
 

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>3.0.2.3</version>
+        <version>3.0.3.0</version>
     </parent>
 
     <artifactId>modules</artifactId>
-    <version>3.0.2.3</version>
+    <version>3.0.3.0</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>3.0.2.3</version>
+        <version>3.0.3.0</version>
     </parent>
 
     <artifactId>authentication-spring-boot-starter</artifactId>
-    <version>3.0.2.3</version>
+    <version>3.0.3.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

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.0.2.3</version>
+        <version>3.0.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

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.0.2.3</version>
+        <version>3.0.3.0</version>
     </parent>
 
     <artifactId>dante-cloud-bpmn-ability</artifactId>
-    <version>3.0.2.3</version>
+    <version>3.0.3.0</version>
 
     <name>dante-cloud-bpmn-ability</name>
     <description>基于Camunda工作流的服务</description>

diff --git a/services/dante-cloud-bpmn-ability/src/main/resources/META-INF/resources/openapi.json b/services/dante-cloud-bpmn-ability/src/main/resources/META-INF/resources/openapi.json
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.2",
+  "openapi": "3.0.3",
   "info": {
     "title": "Camunda Platform REST API",
     "description": "OpenApi Spec for Camunda Platform REST API.",

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>3.0.2.3</version>
+        <version>3.0.3.0</version>
     </parent>
 
     <artifactId>dante-cloud-bpmn-logic</artifactId>
-    <version>3.0.2.3</version>
+    <version>3.0.3.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/services/pom.xml b/services/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.0.2.3</version>
+        <version>3.0.3.0</version>
     </parent>
 
     <artifactId>services</artifactId>
-    <version>3.0.2.3</version>
+    <version>3.0.3.0</version>
     <packaging>pom</packaging>
 
     <name>dante-cloud-services</name>