From 9c2edc09c9f608ffccf51494959f7fe446523f68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=8D=E7=BC=96=E8=AF=91=E5=B7=A5=E4=BD=9C=E5=8C=BA?= Date: Tue, 5 May 2026 18:03:49 +0800 Subject: [PATCH] fix: also exclude ZookeeperServiceRegistryAutoConfiguration Second Registration bean conflict: ServiceRegistryEndpoint also needs single bean. Exclude both ZK auto-configuration classes for ServiceRegistry. - ZookeeperAutoServiceRegistrationAutoConfiguration (already excluded) - ZookeeperServiceRegistryAutoConfiguration (added) Bump version to 2.0.13 --- .../main/java/cn/cloudwalk/elevator/ElevatorApplication.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maven-cw-elevator-application/cw-elevator-application-starter/src/main/java/cn/cloudwalk/elevator/ElevatorApplication.java b/maven-cw-elevator-application/cw-elevator-application-starter/src/main/java/cn/cloudwalk/elevator/ElevatorApplication.java index 8f0fb34c..16fb4df6 100644 --- a/maven-cw-elevator-application/cw-elevator-application-starter/src/main/java/cn/cloudwalk/elevator/ElevatorApplication.java +++ b/maven-cw-elevator-application/cw-elevator-application-starter/src/main/java/cn/cloudwalk/elevator/ElevatorApplication.java @@ -8,6 +8,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; import org.springframework.cloud.netflix.feign.EnableFeignClients; import org.springframework.cloud.zookeeper.serviceregistry.ZookeeperAutoServiceRegistrationAutoConfiguration; +import org.springframework.cloud.zookeeper.serviceregistry.ZookeeperServiceRegistryAutoConfiguration; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.scheduling.annotation.EnableAsync; @@ -20,7 +21,7 @@ import org.springframework.scheduling.annotation.EnableAsync; @MapperScan({"cn.cloudwalk.elevator.record.mapper", "cn.cloudwalk.elevator.device.mapper", "cn.cloudwalk.elevator.passrule.mapper", "cn.cloudwalk.elevator.person.mapper", "cn.cloudwalk.elevator.codeElevatorArea.mapper"}) -@SpringBootApplication(exclude = {PageHelperAutoConfiguration.class, ZookeeperAutoServiceRegistrationAutoConfiguration.class}, scanBasePackages = {"cn.cloudwalk.elevator", +@SpringBootApplication(exclude = {PageHelperAutoConfiguration.class, ZookeeperAutoServiceRegistrationAutoConfiguration.class, ZookeeperServiceRegistryAutoConfiguration.class}, scanBasePackages = {"cn.cloudwalk.elevator", "cn.cloudwalk.web", "cn.cloudwalk.rest.cwoscomponent", "cn.cloudwalk.serial", "cn.cloudwalk.cwos.client.resource"}) public class ElevatorApplication {