From a8f3b4c9bfd4133ffed43216c449d3cfcea51ed5 Mon Sep 17 00:00:00 2001 From: lanyuanxiaoyao Date: Mon, 1 May 2023 15:54:03 +0800 Subject: [PATCH] =?UTF-8?q?refactor(all):=20=E7=AE=80=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=20componentScan=20=E6=B3=A8=E8=A7=A3=E7=9A=84?= =?UTF-8?q?=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/flink/FlinkQueryApplication.java | 13 +++++++------ .../service/info/InfoQueryApplication.java | 14 +++++++------- .../service/pulsar/PulsarQueryApplication.java | 13 +++++++------ .../lanyuanxiaoyao/service/web/WebApplication.java | 10 ++++------ .../service/yarn/YarnQueryApplication.java | 13 +++++++------ 5 files changed, 32 insertions(+), 31 deletions(-) diff --git a/service-flink-query/src/main/java/com/lanyuanxiaoyao/service/flink/FlinkQueryApplication.java b/service-flink-query/src/main/java/com/lanyuanxiaoyao/service/flink/FlinkQueryApplication.java index 59ac13f..100158d 100644 --- a/service-flink-query/src/main/java/com/lanyuanxiaoyao/service/flink/FlinkQueryApplication.java +++ b/service-flink-query/src/main/java/com/lanyuanxiaoyao/service/flink/FlinkQueryApplication.java @@ -6,8 +6,6 @@ import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.ComponentScans; import org.springframework.retry.annotation.EnableRetry; /** @@ -17,10 +15,13 @@ import org.springframework.retry.annotation.EnableRetry; * @date 2023-04-30 */ @EnableDiscoveryClient -@SpringBootApplication(exclude = {GsonAutoConfiguration.class, DataSourceAutoConfiguration.class}) -@ComponentScans({ - @ComponentScan("com.lanyuanxiaoyao.service") -}) +@SpringBootApplication( + scanBasePackages = {"com.lanyuanxiaoyao.service"}, + exclude = { + GsonAutoConfiguration.class, + DataSourceAutoConfiguration.class + } +) @EnableConfigurationProperties @EnableRetry public class FlinkQueryApplication { diff --git a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/InfoQueryApplication.java b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/InfoQueryApplication.java index a7afcd1..24f00ff 100644 --- a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/InfoQueryApplication.java +++ b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/InfoQueryApplication.java @@ -7,8 +7,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.ComponentScans; import org.springframework.retry.annotation.EnableRetry; import org.springframework.scheduling.annotation.EnableScheduling; @@ -19,11 +17,13 @@ import org.springframework.scheduling.annotation.EnableScheduling; * @date 2023-04-24 */ @EnableDiscoveryClient -@SpringBootApplication(exclude = {GsonAutoConfiguration.class}) -@ComponentScans({ - @ComponentScan("com.lanyuanxiaoyao.service"), - @ComponentScan("com.eshore.odcp.hudi.connector.utils.database"), -}) +@SpringBootApplication( + scanBasePackages = { + "com.lanyuanxiaoyao.service", + "com.eshore.odcp.hudi.connector.utils.database" + }, + exclude = {GsonAutoConfiguration.class} +) @EnableConfigurationProperties @EnableRetry @EnableScheduling diff --git a/service-pulsar-query/src/main/java/com/lanyuanxiaoyao/service/pulsar/PulsarQueryApplication.java b/service-pulsar-query/src/main/java/com/lanyuanxiaoyao/service/pulsar/PulsarQueryApplication.java index 54241c7..21d7efb 100644 --- a/service-pulsar-query/src/main/java/com/lanyuanxiaoyao/service/pulsar/PulsarQueryApplication.java +++ b/service-pulsar-query/src/main/java/com/lanyuanxiaoyao/service/pulsar/PulsarQueryApplication.java @@ -24,8 +24,6 @@ import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.ComponentScans; import org.springframework.retry.annotation.EnableRetry; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -36,10 +34,13 @@ import org.springframework.web.bind.annotation.RestController; * @date 2023-04-27 */ @EnableDiscoveryClient -@SpringBootApplication(exclude = {GsonAutoConfiguration.class, DataSourceAutoConfiguration.class}) -@ComponentScans({ - @ComponentScan("com.lanyuanxiaoyao.service") -}) +@SpringBootApplication( + scanBasePackages = {"com.lanyuanxiaoyao.service"}, + exclude = { + GsonAutoConfiguration.class, + DataSourceAutoConfiguration.class + } +) @EnableConfigurationProperties @EnableRetry @RestController diff --git a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/WebApplication.java b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/WebApplication.java index 332e5c8..ec51cd9 100644 --- a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/WebApplication.java +++ b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/WebApplication.java @@ -9,8 +9,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration; import org.springframework.cache.annotation.EnableCaching; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.ComponentScans; import org.springframework.scheduling.annotation.EnableAsync; /** @@ -19,10 +17,10 @@ import org.springframework.scheduling.annotation.EnableAsync; * @author lanyuanxiaoyao * @date 2023-04-21 */ -@SpringBootApplication(exclude = {GsonAutoConfiguration.class}) -@ComponentScans({ - @ComponentScan("com.lanyuanxiaoyao.service") -}) +@SpringBootApplication( + scanBasePackages = {"com.lanyuanxiaoyao.service"}, + exclude = {GsonAutoConfiguration.class} +) @EnableDiscoveryClient @EnableAsync @EnableCaching diff --git a/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/YarnQueryApplication.java b/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/YarnQueryApplication.java index 9faaec5..7ebbdf8 100644 --- a/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/YarnQueryApplication.java +++ b/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/YarnQueryApplication.java @@ -11,8 +11,6 @@ import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.ComponentScans; import org.springframework.retry.annotation.EnableRetry; import org.springframework.scheduling.annotation.EnableScheduling; @@ -23,10 +21,13 @@ import org.springframework.scheduling.annotation.EnableScheduling; * @date 2023-04-17 */ @EnableDiscoveryClient -@SpringBootApplication(exclude = {GsonAutoConfiguration.class, DataSourceAutoConfiguration.class}) -@ComponentScans({ - @ComponentScan("com.lanyuanxiaoyao.service") -}) +@SpringBootApplication( + scanBasePackages = {"com.lanyuanxiaoyao.service"}, + exclude = { + GsonAutoConfiguration.class, + DataSourceAutoConfiguration.class + } +) @EnableConfigurationProperties @EnableRetry @EnableScheduling