diff --git a/README.md b/README.md index 60fa6208e9d0141d5493dea5eb296944c14cc0ca..1ba6a7f9afd517c185e3d49d93b04908ebf6ae88 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@ Nacos 3.1.1

- Version 4.0.0.0-M4 - Dante Engine 4.0.0.0-M4 + Version 4.0.0.0-M5 + Dante Engine 4.0.0.0-M5 Java 25 License Apache 2.0 码匠君 diff --git a/configurations/backup/alibaba/4.0.0.0-M1/nacos_config_export_20251123203439.zip b/configurations/backup/alibaba/4.0.0.0-M1/nacos_config_export_20251123203439.zip deleted file mode 100644 index 675438360477795d89fb90503556feb5d59247f2..0000000000000000000000000000000000000000 Binary files a/configurations/backup/alibaba/4.0.0.0-M1/nacos_config_export_20251123203439.zip and /dev/null differ diff --git a/configurations/backup/alibaba/4.0.0.0-M2/nacos_config_export_20251130235046.zip b/configurations/backup/alibaba/4.0.0.0-M2/nacos_config_export_20251130235046.zip deleted file mode 100644 index 3b1ef28bb6318bea7b5dff89c3df3b8136a4e606..0000000000000000000000000000000000000000 Binary files a/configurations/backup/alibaba/4.0.0.0-M2/nacos_config_export_20251130235046.zip and /dev/null differ diff --git a/configurations/backup/alibaba/4.0.0.0-M3/nacos_config_export_20251205133529.zip b/configurations/backup/alibaba/4.0.0.0-M5/nacos_config_export_20251209215617.zip similarity index 49% rename from configurations/backup/alibaba/4.0.0.0-M3/nacos_config_export_20251205133529.zip rename to configurations/backup/alibaba/4.0.0.0-M5/nacos_config_export_20251209215617.zip index acdceabf902d79aeea474a0e7411bb28a59b9076..a808400425b1b4c425898134f7b35a7e67e12089 100644 Binary files a/configurations/backup/alibaba/4.0.0.0-M3/nacos_config_export_20251205133529.zip and b/configurations/backup/alibaba/4.0.0.0-M5/nacos_config_export_20251209215617.zip differ diff --git a/configurations/backup/tencent/3.5.7.1/polaris_config_202405311904.zip b/configurations/backup/tencent/4.0.0.0-M4/polaris_config_202405311904.zip similarity index 100% rename from configurations/backup/tencent/3.5.7.1/polaris_config_202405311904.zip rename to configurations/backup/tencent/4.0.0.0-M4/polaris_config_202405311904.zip diff --git a/configurations/backup/tencent/3.5.8.0/polaris_config_202405311904.zip b/configurations/backup/tencent/4.0.0.0-M5/polaris_config_202405311904.zip similarity index 100% rename from configurations/backup/tencent/3.5.8.0/polaris_config_202405311904.zip rename to configurations/backup/tencent/4.0.0.0-M5/polaris_config_202405311904.zip diff --git a/configurations/docker/context/development/Dockerfile b/configurations/docker/context/development/Dockerfile index 338a98b778c0c97eb0ed36d270311bc3ceb01651..d5b9a558b78af8cbffefdbc3c5581f0a3ee2765a 100644 --- 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-openjre-debian:25.0.1-11-cds +FROM quay.io/herodotus-cloud/hardened-liberica-runtime-container:jdk-25.0.1-cds-glibc # 作者 LABEL maintainer="herodotus@aliyun.com" diff --git a/configurations/docker/context/development/Dockerfile-Monitor b/configurations/docker/context/development/Dockerfile-Monitor index f0308f68bf5b66f83e8ccc89f3593160b0732e48..c621f78c6f0167f861151e5e3da86d3665da7518 100644 --- 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-openjre-debian:25.0.1-11-cds +FROM quay.io/herodotus-cloud/hardened-liberica-runtime-container:jdk-25.0.1-cds-glibc #FROM openjdk:17-jdk # 作者 LABEL maintainer="herodotus@aliyun.com" diff --git a/configurations/docker/context/production/Dockerfile b/configurations/docker/context/production/Dockerfile index 19134da26331b189c0179b49dc24c49993b95d97..7e21d00abc09ce92661fe56853120242aeae163d 100644 --- 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-openjre-debian:25.0.1-11-cds +FROM quay.io/herodotus-cloud/hardened-liberica-runtime-container:jdk-25.0.1-cds-glibc # 作者 LABEL maintainer="herodotus@aliyun.com" diff --git a/configurations/docker/context/production/Dockerfile-Monitor b/configurations/docker/context/production/Dockerfile-Monitor index f0308f68bf5b66f83e8ccc89f3593160b0732e48..c621f78c6f0167f861151e5e3da86d3665da7518 100644 --- 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-openjre-debian:25.0.1-11-cds +FROM quay.io/herodotus-cloud/hardened-liberica-runtime-container:jdk-25.0.1-cds-glibc #FROM openjdk:17-jdk # 作者 LABEL maintainer="herodotus@aliyun.com" diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env index 68f8916ffb678408c233a81d3e93ced0c9eebd4a..37c427a1f2515a36db42423010322469e542cc41 100644 --- a/configurations/docker/docker-compose/linux/herodotus/.env +++ b/configurations/docker/docker-compose/linux/herodotus/.env @@ -1,4 +1,4 @@ -VERSION=4.0.0.0-M4 +VERSION=4.0.0.0-M5 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 998c61387ce26e7f5f5e0737a37d60c24a0d42e6..457f1b3f2b30290f7a1425cf7409e146a3cf5450 100644 --- a/configurations/docker/docker-compose/windows/herodotus/.env +++ b/configurations/docker/docker-compose/windows/herodotus/.env @@ -1,4 +1,4 @@ -VERSION=4.0.0.0-M4 +VERSION=4.0.0.0-M5 SPRING_PROFILES_ACTIVE=alibaba PROFILE=development DATABASE=postgresql diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 2970e3b6753cbb997a1fc461ee20d9da7eadb431..757882ae40a488e1592c857588fe5701e3719126 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -28,7 +28,7 @@ org.dromara.dante dante-bom - 4.0.0.0-M4 + 4.0.0.0-M5 diff --git a/modules/dante-module-common/pom.xml b/modules/dante-module-common/pom.xml index ce976306bcc4b53d52ad63842997d16b1248d1f7..0993cfe9dbb0347c22f3c52de804e7ba3829a6c0 100644 --- a/modules/dante-module-common/pom.xml +++ b/modules/dante-module-common/pom.xml @@ -32,7 +32,7 @@ modules org.dromara.dante - 4.0.0.0-M4 + 4.0.0.0-M5 dante-module-common diff --git a/modules/dante-monomer-autoconfigure/pom.xml b/modules/dante-monomer-autoconfigure/pom.xml index 107e963cb8d1ffb122e18b7a8867c9198b4a3025..3e0771c1bda67e614c485ee40e6950822b01113b 100644 --- a/modules/dante-monomer-autoconfigure/pom.xml +++ b/modules/dante-monomer-autoconfigure/pom.xml @@ -27,7 +27,7 @@ org.dromara.dante modules - 4.0.0.0-M4 + 4.0.0.0-M5 dante-monomer-autoconfigure diff --git a/modules/pom.xml b/modules/pom.xml index 2e130e38c64a94ff30436e77c2033da7cd5732bf..06ac8eccb21e4d3bacc9694f965c100436c3a4ab 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 4.0.0.0-M4 + 4.0.0.0-M5 modules diff --git a/packages/authentication-spring-boot-starter/pom.xml b/packages/authentication-spring-boot-starter/pom.xml index eac30320e4ffa05e27777da19669baad97cdcbf6..2916b27cdfcdbc8412b84a765fb85f0201a510ed 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 - 4.0.0.0-M4 + 4.0.0.0-M5 authentication-spring-boot-starter diff --git a/packages/authorization-servlet-spring-boot-starter/pom.xml b/packages/authorization-servlet-spring-boot-starter/pom.xml index be78f50d72d0f92373a1adfade1916b89bbc35e2..1572a8e3fbb881e42c2ca26ec5c7407eabcb20ec 100644 --- a/packages/authorization-servlet-spring-boot-starter/pom.xml +++ b/packages/authorization-servlet-spring-boot-starter/pom.xml @@ -32,7 +32,7 @@ packages org.dromara.dante - 4.0.0.0-M4 + 4.0.0.0-M5 authorization-servlet-spring-boot-starter diff --git a/packages/facility-spring-boot-starter/pom.xml b/packages/facility-spring-boot-starter/pom.xml index 83eccf6ff7ddadae871ade4d669add4a689cea96..b4a74275bad56d2e079da21a47fa6bf851491c06 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 - 4.0.0.0-M4 + 4.0.0.0-M5 4.0.0 diff --git a/packages/pom.xml b/packages/pom.xml index e0cc20c362e10477ba3c729aa4387cdc8e869919..63c5f3addaf1cc5023866b795c11c7ed26475531 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 4.0.0.0-M4 + 4.0.0.0-M5 packages diff --git a/packages/rpc-client-uaa-spring-boot-starter/pom.xml b/packages/rpc-client-uaa-spring-boot-starter/pom.xml index 502c0775ca28a8b8fc2b4b957ba3f0f33dd48087..e7f40f3f4a1654eece748d3d2dc0868d4b6040d9 100644 --- a/packages/rpc-client-uaa-spring-boot-starter/pom.xml +++ b/packages/rpc-client-uaa-spring-boot-starter/pom.xml @@ -31,7 +31,7 @@ org.dromara.dante packages - 4.0.0.0-M4 + 4.0.0.0-M5 rpc-client-uaa-spring-boot-starter diff --git a/packages/rpc-server-upms-spring-boot-starter/pom.xml b/packages/rpc-server-upms-spring-boot-starter/pom.xml index d560899810a422488185061ce1d67d7cbbf2fe30..a14d3b5d922a16c63242aa84794a167607a92370 100644 --- a/packages/rpc-server-upms-spring-boot-starter/pom.xml +++ b/packages/rpc-server-upms-spring-boot-starter/pom.xml @@ -31,7 +31,7 @@ org.dromara.dante packages - 4.0.0.0-M4 + 4.0.0.0-M5 rpc-server-upms-spring-boot-starter diff --git a/platform/dante-cloud-gateway/pom.xml b/platform/dante-cloud-gateway/pom.xml index f30f818ec8d856f85ff71252260b842121c43a7c..a780d24ff98914f70cf85e7749ed392efcb44fe8 100644 --- a/platform/dante-cloud-gateway/pom.xml +++ b/platform/dante-cloud-gateway/pom.xml @@ -32,7 +32,7 @@ platform org.dromara.dante - 4.0.0.0-M4 + 4.0.0.0-M5 dante-cloud-gateway diff --git a/platform/dante-cloud-message/pom.xml b/platform/dante-cloud-message/pom.xml index eb654d1cddb2d3cc34adcecdcac66e8da80fdc68..fa4ed5aeb3f352da3d1033faf30943c7bb115009 100644 --- a/platform/dante-cloud-message/pom.xml +++ b/platform/dante-cloud-message/pom.xml @@ -31,7 +31,7 @@ org.dromara.dante platform - 4.0.0.0-M4 + 4.0.0.0-M5 dante-cloud-message diff --git a/platform/dante-cloud-monitor/pom.xml b/platform/dante-cloud-monitor/pom.xml index 13b4e968b42f370ee913b66412ad9e4d13b39f09..fff6690daf308f4f0b31642be7132880083f46ed 100644 --- a/platform/dante-cloud-monitor/pom.xml +++ b/platform/dante-cloud-monitor/pom.xml @@ -30,11 +30,11 @@ platform org.dromara.dante - 4.0.0.0-M4 + 4.0.0.0-M5 dante-cloud-monitor - 4.0.0.0-M4 + 4.0.0.0-M5 dante-cloud-monitor dante-cloud-monitor diff --git a/platform/dante-cloud-uaa/pom.xml b/platform/dante-cloud-uaa/pom.xml index fbaa25ee322d2adfb6151481d25c94d72e60bbcc..2e2a8efa2ae3745d8cd390afd16ad85637a1dbe0 100644 --- a/platform/dante-cloud-uaa/pom.xml +++ b/platform/dante-cloud-uaa/pom.xml @@ -32,7 +32,7 @@ platform org.dromara.dante - 4.0.0.0-M4 + 4.0.0.0-M5 dante-cloud-uaa diff --git a/platform/dante-cloud-upms/pom.xml b/platform/dante-cloud-upms/pom.xml index 980813bb880b0bf1118fe13c3f8f23c3981aa643..903564aec101844698d9add85219f5e74f2e940c 100644 --- a/platform/dante-cloud-upms/pom.xml +++ b/platform/dante-cloud-upms/pom.xml @@ -30,12 +30,12 @@ platform org.dromara.dante - 4.0.0.0-M4 + 4.0.0.0-M5 4.0.0 dante-cloud-upms - 4.0.0.0-M4 + 4.0.0.0-M5 diff --git a/platform/pom.xml b/platform/pom.xml index b862c29e7db7262d5957d69a003e99eb20736f07..a596e41d2b294f0bf897d6cd0742499f46c38e85 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 4.0.0.0-M4 + 4.0.0.0-M5 platform diff --git a/pom.xml b/pom.xml index 781b04d8be101a7f2e58a36b88837b7ee49ede15..fd207a524736a82c1b47a82f35e138339844d120 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.dromara.dante dependencies - 4.0.0.0-M4 + 4.0.0.0-M5 dependencies/pom.xml diff --git a/services/dante-cloud-bpmn-ability/pom.xml b/services/dante-cloud-bpmn-ability/pom.xml index 4f46ce2301417de9da830b8863208fcb84515079..bd8526cc49b7d5cc1fa9fd6c477ac5a233d028d6 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 - 4.0.0.0-M4 + 4.0.0.0-M5 dante-cloud-bpmn-ability - 4.0.0.0-M4 + 4.0.0.0-M5 dante-cloud-bpmn-ability 基于Camunda工作流的服务 diff --git a/services/dante-cloud-bpmn-logic/pom.xml b/services/dante-cloud-bpmn-logic/pom.xml index 3c1018e989f1bae6c5cf55d2bc8c9ba7fd9e3d5e..915ef04140be1b00df348c323dcbe7c8b5642b88 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 - 4.0.0.0-M4 + 4.0.0.0-M5 dante-cloud-bpmn-logic diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdMembership.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdMembership.java index 0d257c023388f074c15460fd7c2c74d2bf8db858..15ca41af2f02d4c35b6fabe82d7fea5a78077041 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdMembership.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdMembership.java @@ -27,11 +27,12 @@ package org.dromara.dante.bpmn.logic.entity; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.MoreObjects; -import com.google.common.base.Objects; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.*; import org.dromara.dante.bpmn.logic.domain.base.BaseBpmnEntity; +import java.util.Objects; + /** *

