From 417773a495f9b6e879aa4d2d79217127417c7d1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johnny=20Miller=20=28=E9=94=BA=E4=BF=8A=29?= Date: Sun, 29 May 2022 08:57:49 +0800 Subject: [PATCH] fix($starter): `@AutoConfiguration` should be used to annotate top-level auto-configuration classes --- .../reactivespringcloudstarter/MafReactiveAutoConfiguration.kt | 2 ++ .../jmsoftware/maf/springcloudstarter/MafAutoConfiguration.kt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/reactive-spring-cloud-starter/src/main/java/com/jmsoftware/maf/reactivespringcloudstarter/MafReactiveAutoConfiguration.kt b/reactive-spring-cloud-starter/src/main/java/com/jmsoftware/maf/reactivespringcloudstarter/MafReactiveAutoConfiguration.kt index 8e365393..2e1d12b1 100644 --- a/reactive-spring-cloud-starter/src/main/java/com/jmsoftware/maf/reactivespringcloudstarter/MafReactiveAutoConfiguration.kt +++ b/reactive-spring-cloud-starter/src/main/java/com/jmsoftware/maf/reactivespringcloudstarter/MafReactiveAutoConfiguration.kt @@ -15,6 +15,7 @@ import com.jmsoftware.maf.reactivespringcloudstarter.redis.RedisConfiguration import com.jmsoftware.maf.reactivespringcloudstarter.service.CommonService import com.jmsoftware.maf.reactivespringcloudstarter.service.impl.CommonServiceImpl import com.jmsoftware.maf.reactivespringcloudstarter.util.ResponseUtil +import org.springframework.boot.autoconfigure.AutoConfiguration import org.springframework.boot.autoconfigure.AutoConfigureOrder import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.ApplicationContext @@ -30,6 +31,7 @@ import javax.annotation.PostConstruct * * @author Johnny Miller (锺俊), e-mail: johnnysviva@outlook.com, date: 4/17/22 8:17 AM */ +@AutoConfiguration @AutoConfigureOrder(Int.MIN_VALUE) @EnableConfigurationProperties( MafConfigurationProperties::class, diff --git a/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/MafAutoConfiguration.kt b/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/MafAutoConfiguration.kt index d68005e1..ce84ae52 100644 --- a/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/MafAutoConfiguration.kt +++ b/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/MafAutoConfiguration.kt @@ -29,6 +29,7 @@ import com.jmsoftware.maf.springcloudstarter.service.impl.CommonServiceImpl import com.jmsoftware.maf.springcloudstarter.websocket.WebSocketConfiguration import org.apache.ibatis.exceptions.PersistenceException import org.mybatis.spring.MyBatisSystemException +import org.springframework.boot.autoconfigure.AutoConfiguration import org.springframework.boot.autoconfigure.ImportAutoConfiguration import org.springframework.boot.autoconfigure.condition.* import org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration @@ -55,6 +56,7 @@ import javax.annotation.PostConstruct * @author Johnny Miller (锺俊), e-mail: johnnysviva@outlook.com, date: 4/12/22 9:26 PM * @see 9. Creating Your Own Auto-configuration */ +@AutoConfiguration @IntegrationComponentScan @ConditionalOnWebApplication @EnableConfigurationProperties(