diff --git a/README.md b/README.md index 71c4cd0847d8be1d207598437675db34c531b193..a231c8d25bcebc61e66133bed0090bc9c5f447a2 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ Nacos 3.0.2

- Version 3.5.4.1 - Dante Engine 3.5.4.1 - Dante OSS 3.5.4.1 + Version 3.5.4.2 + Dante Engine 3.5.4.2 + Dante OSS 3.5.4.2 Java 17 License Apache 2.0 码匠君 diff --git a/configurations/backup/alibaba/3.5.4.2/nacos_config_export_20250731154619.zip b/configurations/backup/alibaba/3.5.4.2/nacos_config_export_20250731154619.zip new file mode 100644 index 0000000000000000000000000000000000000000..12ed495289f65d30584d7cc046b29708445eaf94 Binary files /dev/null and b/configurations/backup/alibaba/3.5.4.2/nacos_config_export_20250731154619.zip differ diff --git a/configurations/backup/tencent/3.5.4.2/polaris_config_202405311904.zip b/configurations/backup/tencent/3.5.4.2/polaris_config_202405311904.zip new file mode 100644 index 0000000000000000000000000000000000000000..fc5e846f76735d9b78272a4ea05763f13783cfb5 Binary files /dev/null and b/configurations/backup/tencent/3.5.4.2/polaris_config_202405311904.zip differ diff --git a/configurations/backup/yamls/common/dante-cloud-redis.yaml b/configurations/backup/yamls/common/dante-cloud-redis.yaml index 73182d28cc423ed7d26cfa3dd65c8e08db62c703..c28abdf39c762a3b0b8ab6dc42c50361205bce7c 100644 --- a/configurations/backup/yamls/common/dante-cloud-redis.yaml +++ b/configurations/backup/yamls/common/dante-cloud-redis.yaml @@ -5,7 +5,7 @@ spring: host: ${herodotus.environment.redis.host} password: ${herodotus.environment.redis.password} port: ${herodotus.environment.redis.port} - timeout: 200ms + timeout: 3000ms lettuce: pool: enabled: true @@ -16,7 +16,7 @@ spring: # 最小空闲连接数 (保持预热连接)。保持预热连接，应对突发流量 min-idle: 8 # 短等待避免线程阻塞，超时快速失败 - max-wait: 50ms + max-wait: 5000ms # 空闲连接检查间隔 time-between-eviction-runs: 30s shutdown-timeout: 200ms diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env index 9ff5cad5f1d16845f37e071812afd7e57debf154..0d9d2c755234b15b32cb2e86a5afb01d30c2cf3c 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.1 +VERSION=3.5.4.2 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 52fdaecb6fecbeed88812b6b42597468275e749c..ffd73c76d6a79cfb84dd5b241cfec0d36207063d 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.1 +VERSION=3.5.4.2 SPRING_PROFILES_ACTIVE=alibaba PROFILE=development DATABASE=postgresql diff --git a/dependencies/pom.xml b/dependencies/pom.xml index f1dbcb45aec254b0d31528cc378c6629956ae495..cd5aea20c0d7390c7b3226e350822c342db3483b 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -28,7 +28,7 @@ cn.herodotus.engine dependencies - 3.5.4.1 + 3.5.4.2 diff --git a/modules/dante-module-common/pom.xml b/modules/dante-module-common/pom.xml index 93bc3f301f1dbed6fe6a66712eae12ab0d50bfba..89dc42402842c5fbe0a707dc3cc76c273677d255 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.1 + 3.5.4.2 dante-module-common diff --git a/modules/dante-module-metadata/pom.xml b/modules/dante-module-metadata/pom.xml index 745303aa7ceb8f4b8098b9498dd675a2318c4e4d..c569c1394eedaf4c76e9909af3e271dd86a02222 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.1 + 3.5.4.2 dante-module-metadata diff --git a/modules/dante-module-social/pom.xml b/modules/dante-module-social/pom.xml index 72ea0fcb88c5c37b8b7fa89b87c4c8c3ad1fb854..c201b6b222e6d42e8ede922b4e6ddefba986fea9 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.1 + 3.5.4.2 dante-module-social diff --git a/modules/dante-module-strategy/pom.xml b/modules/dante-module-strategy/pom.xml index f691cfddcb5d1eb2a8b37992d2d80aed33df2d8a..a7d61d797964f34d9f1715aa7554c7efa196b987 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.1 + 3.5.4.2 dante-module-strategy diff --git a/modules/dante-monomer-autoconfigure/pom.xml b/modules/dante-monomer-autoconfigure/pom.xml index a8fa7da6ac468b164e3a5d631d894afbc94e3636..13d4aa5922d9a728bd158586db7fe5618605def3 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.1 + 3.5.4.2 dante-monomer-autoconfigure diff --git a/modules/pom.xml b/modules/pom.xml index 1347f5814d0462dcee12c8cb2ca8e34f3b780b85..4eb070a45fb53fc71a08e70275e6068ca24f113f 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.5.4.1 + 3.5.4.2 modules diff --git a/packages/authentication-spring-boot-starter/pom.xml b/packages/authentication-spring-boot-starter/pom.xml index d6bb504de1cc6accbf1bed88a9b8ea81c0c11756..c35519b27142a75196c0e5e3637373068a8bd5d2 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.1 + 3.5.4.2 authentication-spring-boot-starter diff --git a/packages/facility-spring-boot-starter/pom.xml b/packages/facility-spring-boot-starter/pom.xml index 6179e5353babf0d3adcf6fa08e3922cea0f16a61..d64f2e7a0593d226d14bfb0c214cb556f746ca32 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.1 + 3.5.4.2 4.0.0 diff --git a/packages/pom.xml b/packages/pom.xml index e5f3492e6a418a73b7797e9950c61ac022385c07..b6fbf532aab59b7bc2df7ba772e0df0a3f5456c7 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.5.4.1 + 3.5.4.2 packages diff --git a/packages/service-spring-boot-starter/pom.xml b/packages/service-spring-boot-starter/pom.xml index c9bda77ea52298ba3a3a5cc32800d8e5bcc8a6aa..60bd94d114228f0025a930cd1e06c9c55faf9020 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.1 + 3.5.4.2 service-spring-boot-starter diff --git a/platform/dante-cloud-gateway/pom.xml b/platform/dante-cloud-gateway/pom.xml index 4ee37bc7dfe5745b9fa03de2c5e0bd0e0ed8cf08..f8b5294a3debdf72407b08b15715a2d3953e59c7 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.1 + 3.5.4.2 dante-cloud-gateway diff --git a/platform/dante-cloud-message/pom.xml b/platform/dante-cloud-message/pom.xml index 0aa79975542f806a63867aff4878066526fa3cef..d454f7beb8937e976fd5108c4bf216741a7c0b7d 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.1 + 3.5.4.2 dante-cloud-message diff --git a/platform/dante-cloud-monitor/pom.xml b/platform/dante-cloud-monitor/pom.xml index f8bd121d853735f779944866523fbef5909247f1..2db789a6d0ba5ba87bc2e35f38da96423db27f21 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.1 + 3.5.4.2 dante-cloud-monitor - 3.5.4.1 + 3.5.4.2 dante-cloud-monitor dante-cloud-monitor diff --git a/platform/dante-cloud-uaa/pom.xml b/platform/dante-cloud-uaa/pom.xml index 5950a35ba2f6f7e1961a1adb1761a3d6aab7078b..83c991c30e2fe0bf4fa9ff798d19c4fdf56e5d14 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.1 + 3.5.4.2 dante-cloud-uaa diff --git a/platform/dante-cloud-upms/pom.xml b/platform/dante-cloud-upms/pom.xml index 24d5f5442ccf82766e645b1c933c2900f3e045ac..d0741882d20e7492831f8ee0f377012eba201b2e 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.1 + 3.5.4.2 4.0.0 dante-cloud-upms - 3.5.4.1 + 3.5.4.2 diff --git a/platform/pom.xml b/platform/pom.xml index 904c30c48accc70c2ce4d8d09f4247fa45670864..a4c57cfb0356035237c39b8bf3441bb2eca8095c 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.5.4.1 + 3.5.4.2 platform diff --git a/pom.xml b/pom.xml index cc5c2f82dcb2a23973dc0d4bfde2821ea9df79d5..2410e002d838849b98ab285fd1a44741f5b20c4c 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.dromara.dante dependencies - 3.5.4.1 + 3.5.4.2 dependencies/pom.xml diff --git a/services/dante-cloud-bpmn-ability/pom.xml b/services/dante-cloud-bpmn-ability/pom.xml index 2a95b213a2417df3a4084e6d00bb2b8d2d045989..4a49596a5a5eef5911e74d3283789d4c41cbf0d6 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.1 + 3.5.4.2 dante-cloud-bpmn-ability - 3.5.4.1 + 3.5.4.2 dante-cloud-bpmn-ability 基于Camunda工作流的服务 diff --git a/services/dante-cloud-bpmn-logic/pom.xml b/services/dante-cloud-bpmn-logic/pom.xml index fa990059ae33ab33339a975f58ab7c7eb5e3380d..dfb515ee49a5bc249ce49f65c67e4207d85cd869 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.1 + 3.5.4.2 dante-cloud-bpmn-logic diff --git a/services/dante-cloud-oss-ability/pom.xml b/services/dante-cloud-oss-ability/pom.xml index 33e5be8fe17c7085fb101a4f089c284c710fc8ed..83d67b9326dbcf5f9c8c7474c1bfd1e974951ebe 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.1 + 3.5.4.2 dante-cloud-oss-ability diff --git a/services/dante-monomer-application/pom.xml b/services/dante-monomer-application/pom.xml index 90a63b44875b393fb7f5b51a9543850d586935a3..3ebe9b6f8357ee3b83fbe2495182573a64d5da68 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.1 + 3.5.4.2 dante-monomer-application diff --git a/services/dante-monomer-application/src/main/resources/application.yml b/services/dante-monomer-application/src/main/resources/application.yml index d737f0301ba4e23d2f889e9d5ba2e1470dac14d4..1828721b94f493868641de03de59ecdea3f34509 100644 --- a/services/dante-monomer-application/src/main/resources/application.yml +++ b/services/dante-monomer-application/src/main/resources/application.yml @@ -135,7 +135,7 @@ spring: host: 192.168.101.10 password: port: 16379 - timeout: 200ms + timeout: 3000ms lettuce: pool: enabled: true @@ -146,7 +146,7 @@ spring: # 最小空闲连接数 (保持预热连接)。保持预热连接，应对突发流量 min-idle: 8 # 短等待避免线程阻塞，超时快速失败 - max-wait: 50ms + max-wait: 5000ms # 空闲连接检查间隔 time-between-eviction-runs: 30s shutdown-timeout: 200ms @@ -380,7 +380,7 @@ spring: host: 192.168.101.10 password: port: 16379 - timeout: 200ms + timeout: 3000ms lettuce: pool: enabled: true @@ -391,7 +391,7 @@ spring: # 最小空闲连接数 (保持预热连接)。保持预热连接，应对突发流量 min-idle: 8 # 短等待避免线程阻塞，超时快速失败 - max-wait: 50ms + max-wait: 5000ms # 空闲连接检查间隔 time-between-eviction-runs: 30s shutdown-timeout: 200ms @@ -623,7 +623,7 @@ spring: host: 192.168.101.10 password: port: 16379 - timeout: 200ms + timeout: 3000ms lettuce: pool: enabled: true @@ -634,7 +634,7 @@ spring: # 最小空闲连接数 (保持预热连接)。保持预热连接，应对突发流量 min-idle: 8 # 短等待避免线程阻塞，超时快速失败 - max-wait: 50ms + max-wait: 5000ms # 空闲连接检查间隔 time-between-eviction-runs: 30s shutdown-timeout: 200ms diff --git a/services/pom.xml b/services/pom.xml index 88ecd4630880b8eab715852fe47b7929b692ea0e..235324df0a2db1ded40cb1dd0a99c47ef5f1748b 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.5.4.1 + 3.5.4.2 services