Description: 工作流人员和组关系

*

@@ -88,19 +89,16 @@ public class ActIdMembership extends BaseBpmnEntity { @Override public boolean equals(Object o) { - if (this == o) { - return true; - } if (o == null || getClass() != o.getClass()) { return false; } ActIdMembership that = (ActIdMembership) o; - return Objects.equal(userId, that.userId) && Objects.equal(groupId, that.groupId); + return Objects.equals(userId, that.userId) && Objects.equals(groupId, that.groupId); } @Override public int hashCode() { - return Objects.hashCode(userId, groupId); + return Objects.hash(userId, groupId); } @Override diff --git a/services/dante-cloud-oss-ability/pom.xml b/services/dante-cloud-oss-ability/pom.xml index b1c2ef6532401c67ed28a6ba113d1edeb2057341..23be30823bf014e445746fe07c16732bacdedd4a 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 - 4.0.0.0-M4 + 4.0.0.0-M5 dante-cloud-oss-ability diff --git a/services/dante-monomer-application/pom.xml b/services/dante-monomer-application/pom.xml index dd5b27df3eaaa0e876551127b2da2c89c6c5fd14..78b5c7f77dae6553fd0225e44f71747794f906c2 100644 --- a/services/dante-monomer-application/pom.xml +++ b/services/dante-monomer-application/pom.xml @@ -31,7 +31,7 @@ org.dromara.dante services - 4.0.0.0-M4 + 4.0.0.0-M5 dante-monomer-application diff --git a/services/pom.xml b/services/pom.xml index 971979c2a12f1e9a3868c198b393f94acaf86297..0c0ad7f27f9998dccd6ab482be5eedd15bf5d3f2 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 4.0.0.0-M4 + 4.0.0.0-M5 services