From 3136374198c8b9308bd810bae2eb8c8d09e31a6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= Date: Wed, 1 Mar 2023 13:52:04 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8D=B1=20feat:=20v3.0.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 主要更新 - [升级] 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 --- README.md | 20 +++++++++---------- .../docker-compose/linux/herodotus/.env | 2 +- .../docker-compose/windows/herodotus/.env | 2 +- dependencies/pom.xml | 4 ++-- modules/dante-module-common/pom.xml | 4 ++-- modules/dante-module-security/pom.xml | 4 ++-- modules/dante-module-strategy/pom.xml | 4 ++-- modules/dante-module-upms-logic/pom.xml | 4 ++-- .../service/system/SysElementService.java | 6 +++++- modules/dante-module-upms-rest/pom.xml | 4 ++-- .../system/SysElementController.java | 6 ++++-- modules/pom.xml | 4 ++-- .../pom.xml | 4 ++-- packages/facility-spring-boot-starter/pom.xml | 2 +- packages/pom.xml | 4 ++-- packages/service-spring-boot-starter/pom.xml | 4 ++-- platform/dante-cloud-gateway/pom.xml | 4 ++-- platform/dante-cloud-message/pom.xml | 4 ++-- platform/dante-cloud-monitor/pom.xml | 4 ++-- platform/dante-cloud-uaa/pom.xml | 4 ++-- platform/dante-cloud-upms/pom.xml | 4 ++-- platform/pom.xml | 2 +- pom.xml | 4 ++-- services/dante-cloud-bpmn-ability/pom.xml | 4 ++-- .../resources/META-INF/resources/openapi.json | 2 +- services/dante-cloud-bpmn-logic/pom.xml | 4 ++-- services/pom.xml | 4 ++-- 27 files changed, 62 insertions(+), 56 deletions(-) diff --git a/README.md b/README.md index 759773317..1c6a8237a 100644 --- a/README.md +++ b/README.md @@ -5,15 +5,15 @@ ---

- Spring Authorization Server 1.0.1 - Spring Boot 3.0.2 + Spring Authorization Server 1.1.0 + 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 - Nacos 2.2.1-RC + Nacos 2.2.1

