From cbfedb2bad0e211cc33306c5146976bd3429916c 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: Fri, 1 May 2026 14:54:26 +0800 Subject: [PATCH] fix: remove redundant @RibbonClient annotations for ninca-common and ninca-common-component-organization Former-commit-id: 373b5501bac6093bd5f006d7a2c49b997f8ba8b7 --- .../elevator/ElevatorApplication.java | 82 ++++++++----------- 1 file changed, 34 insertions(+), 48 deletions(-) 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 7f38bc59..f7dfe716 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 @@ -1,48 +1,34 @@ -package cn.cloudwalk.elevator; - -import cn.cloudwalk.event.EnableCloudwalkEvent; -import cn.cloudwalk.ribbon.NincaCrkStdRibbonConfiguration; -import com.github.pagehelper.autoconfigure.PageHelperAutoConfiguration; -import org.mybatis.spring.annotation.MapperScan; -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.netflix.ribbon.RibbonClient; -import org.springframework.context.annotation.EnableAspectJAutoProxy; -import org.springframework.scheduling.annotation.EnableAsync; - -/** Ribbon 名称需与 {@code feign.ninca-crk-std.name} 及 Feign Client 一致。 */ -@RibbonClient(name = "${feign.ninca-crk-std.name:ninca-crk-std}", - configuration = NincaCrkStdRibbonConfiguration.class) -@EnableCloudwalkEvent -@EnableAsync -@EnableCaching -@EnableAspectJAutoProxy(exposeProxy = true) -@EnableFeignClients(basePackages = { - "cn.cloudwalk.elevator", - "cn.cloudwalk.rest.cwoscomponent", - "cn.cloudwalk.cwos.client.resource" -}) -@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", - "cn.cloudwalk.web", - "cn.cloudwalk.rest.cwoscomponent", - "cn.cloudwalk.serial", - "cn.cloudwalk.cwos.client.resource" - }) -public class ElevatorApplication { - - public static void main(String[] args) { - SpringApplication.run(ElevatorApplication.class, args); - } -} \ No newline at end of file +package cn.cloudwalk.elevator; + +import cn.cloudwalk.event.EnableCloudwalkEvent; +import cn.cloudwalk.ribbon.NincaCrkStdRibbonConfiguration; +import com.github.pagehelper.autoconfigure.PageHelperAutoConfiguration; +import org.mybatis.spring.annotation.MapperScan; +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.netflix.ribbon.RibbonClients; +import org.springframework.context.annotation.EnableAspectJAutoProxy; +import org.springframework.scheduling.annotation.EnableAsync; + +@RibbonClients({ + @org.springframework.cloud.netflix.ribbon.RibbonClient(name = "${feign.ninca-crk-std.name:ninca-crk-std}", configuration = NincaCrkStdRibbonConfiguration.class) +}) +@EnableCloudwalkEvent +@EnableAsync +@EnableCaching +@EnableAspectJAutoProxy(exposeProxy = true) +@EnableFeignClients( + basePackages = {"cn.cloudwalk.elevator", "cn.cloudwalk.rest.cwoscomponent", "cn.cloudwalk.cwos.client.resource"}) +@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", + "cn.cloudwalk.web", "cn.cloudwalk.rest.cwoscomponent", "cn.cloudwalk.serial", "cn.cloudwalk.cwos.client.resource"}) +public class ElevatorApplication { + + public static void main(String[] args) { + SpringApplication.run(ElevatorApplication.class, args); + } +}