fix: exclude ZK auto-registration, rebuild v2.0.12

- ElevatorApplication startup failed: Registration bean conflict between
  ZookeeperAutoServiceRegistration and ConsulAutoServiceRegistration
- Exclude ZookeeperAutoServiceRegistrationAutoConfiguration (ZK for
  discovery only, not registration; Consul handles registration)
- Bump version to 2.0.12, rebuild deployment package
This commit is contained in:
反编译工作区
2026-05-05 17:52:51 +08:00
parent 7aa534ec00
commit 6dd03b573b
41 changed files with 2462 additions and 1 deletions
@@ -7,6 +7,7 @@ import org.springframework.boot.SpringApplication;
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.context.annotation.EnableAspectJAutoProxy;
import org.springframework.scheduling.annotation.EnableAsync;
@@ -19,7 +20,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}, scanBasePackages = {"cn.cloudwalk.elevator",
@SpringBootApplication(exclude = {PageHelperAutoConfiguration.class, ZookeeperAutoServiceRegistrationAutoConfiguration.class}, scanBasePackages = {"cn.cloudwalk.elevator",
"cn.cloudwalk.web", "cn.cloudwalk.rest.cwoscomponent", "cn.cloudwalk.serial", "cn.cloudwalk.cwos.client.resource"})
public class ElevatorApplication {