- Version 3.0.2.3 + Version 3.0.3.0 Java 17 License Apache 2.0 码匠君 @@ -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 index 09d31a5a5..870696954 100644 --- 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 index 09d31a5a5..870696954 100644 --- 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 index fbb5f55fe..603006691 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -32,13 +32,13 @@ cn.herodotus.engine dependencies - 3.0.2.3 + 3.0.3.0 cn.herodotus.dante dependencies - 3.0.2.3 + 3.0.3.0 pom dante-cloud-dependencies diff --git a/modules/dante-module-common/pom.xml b/modules/dante-module-common/pom.xml index 85fe10596..8cee8a6bb 100644 --- a/modules/dante-module-common/pom.xml +++ b/modules/dante-module-common/pom.xml @@ -32,11 +32,11 @@ modules cn.herodotus.dante - 3.0.2.3 + 3.0.3.0 dante-module-common - 3.0.2.3 + 3.0.3.0 jar diff --git a/modules/dante-module-security/pom.xml b/modules/dante-module-security/pom.xml index 4efdbc04b..5a7e783a9 100644 --- a/modules/dante-module-security/pom.xml +++ b/modules/dante-module-security/pom.xml @@ -32,11 +32,11 @@ modules cn.herodotus.dante - 3.0.2.3 + 3.0.3.0 dante-module-security - 3.0.2.3 + 3.0.3.0 jar diff --git a/modules/dante-module-strategy/pom.xml b/modules/dante-module-strategy/pom.xml index 496fafbc4..114ef438b 100644 --- a/modules/dante-module-strategy/pom.xml +++ b/modules/dante-module-strategy/pom.xml @@ -32,11 +32,11 @@ modules cn.herodotus.dante - 3.0.2.3 + 3.0.3.0 dante-module-strategy - 3.0.2.3 + 3.0.3.0 jar diff --git a/modules/dante-module-upms-logic/pom.xml b/modules/dante-module-upms-logic/pom.xml index fde44abbf..71fe94c35 100644 --- a/modules/dante-module-upms-logic/pom.xml +++ b/modules/dante-module-upms-logic/pom.xml @@ -32,11 +32,11 @@ modules cn.herodotus.dante - 3.0.2.3 + 3.0.3.0 dante-module-upms-logic - 3.0.2.3 + 3.0.3.0 jar diff --git a/modules/dante-module-upms-logic/src/main/java/cn/herodotus/dante/module/upms/logic/service/system/SysElementService.java b/modules/dante-module-upms-logic/src/main/java/cn/herodotus/dante/module/upms/logic/service/system/SysElementService.java index 51aaa6d0b..e0cc234aa 100644 --- a/modules/dante-module-upms-logic/src/main/java/cn/herodotus/dante/module/upms/logic/service/system/SysElementService.java +++ b/modules/dante-module-upms-logic/src/main/java/cn/herodotus/dante/module/upms/logic/service/system/SysElementService.java @@ -76,7 +76,7 @@ public BaseRepository getRepository() { return sysElementRepository; } - public Page findByCondition(int pageNumber, int pageSize, String path) { + public Page findByCondition(int pageNumber, int pageSize, String path, String title) { Pageable pageable = PageRequest.of(pageNumber, pageSize); Specification specification = (root, criteriaQuery, criteriaBuilder) -> { @@ -87,6 +87,10 @@ public Page 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 index 51c6cea69..696b55eae 100644 --- a/modules/dante-module-upms-rest/pom.xml +++ b/modules/dante-module-upms-rest/pom.xml @@ -32,11 +32,11 @@ modules cn.herodotus.dante - 3.0.2.3 + 3.0.3.0 dante-module-upms-rest - 3.0.2.3 + 3.0.3.0 jar diff --git a/modules/dante-module-upms-rest/src/main/java/cn/herodotus/dante/module/upms/rest/controller/system/SysElementController.java b/modules/dante-module-upms-rest/src/main/java/cn/herodotus/dante/module/upms/rest/controller/system/SysElementController.java index ea576b186..c61d0788f 100644 --- a/modules/dante-module-upms-rest/src/main/java/cn/herodotus/dante/module/upms/rest/controller/system/SysElementController.java +++ b/modules/dante-module-upms-rest/src/main/java/cn/herodotus/dante/module/upms/rest/controller/system/SysElementController.java @@ -99,12 +99,14 @@ public Result>> 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> findByCondition(@NotBlank @RequestParam("pageNumber") Integer pageNumber, @NotBlank @RequestParam("pageSize") Integer pageSize, - @RequestParam(value = "path", required = false) String path) { - Page pages = sysElementService.findByCondition(pageNumber, pageSize, path); + @RequestParam(value = "path", required = false) String path, + @RequestParam(value = "title", required = false) String title) { + Page pages = sysElementService.findByCondition(pageNumber, pageSize, path, title); return result(pages); } diff --git a/modules/pom.xml b/modules/pom.xml index eb7cf4553..812c3f747 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -32,11 +32,11 @@ dante-cloud cn.herodotus.dante - 3.0.2.3 + 3.0.3.0 modules - 3.0.2.3 + 3.0.3.0 pom dante-cloud-modules diff --git a/packages/authentication-spring-boot-starter/pom.xml b/packages/authentication-spring-boot-starter/pom.xml index 5c6a1a33e..da1ada23f 100644 --- a/packages/authentication-spring-boot-starter/pom.xml +++ b/packages/authentication-spring-boot-starter/pom.xml @@ -32,11 +32,11 @@ packages cn.herodotus.dante - 3.0.2.3 + 3.0.3.0 authentication-spring-boot-starter - 3.0.2.3 + 3.0.3.0 jar diff --git a/packages/facility-spring-boot-starter/pom.xml b/packages/facility-spring-boot-starter/pom.xml index 6e0f9e8d8..08c95fca7 100644 --- a/packages/facility-spring-boot-starter/pom.xml +++ b/packages/facility-spring-boot-starter/pom.xml @@ -30,7 +30,7 @@ packages cn.herodotus.dante - 3.0.2.3 + 3.0.3.0 4.0.0 diff --git a/packages/pom.xml b/packages/pom.xml index c1c602504..5a2b51755 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -32,11 +32,11 @@ dante-cloud cn.herodotus.dante - 3.0.2.3 + 3.0.3.0 packages - 3.0.2.3 + 3.0.3.0 pom dante-cloud-packages diff --git a/packages/service-spring-boot-starter/pom.xml b/packages/service-spring-boot-starter/pom.xml index 7a84bafcd..a1b809bc5 100644 --- a/packages/service-spring-boot-starter/pom.xml +++ b/packages/service-spring-boot-starter/pom.xml @@ -32,11 +32,11 @@ packages cn.herodotus.dante - 3.0.2.3 + 3.0.3.0 service-spring-boot-starter - 3.0.2.3 + 3.0.3.0 jar diff --git a/platform/dante-cloud-gateway/pom.xml b/platform/dante-cloud-gateway/pom.xml index d6aef4ce6..53c43977e 100644 --- a/platform/dante-cloud-gateway/pom.xml +++ b/platform/dante-cloud-gateway/pom.xml @@ -32,11 +32,11 @@ platform cn.herodotus.dante - 3.0.2.3 + 3.0.3.0 dante-cloud-gateway - 3.0.2.3 + 3.0.3.0 jar diff --git a/platform/dante-cloud-message/pom.xml b/platform/dante-cloud-message/pom.xml index b862960f5..28023310b 100644 --- a/platform/dante-cloud-message/pom.xml +++ b/platform/dante-cloud-message/pom.xml @@ -31,11 +31,11 @@ cn.herodotus.dante platform - 3.0.2.3 + 3.0.3.0 dante-cloud-message - 3.0.2.3 + 3.0.3.0 jar diff --git a/platform/dante-cloud-monitor/pom.xml b/platform/dante-cloud-monitor/pom.xml index 6c37fc6ca..62bd9a76e 100644 --- a/platform/dante-cloud-monitor/pom.xml +++ b/platform/dante-cloud-monitor/pom.xml @@ -30,11 +30,11 @@ platform cn.herodotus.dante - 3.0.2.3 + 3.0.3.0 dante-cloud-monitor - 3.0.2.3 + 3.0.3.0 dante-cloud-monitor dante-cloud-monitor diff --git a/platform/dante-cloud-uaa/pom.xml b/platform/dante-cloud-uaa/pom.xml index dd7afa663..aba9cbdd7 100644 --- a/platform/dante-cloud-uaa/pom.xml +++ b/platform/dante-cloud-uaa/pom.xml @@ -32,11 +32,11 @@ platform cn.herodotus.dante - 3.0.2.3 + 3.0.3.0 dante-cloud-uaa - 3.0.2.3 + 3.0.3.0 jar diff --git a/platform/dante-cloud-upms/pom.xml b/platform/dante-cloud-upms/pom.xml index da044e111..d39b5f5e4 100644 --- a/platform/dante-cloud-upms/pom.xml +++ b/platform/dante-cloud-upms/pom.xml @@ -30,12 +30,12 @@ platform cn.herodotus.dante - 3.0.2.3 + 3.0.3.0 4.0.0 dante-cloud-upms - 3.0.2.3 + 3.0.3.0 diff --git a/platform/pom.xml b/platform/pom.xml index ff0005e9c..3286a7ed9 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -32,7 +32,7 @@ dante-cloud cn.herodotus.dante - 3.0.2.3 + 3.0.3.0 platform diff --git a/pom.xml b/pom.xml index 522505e10..b31c97362 100644 --- a/pom.xml +++ b/pom.xml @@ -32,12 +32,12 @@ cn.herodotus.dante dependencies - 3.0.2.3 + 3.0.3.0 dependencies/pom.xml dante-cloud - 3.0.2.3 + 3.0.3.0 pom dante-cloud diff --git a/services/dante-cloud-bpmn-ability/pom.xml b/services/dante-cloud-bpmn-ability/pom.xml index b49f7bbe2..e8044a7c2 100644 --- a/services/dante-cloud-bpmn-ability/pom.xml +++ b/services/dante-cloud-bpmn-ability/pom.xml @@ -31,11 +31,11 @@ services cn.herodotus.dante - 3.0.2.3 + 3.0.3.0 dante-cloud-bpmn-ability - 3.0.2.3 + 3.0.3.0 dante-cloud-bpmn-ability 基于Camunda工作流的服务 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 index 8c3fc5f24..58d285bef 100644 --- 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 index 41315292e..730b22a72 100644 --- a/services/dante-cloud-bpmn-logic/pom.xml +++ b/services/dante-cloud-bpmn-logic/pom.xml @@ -32,11 +32,11 @@ services cn.herodotus.dante - 3.0.2.3 + 3.0.3.0 dante-cloud-bpmn-logic - 3.0.2.3 + 3.0.3.0 jar diff --git a/services/pom.xml b/services/pom.xml index 3265f1ecc..cf156ae09 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -32,11 +32,11 @@ dante-cloud cn.herodotus.dante - 3.0.2.3 + 3.0.3.0 services - 3.0.2.3 + 3.0.3.0 pom dante-cloud-services