From 3a6587b51de6204350ed84bc3e6a0c317ce9a6bd Mon Sep 17 00:00:00 2001 From: b2baccline <23131013+b2baccline@users.noreply.github.com> Date: Fri, 17 Apr 2020 16:16:53 +0800 Subject: [PATCH] =?UTF-8?q?:ambulance:=20=E6=BA=A2=E5=87=BA=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E9=85=8D=E7=BD=AE=E7=B1=BB=E4=B8=8A=E7=9A=84@Configur?= =?UTF-8?q?ation=E6=B3=A8=E8=A7=A3=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=85=A8?= =?UTF-8?q?=E5=8C=85=E6=89=AB=E6=8F=8F=E6=97=B6=E5=AF=BC=E8=87=B4=E7=9A=84?= =?UTF-8?q?=E8=AF=AF=E6=B3=A8=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ballcat-admin/ballcat-admin-core/pom.xml | 4 ---- .../ballcat/common/job/XxlJobAutoConfiguration.java | 8 ++------ .../commom/storage/FileStorageAutoConfiguration.java | 2 +- .../ballcat/commom/storage/FileStorageProperties.java | 2 -- .../swagger/SwaggerAggregatorAutoConfiguration.java | 4 ---- .../common/swagger/SwaggerProviderAutoConfiguration.java | 4 ---- 6 files changed, 3 insertions(+), 21 deletions(-) diff --git a/ballcat-admin/ballcat-admin-core/pom.xml b/ballcat-admin/ballcat-admin-core/pom.xml index 3b8ab42b..d2c814e5 100644 --- a/ballcat-admin/ballcat-admin-core/pom.xml +++ b/ballcat-admin/ballcat-admin-core/pom.xml @@ -12,10 +12,6 @@ ballcat-admin-core - - com.hccake - ballcat-common-job - com.hccake ballcat-common-conf diff --git a/ballcat-common/ballcat-common-job/src/main/java/com/hccake/ballcat/common/job/XxlJobAutoConfiguration.java b/ballcat-common/ballcat-common-job/src/main/java/com/hccake/ballcat/common/job/XxlJobAutoConfiguration.java index beda3020..bc5ea07f 100644 --- a/ballcat-common/ballcat-common-job/src/main/java/com/hccake/ballcat/common/job/XxlJobAutoConfiguration.java +++ b/ballcat-common/ballcat-common-job/src/main/java/com/hccake/ballcat/common/job/XxlJobAutoConfiguration.java @@ -3,10 +3,8 @@ package com.hccake.ballcat.common.job; import com.hccake.ballcat.common.job.properties.XxlJobProperties; import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; /** * @author lengleng @@ -15,9 +13,7 @@ import org.springframework.context.annotation.Import; * xxl 初始化 */ @Slf4j -@Configuration -@EnableAutoConfiguration -@Import(XxlJobProperties.class) +@EnableConfigurationProperties(XxlJobProperties.class) public class XxlJobAutoConfiguration { @Bean diff --git a/ballcat-common/ballcat-common-storage/src/main/java/com/hccake/ballcat/commom/storage/FileStorageAutoConfiguration.java b/ballcat-common/ballcat-common-storage/src/main/java/com/hccake/ballcat/commom/storage/FileStorageAutoConfiguration.java index b6daf951..a3fa7bd3 100644 --- a/ballcat-common/ballcat-common-storage/src/main/java/com/hccake/ballcat/commom/storage/FileStorageAutoConfiguration.java +++ b/ballcat-common/ballcat-common-storage/src/main/java/com/hccake/ballcat/commom/storage/FileStorageAutoConfiguration.java @@ -13,7 +13,7 @@ import org.springframework.context.annotation.Bean; * @author Hccake */ @AllArgsConstructor -@EnableConfigurationProperties({FileStorageProperties.class}) +@EnableConfigurationProperties(FileStorageProperties.class) public class FileStorageAutoConfiguration { private final FileStorageProperties properties; diff --git a/ballcat-common/ballcat-common-storage/src/main/java/com/hccake/ballcat/commom/storage/FileStorageProperties.java b/ballcat-common/ballcat-common-storage/src/main/java/com/hccake/ballcat/commom/storage/FileStorageProperties.java index fdaf2fa5..1bb8e123 100644 --- a/ballcat-common/ballcat-common-storage/src/main/java/com/hccake/ballcat/commom/storage/FileStorageProperties.java +++ b/ballcat-common/ballcat-common-storage/src/main/java/com/hccake/ballcat/commom/storage/FileStorageProperties.java @@ -2,7 +2,6 @@ package com.hccake.ballcat.commom.storage; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; /** * @author Hccake @@ -10,7 +9,6 @@ import org.springframework.context.annotation.Configuration; * @date 2019/7/16 15:34 */ @Data -@Configuration @ConfigurationProperties(prefix = "file.storage") public class FileStorageProperties { diff --git a/ballcat-common/ballcat-common-swagger/src/main/java/com/hccake/ballcat/common/swagger/SwaggerAggregatorAutoConfiguration.java b/ballcat-common/ballcat-common-swagger/src/main/java/com/hccake/ballcat/common/swagger/SwaggerAggregatorAutoConfiguration.java index 0ecf432d..3e9c0bdc 100644 --- a/ballcat-common/ballcat-common-swagger/src/main/java/com/hccake/ballcat/common/swagger/SwaggerAggregatorAutoConfiguration.java +++ b/ballcat-common/ballcat-common-swagger/src/main/java/com/hccake/ballcat/common/swagger/SwaggerAggregatorAutoConfiguration.java @@ -1,10 +1,8 @@ package com.hccake.ballcat.common.swagger; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Primary; import org.springframework.util.CollectionUtils; @@ -20,8 +18,6 @@ import java.util.List; * @version 1.0 * @date 2019/11/1 20:03 */ -@Configuration -@EnableAutoConfiguration @Import(SwaggerConfiguration.class) @ConditionalOnProperty(name = "swagger.enabled", havingValue = "true", matchIfMissing = true) public class SwaggerAggregatorAutoConfiguration { diff --git a/ballcat-common/ballcat-common-swagger/src/main/java/com/hccake/ballcat/common/swagger/SwaggerProviderAutoConfiguration.java b/ballcat-common/ballcat-common-swagger/src/main/java/com/hccake/ballcat/common/swagger/SwaggerProviderAutoConfiguration.java index fa379d93..c568aa61 100644 --- a/ballcat-common/ballcat-common-swagger/src/main/java/com/hccake/ballcat/common/swagger/SwaggerProviderAutoConfiguration.java +++ b/ballcat-common/ballcat-common-swagger/src/main/java/com/hccake/ballcat/common/swagger/SwaggerProviderAutoConfiguration.java @@ -1,12 +1,10 @@ package com.hccake.ballcat.common.swagger; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; @@ -17,8 +15,6 @@ import org.springframework.web.filter.CorsFilter; * @version 1.0 * @date 2019/11/1 20:03 */ -@Configuration -@EnableAutoConfiguration @Import(SwaggerConfiguration.class) @ConditionalOnProperty(name = "swagger.enabled", havingValue = "true", matchIfMissing = true) public class SwaggerProviderAutoConfiguration {