From 94cf34fd3cd06f98ffdd9c8b0c6ab1b468a6d893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= Date: Sun, 27 Jul 2025 18:02:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=9D=E5=A7=8B=E5=8C=96=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E9=BB=98=E8=AE=A4=E9=80=9A=E7=94=A8=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=95=B0=E6=8D=AE=E6=AC=A0=E7=BC=BA=E8=87=B4=E4=BD=BF?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=B4=A6=E5=8F=B7=E5=90=8E=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/sqls/oss-data-mysql.sql | 2 +- .../src/main/resources/sqls/oss-data-postgresql.sql | 2 +- .../src/main/resources/sqls/oss-data-mysql.sql | 2 +- .../src/main/resources/sqls/oss-data-postgresql.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/dante-cloud-oss-ability/src/main/resources/sqls/oss-data-mysql.sql b/services/dante-cloud-oss-ability/src/main/resources/sqls/oss-data-mysql.sql index 07495dbd..d1c8e259 100644 --- a/services/dante-cloud-oss-ability/src/main/resources/sqls/oss-data-mysql.sql +++ b/services/dante-cloud-oss-ability/src/main/resources/sqls/oss-data-mysql.sql @@ -368,7 +368,7 @@ FROM `sys_attribute` sa WHERE sa.url LIKE'%security%' - AND sa.url != '/security/element/tree' UNION + AND (sa.url != '/security/element/tree' OR sa.url != '/security/dictionary/items/{category}') UNION SELECT '4' AS permission_id, sa.attribute_id diff --git a/services/dante-cloud-oss-ability/src/main/resources/sqls/oss-data-postgresql.sql b/services/dante-cloud-oss-ability/src/main/resources/sqls/oss-data-postgresql.sql index 7011e81f..59ca720d 100644 --- a/services/dante-cloud-oss-ability/src/main/resources/sqls/oss-data-postgresql.sql +++ b/services/dante-cloud-oss-ability/src/main/resources/sqls/oss-data-postgresql.sql @@ -369,7 +369,7 @@ FROM "sys_attribute" sa WHERE sa.url LIKE'%security%' - AND sa.url != '/security/element/tree' UNION + AND (sa.url != '/security/element/tree' OR sa.url != '/security/dictionary/items/{category}') UNION SELECT '4' AS permission_id, sa.attribute_id diff --git a/services/dante-monomer-application/src/main/resources/sqls/oss-data-mysql.sql b/services/dante-monomer-application/src/main/resources/sqls/oss-data-mysql.sql index 9cf370d0..dd2effc3 100644 --- a/services/dante-monomer-application/src/main/resources/sqls/oss-data-mysql.sql +++ b/services/dante-monomer-application/src/main/resources/sqls/oss-data-mysql.sql @@ -370,7 +370,7 @@ FROM `sys_attribute` sa WHERE sa.url LIKE'%security%' - AND sa.url != '/security/element/tree' UNION + AND (sa.url != '/security/element/tree' OR sa.url != '/security/dictionary/items/{category}') UNION SELECT '4' AS permission_id, sa.attribute_id diff --git a/services/dante-monomer-application/src/main/resources/sqls/oss-data-postgresql.sql b/services/dante-monomer-application/src/main/resources/sqls/oss-data-postgresql.sql index 8fb27741..d3afe551 100644 --- a/services/dante-monomer-application/src/main/resources/sqls/oss-data-postgresql.sql +++ b/services/dante-monomer-application/src/main/resources/sqls/oss-data-postgresql.sql @@ -371,7 +371,7 @@ FROM "sys_attribute" sa WHERE sa.url LIKE'%security%' - AND sa.url != '/security/element/tree' UNION + AND (sa.url != '/security/element/tree' OR sa.url != '/security/dictionary/items/{category}') UNION SELECT '4' AS permission_id, sa.attribute_id -- Gitee From d1d94de5411b53c778e38a9d9aef758964074129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= Date: Wed, 30 Jul 2025 22:57:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A7=B1=20feat:=20v3.5.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 主要更新 - [优化] 改用 openfeign 维护的 querydsl，替换不再维护的官方 querydsl，同时消除 querydsl 携带的 CVE 漏洞。 - [优化] 删除 blaze-persistence 以及相关的低版本组件依赖及配置 - 其它更新 - [新增] 增加支持不同组件库的菜单处理逻辑定义 - [修复] 优化第三方社交登录绑定列表，在未绑定时显示默认时间问题 - [修复] 修复数据初始化脚本中，默认通用权限数据欠缺致使切换账号后权限异常 - [重构] 使用 openfeign 维护的 querydsl 重构第三方账号绑定查询 - [重构] 迁移前端认证安全相关内容代码至模块 @herodotus-cloud/framework-kernel - [重构] 迁移前端菜单相关内容代码至模块 @herodotus-cloud/framework-kernel - [重构] 迁移前端 Passkey 相关内容代码至模块 @herodotus-cloud/framework-kernel - [重构] 迁移前端 Pinia Helper 相关内容代码至模块 @herodotus-cloud/framework-kernel - [重构] 迁移前端 SignOutUtilities 相关内容代码至模块 @herodotus-cloud/framework-kernel - [重构] 迁移前端 useSystemRoute 相关内容代码至模块 @herodotus-cloud/framework-kernel - [重构] 前端使用 Vue3 Setup 和最新方式重构 App.vue 代码 - 依赖更新 - [升级] alipay-sdk-java 版本升级至 4.40.354.ALL - [升级] fastjson2 版本升级至 2.0.58 - [升级] grpc-bom 版本升级至 1.74.0 - [升级] openfeign querydsl 版本升级至 7.0 - [升级] software.amazon.awssdk 版本升级至 2.32.11 - [升级] software.amazon.awssdk.crt 版本升级至 0.38.8 - [升级] vue webjars 版本升级至 3.5.18 - [升级] wxjava 版本升级至 4.7.7-20250725.114118 - [升级] error_prone_annotations 版本升级至 2.41.0 - [升级] okio 版本升级至 3.16.0 --- README.md | 6 +++--- .../nacos_config_export_20250704224541.zip | Bin .../polaris_config_202405311904.zip | Bin .../docker/docker-compose/linux/herodotus/.env | 2 +- .../docker/docker-compose/windows/herodotus/.env | 2 +- dependencies/pom.xml | 2 +- modules/dante-module-common/pom.xml | 2 +- modules/dante-module-metadata/pom.xml | 2 +- modules/dante-module-social/pom.xml | 2 +- modules/dante-module-strategy/pom.xml | 2 +- modules/dante-monomer-autoconfigure/pom.xml | 2 +- modules/pom.xml | 2 +- packages/authentication-spring-boot-starter/pom.xml | 2 +- packages/facility-spring-boot-starter/pom.xml | 2 +- packages/pom.xml | 2 +- packages/service-spring-boot-starter/pom.xml | 2 +- platform/dante-cloud-gateway/pom.xml | 2 +- platform/dante-cloud-message/pom.xml | 2 +- platform/dante-cloud-monitor/pom.xml | 4 ++-- platform/dante-cloud-uaa/pom.xml | 2 +- platform/dante-cloud-upms/pom.xml | 4 ++-- platform/pom.xml | 2 +- pom.xml | 2 +- services/dante-cloud-bpmn-ability/pom.xml | 4 ++-- services/dante-cloud-bpmn-logic/pom.xml | 2 +- services/dante-cloud-oss-ability/pom.xml | 2 +- services/dante-monomer-application/pom.xml | 2 +- services/pom.xml | 2 +- 28 files changed, 31 insertions(+), 31 deletions(-) rename configurations/backup/alibaba/{3.5.3.2 => 3.5.4.1}/nacos_config_export_20250704224541.zip (100%) rename configurations/backup/tencent/{3.5.3.2 => 3.5.4.1}/polaris_config_202405311904.zip (100%) diff --git a/README.md b/README.md index 3211fd19..71c4cd08 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ Nacos 3.0.2

- Version 3.5.4.0 - Dante Engine 3.5.4.0 - Dante OSS 3.5.4.0 + Version 3.5.4.1 + Dante Engine 3.5.4.1 + Dante OSS 3.5.4.1 Java 17 License Apache 2.0 码匠君 diff --git a/configurations/backup/alibaba/3.5.3.2/nacos_config_export_20250704224541.zip b/configurations/backup/alibaba/3.5.4.1/nacos_config_export_20250704224541.zip similarity index 100% rename from configurations/backup/alibaba/3.5.3.2/nacos_config_export_20250704224541.zip rename to configurations/backup/alibaba/3.5.4.1/nacos_config_export_20250704224541.zip diff --git a/configurations/backup/tencent/3.5.3.2/polaris_config_202405311904.zip b/configurations/backup/tencent/3.5.4.1/polaris_config_202405311904.zip similarity index 100% rename from configurations/backup/tencent/3.5.3.2/polaris_config_202405311904.zip rename to configurations/backup/tencent/3.5.4.1/polaris_config_202405311904.zip diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env index 3fb13078..9ff5cad5 100644 --- a/configurations/docker/docker-compose/linux/herodotus/.env +++ b/configurations/docker/docker-compose/linux/herodotus/.env @@ -1,4 +1,4 @@ -VERSION=3.5.4.0 +VERSION=3.5.4.1 SPRING_PROFILES_ACTIVE=alibaba PROFILE=development DATABASE=postgresql diff --git a/configurations/docker/docker-compose/windows/herodotus/.env b/configurations/docker/docker-compose/windows/herodotus/.env index 9503fd13..52fdaecb 100644 --- a/configurations/docker/docker-compose/windows/herodotus/.env +++ b/configurations/docker/docker-compose/windows/herodotus/.env @@ -1,4 +1,4 @@ -VERSION=3.5.4.0 +VERSION=3.5.4.1 SPRING_PROFILES_ACTIVE=alibaba PROFILE=development DATABASE=postgresql diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 0d5e2878..f1dbcb45 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -28,7 +28,7 @@ cn.herodotus.engine dependencies - 3.5.4.0 + 3.5.4.1 diff --git a/modules/dante-module-common/pom.xml b/modules/dante-module-common/pom.xml index 900bc3d6..93bc3f30 100644 --- a/modules/dante-module-common/pom.xml +++ b/modules/dante-module-common/pom.xml @@ -32,7 +32,7 @@ modules org.dromara.dante - 3.5.4.0 + 3.5.4.1 dante-module-common diff --git a/modules/dante-module-metadata/pom.xml b/modules/dante-module-metadata/pom.xml index a6c1bd68..745303aa 100644 --- a/modules/dante-module-metadata/pom.xml +++ b/modules/dante-module-metadata/pom.xml @@ -32,7 +32,7 @@ modules org.dromara.dante - 3.5.4.0 + 3.5.4.1 dante-module-metadata diff --git a/modules/dante-module-social/pom.xml b/modules/dante-module-social/pom.xml index 0ebc249f..72ea0fcb 100644 --- a/modules/dante-module-social/pom.xml +++ b/modules/dante-module-social/pom.xml @@ -32,7 +32,7 @@ modules org.dromara.dante - 3.5.4.0 + 3.5.4.1 dante-module-social diff --git a/modules/dante-module-strategy/pom.xml b/modules/dante-module-strategy/pom.xml index 1389f547..f691cfdd 100644 --- a/modules/dante-module-strategy/pom.xml +++ b/modules/dante-module-strategy/pom.xml @@ -32,7 +32,7 @@ modules org.dromara.dante - 3.5.4.0 + 3.5.4.1 dante-module-strategy diff --git a/modules/dante-monomer-autoconfigure/pom.xml b/modules/dante-monomer-autoconfigure/pom.xml index f4a4b0ee..a8fa7da6 100644 --- a/modules/dante-monomer-autoconfigure/pom.xml +++ b/modules/dante-monomer-autoconfigure/pom.xml @@ -27,7 +27,7 @@ org.dromara.dante modules - 3.5.4.0 + 3.5.4.1 dante-monomer-autoconfigure diff --git a/modules/pom.xml b/modules/pom.xml index e903cba9..1347f581 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.5.4.0 + 3.5.4.1 modules diff --git a/packages/authentication-spring-boot-starter/pom.xml b/packages/authentication-spring-boot-starter/pom.xml index 9b8b8f68..d6bb504d 100644 --- a/packages/authentication-spring-boot-starter/pom.xml +++ b/packages/authentication-spring-boot-starter/pom.xml @@ -32,7 +32,7 @@ packages org.dromara.dante - 3.5.4.0 + 3.5.4.1 authentication-spring-boot-starter diff --git a/packages/facility-spring-boot-starter/pom.xml b/packages/facility-spring-boot-starter/pom.xml index e8648fca..6179e535 100644 --- a/packages/facility-spring-boot-starter/pom.xml +++ b/packages/facility-spring-boot-starter/pom.xml @@ -30,7 +30,7 @@ packages org.dromara.dante - 3.5.4.0 + 3.5.4.1 4.0.0 diff --git a/packages/pom.xml b/packages/pom.xml index 2a7ac324..e5f3492e 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.5.4.0 + 3.5.4.1 packages diff --git a/packages/service-spring-boot-starter/pom.xml b/packages/service-spring-boot-starter/pom.xml index 614874c7..c9bda77e 100644 --- a/packages/service-spring-boot-starter/pom.xml +++ b/packages/service-spring-boot-starter/pom.xml @@ -32,7 +32,7 @@ packages org.dromara.dante - 3.5.4.0 + 3.5.4.1 service-spring-boot-starter diff --git a/platform/dante-cloud-gateway/pom.xml b/platform/dante-cloud-gateway/pom.xml index 4a98f0c9..4ee37bc7 100644 --- a/platform/dante-cloud-gateway/pom.xml +++ b/platform/dante-cloud-gateway/pom.xml @@ -32,7 +32,7 @@ platform org.dromara.dante - 3.5.4.0 + 3.5.4.1 dante-cloud-gateway diff --git a/platform/dante-cloud-message/pom.xml b/platform/dante-cloud-message/pom.xml index 702b7aae..0aa79975 100644 --- a/platform/dante-cloud-message/pom.xml +++ b/platform/dante-cloud-message/pom.xml @@ -31,7 +31,7 @@ org.dromara.dante platform - 3.5.4.0 + 3.5.4.1 dante-cloud-message diff --git a/platform/dante-cloud-monitor/pom.xml b/platform/dante-cloud-monitor/pom.xml index 2f0486f0..f8bd121d 100644 --- a/platform/dante-cloud-monitor/pom.xml +++ b/platform/dante-cloud-monitor/pom.xml @@ -30,11 +30,11 @@ platform org.dromara.dante - 3.5.4.0 + 3.5.4.1 dante-cloud-monitor - 3.5.4.0 + 3.5.4.1 dante-cloud-monitor dante-cloud-monitor diff --git a/platform/dante-cloud-uaa/pom.xml b/platform/dante-cloud-uaa/pom.xml index 1cb447a6..5950a35b 100644 --- a/platform/dante-cloud-uaa/pom.xml +++ b/platform/dante-cloud-uaa/pom.xml @@ -32,7 +32,7 @@ platform org.dromara.dante - 3.5.4.0 + 3.5.4.1 dante-cloud-uaa diff --git a/platform/dante-cloud-upms/pom.xml b/platform/dante-cloud-upms/pom.xml index be17814f..24d5f544 100644 --- a/platform/dante-cloud-upms/pom.xml +++ b/platform/dante-cloud-upms/pom.xml @@ -30,12 +30,12 @@ platform org.dromara.dante - 3.5.4.0 + 3.5.4.1 4.0.0 dante-cloud-upms - 3.5.4.0 + 3.5.4.1 diff --git a/platform/pom.xml b/platform/pom.xml index 4f323ee6..904c30c4 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.5.4.0 + 3.5.4.1 platform diff --git a/pom.xml b/pom.xml index d4a8417d..cc5c2f82 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.dromara.dante dependencies - 3.5.4.0 + 3.5.4.1 dependencies/pom.xml diff --git a/services/dante-cloud-bpmn-ability/pom.xml b/services/dante-cloud-bpmn-ability/pom.xml index 8028b862..2a95b213 100644 --- a/services/dante-cloud-bpmn-ability/pom.xml +++ b/services/dante-cloud-bpmn-ability/pom.xml @@ -31,11 +31,11 @@ services org.dromara.dante - 3.5.4.0 + 3.5.4.1 dante-cloud-bpmn-ability - 3.5.4.0 + 3.5.4.1 dante-cloud-bpmn-ability 基于Camunda工作流的服务 diff --git a/services/dante-cloud-bpmn-logic/pom.xml b/services/dante-cloud-bpmn-logic/pom.xml index 133e5712..fa990059 100644 --- a/services/dante-cloud-bpmn-logic/pom.xml +++ b/services/dante-cloud-bpmn-logic/pom.xml @@ -32,7 +32,7 @@ services org.dromara.dante - 3.5.4.0 + 3.5.4.1 dante-cloud-bpmn-logic diff --git a/services/dante-cloud-oss-ability/pom.xml b/services/dante-cloud-oss-ability/pom.xml index 9e96f4ef..33e5be8f 100644 --- a/services/dante-cloud-oss-ability/pom.xml +++ b/services/dante-cloud-oss-ability/pom.xml @@ -31,7 +31,7 @@ org.dromara.dante services - 3.5.4.0 + 3.5.4.1 dante-cloud-oss-ability diff --git a/services/dante-monomer-application/pom.xml b/services/dante-monomer-application/pom.xml index c2407a40..90a63b44 100644 --- a/services/dante-monomer-application/pom.xml +++ b/services/dante-monomer-application/pom.xml @@ -31,7 +31,7 @@ org.dromara.dante services - 3.5.4.0 + 3.5.4.1 dante-monomer-application diff --git a/services/pom.xml b/services/pom.xml index 3d97becd..88ecd463 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.5.4.0 + 3.5.4.1 services -- Gitee