From 59ec817570bb7166009c97975070bae281578120 Mon Sep 17 00:00:00 2001 From: hkhuang Date: Tue, 7 Mar 2023 23:31:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=AA=E6=9C=89=E6=89=93=E5=BC=80dyna?= =?UTF-8?q?micTP=E5=BC=80=E5=85=B3=E6=89=8D=E5=8A=A0=E8=BD=BD=E7=AC=AC?= =?UTF-8?q?=E4=B8=89=E6=96=B9adapter=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/brpc/autoconfigure/BrpcTpAutoConfiguration.java | 2 ++ .../common/autoconfigure/AdapterCommonAutoConfiguration.java | 3 +++ .../dubbo/autoconfigure/AlibabaDubboTpAutoConfiguration.java | 2 ++ .../dubbo/autoconfigure/ApacheDubboTpAutoConfiguration.java | 2 ++ .../adapter/grpc/autoconfigure/GrpcTpAutoConfiguration.java | 2 ++ .../hystrix/autoconfigure/HystrixTpAutoConfiguration.java | 2 ++ .../adapter/motan/autoconfigure/MotanTpAutoConfiguration.java | 2 ++ .../okhttp3/autoconfigure/Okhttp3TpAutoConfiguration.java | 2 ++ .../rabbitmq/autoconfigure/RabbitMqTpAutoConfiguration.java | 2 ++ .../rocketmq/autoconfigure/RocketMqTpAutoConfiguration.java | 2 ++ .../autoconfigure/StreamRocketMqTpAutoConfiguration.java | 2 ++ .../adapter/sofa/autoconfigure/SofaTpAutoConfiguration.java | 2 ++ .../adapter/tars/autoconfigure/TarsTpAutoConfiguration.java | 2 ++ .../webserver/autocconfigure/WebServerTpAutoConfiguration.java | 2 ++ 14 files changed, 29 insertions(+) diff --git a/starter/starter-adapter/starter-adapter-brpc/src/main/java/com/dtp/starter/adapter/brpc/autoconfigure/BrpcTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-brpc/src/main/java/com/dtp/starter/adapter/brpc/autoconfigure/BrpcTpAutoConfiguration.java index f7fb7af4..7b77fd49 100644 --- a/starter/starter-adapter/starter-adapter-brpc/src/main/java/com/dtp/starter/adapter/brpc/autoconfigure/BrpcTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-brpc/src/main/java/com/dtp/starter/adapter/brpc/autoconfigure/BrpcTpAutoConfiguration.java @@ -4,6 +4,7 @@ import com.dtp.apapter.brpc.client.StarlightClientDtpAdapter; import com.dtp.apapter.brpc.server.StarlightServerDtpAdapter; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -18,6 +19,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) public class BrpcTpAutoConfiguration { @Bean diff --git a/starter/starter-adapter/starter-adapter-common/src/main/java/com/dtp/starter/adapter/common/autoconfigure/AdapterCommonAutoConfiguration.java b/starter/starter-adapter/starter-adapter-common/src/main/java/com/dtp/starter/adapter/common/autoconfigure/AdapterCommonAutoConfiguration.java index 2c44dcbb..795ef402 100644 --- a/starter/starter-adapter/starter-adapter-common/src/main/java/com/dtp/starter/adapter/common/autoconfigure/AdapterCommonAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-common/src/main/java/com/dtp/starter/adapter/common/autoconfigure/AdapterCommonAutoConfiguration.java @@ -3,6 +3,8 @@ package com.dtp.starter.adapter.common.autoconfigure; import com.dtp.adapter.common.DtpAdapterListener; import com.dtp.common.properties.DtpProperties; import com.dtp.common.constant.DynamicTpConst; +import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -19,6 +21,7 @@ import org.springframework.context.annotation.DependsOn; @Configuration @EnableConfigurationProperties(DtpProperties.class) @ConditionalOnProperty(name = DynamicTpConst.DTP_ENABLED_PROP, matchIfMissing = true, havingValue = "true") +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) public class AdapterCommonAutoConfiguration { @Bean diff --git a/starter/starter-adapter/starter-adapter-dubbo/src/main/java/com/dtp/starter/adapter/dubbo/autoconfigure/AlibabaDubboTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-dubbo/src/main/java/com/dtp/starter/adapter/dubbo/autoconfigure/AlibabaDubboTpAutoConfiguration.java index 3498c9db..4d2deade 100644 --- a/starter/starter-adapter/starter-adapter-dubbo/src/main/java/com/dtp/starter/adapter/dubbo/autoconfigure/AlibabaDubboTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-dubbo/src/main/java/com/dtp/starter/adapter/dubbo/autoconfigure/AlibabaDubboTpAutoConfiguration.java @@ -4,6 +4,7 @@ import com.dtp.adapter.dubbo.alibaba.AlibabaDubboDtpAdapter; import com.dtp.starter.adapter.dubbo.autoconfigure.condition.ConditionOnAlibabaDubboApp; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -17,6 +18,7 @@ import org.springframework.context.annotation.Configuration; @Configuration @ConditionOnAlibabaDubboApp @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) @SuppressWarnings("all") public class AlibabaDubboTpAutoConfiguration { diff --git a/starter/starter-adapter/starter-adapter-dubbo/src/main/java/com/dtp/starter/adapter/dubbo/autoconfigure/ApacheDubboTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-dubbo/src/main/java/com/dtp/starter/adapter/dubbo/autoconfigure/ApacheDubboTpAutoConfiguration.java index e7266c4d..c43fb04a 100644 --- a/starter/starter-adapter/starter-adapter-dubbo/src/main/java/com/dtp/starter/adapter/dubbo/autoconfigure/ApacheDubboTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-dubbo/src/main/java/com/dtp/starter/adapter/dubbo/autoconfigure/ApacheDubboTpAutoConfiguration.java @@ -4,6 +4,7 @@ import com.dtp.adapter.dubbo.apache.ApacheDubboDtpAdapter; import com.dtp.starter.adapter.dubbo.autoconfigure.condition.ConditionOnApacheDubboApp; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -17,6 +18,7 @@ import org.springframework.context.annotation.Configuration; @Configuration @ConditionOnApacheDubboApp @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) @SuppressWarnings("all") public class ApacheDubboTpAutoConfiguration { diff --git a/starter/starter-adapter/starter-adapter-grpc/src/main/java/com/dtp/starter/adapter/grpc/autoconfigure/GrpcTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-grpc/src/main/java/com/dtp/starter/adapter/grpc/autoconfigure/GrpcTpAutoConfiguration.java index a031ffba..fe4669a5 100644 --- a/starter/starter-adapter/starter-adapter-grpc/src/main/java/com/dtp/starter/adapter/grpc/autoconfigure/GrpcTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-grpc/src/main/java/com/dtp/starter/adapter/grpc/autoconfigure/GrpcTpAutoConfiguration.java @@ -3,6 +3,7 @@ package com.dtp.starter.adapter.grpc.autoconfigure; import com.dtp.adapter.grpc.GrpcDtpAdapter; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; @@ -16,6 +17,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConditionalOnProperty(prefix = "grpc.server", value = {"port"}) +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) @SuppressWarnings("all") public class GrpcTpAutoConfiguration { diff --git a/starter/starter-adapter/starter-adapter-hystrix/src/main/java/com/dtp/starter/adapter/hystrix/autoconfigure/HystrixTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-hystrix/src/main/java/com/dtp/starter/adapter/hystrix/autoconfigure/HystrixTpAutoConfiguration.java index 69706414..2b63785f 100644 --- a/starter/starter-adapter/starter-adapter-hystrix/src/main/java/com/dtp/starter/adapter/hystrix/autoconfigure/HystrixTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-hystrix/src/main/java/com/dtp/starter/adapter/hystrix/autoconfigure/HystrixTpAutoConfiguration.java @@ -3,6 +3,7 @@ package com.dtp.starter.adapter.hystrix.autoconfigure; import com.dtp.adapter.hystrix.HystrixDtpAdapter; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; @@ -16,6 +17,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConditionalOnClass(name = "com.netflix.hystrix.Hystrix") +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) public class HystrixTpAutoConfiguration { diff --git a/starter/starter-adapter/starter-adapter-motan/src/main/java/com/dtp/starter/adapter/motan/autoconfigure/MotanTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-motan/src/main/java/com/dtp/starter/adapter/motan/autoconfigure/MotanTpAutoConfiguration.java index 8ef5db79..d9ecd188 100644 --- a/starter/starter-adapter/starter-adapter-motan/src/main/java/com/dtp/starter/adapter/motan/autoconfigure/MotanTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-motan/src/main/java/com/dtp/starter/adapter/motan/autoconfigure/MotanTpAutoConfiguration.java @@ -3,6 +3,7 @@ package com.dtp.starter.adapter.motan.autoconfigure; import com.dtp.adapter.motan.MotanDtpAdapter; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; @@ -16,6 +17,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConditionalOnClass(name = "com.weibo.api.motan.config.springsupport.ServiceConfigBean") +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) public class MotanTpAutoConfiguration { diff --git a/starter/starter-adapter/starter-adapter-okhttp3/src/main/java/com/dtp/starter/adapter/okhttp3/autoconfigure/Okhttp3TpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-okhttp3/src/main/java/com/dtp/starter/adapter/okhttp3/autoconfigure/Okhttp3TpAutoConfiguration.java index b1b60d7c..92bc0641 100644 --- a/starter/starter-adapter/starter-adapter-okhttp3/src/main/java/com/dtp/starter/adapter/okhttp3/autoconfigure/Okhttp3TpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-okhttp3/src/main/java/com/dtp/starter/adapter/okhttp3/autoconfigure/Okhttp3TpAutoConfiguration.java @@ -3,6 +3,7 @@ package com.dtp.starter.adapter.okhttp3.autoconfigure; import com.dtp.adapter.okhttp3.Okhttp3DtpAdapter; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; @@ -16,6 +17,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConditionalOnClass(name = "okhttp3.OkHttpClient") +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) public class Okhttp3TpAutoConfiguration { diff --git a/starter/starter-adapter/starter-adapter-rabbitmq/src/main/java/com/dtp/starter/adapter/rabbitmq/autoconfigure/RabbitMqTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-rabbitmq/src/main/java/com/dtp/starter/adapter/rabbitmq/autoconfigure/RabbitMqTpAutoConfiguration.java index 0a57ee96..c19e7519 100644 --- a/starter/starter-adapter/starter-adapter-rabbitmq/src/main/java/com/dtp/starter/adapter/rabbitmq/autoconfigure/RabbitMqTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-rabbitmq/src/main/java/com/dtp/starter/adapter/rabbitmq/autoconfigure/RabbitMqTpAutoConfiguration.java @@ -3,6 +3,7 @@ package com.dtp.starter.adapter.rabbitmq.autoconfigure; import com.dtp.adapter.rabbitmq.RabbitMqDtpAdapter; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; @@ -16,6 +17,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConditionalOnProperty(prefix = "spring.rabbitmq", value = {"host"}) +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) @SuppressWarnings("all") public class RabbitMqTpAutoConfiguration { diff --git a/starter/starter-adapter/starter-adapter-rocketmq/src/main/java/com/dtp/starter/adapter/rocketmq/autoconfigure/RocketMqTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-rocketmq/src/main/java/com/dtp/starter/adapter/rocketmq/autoconfigure/RocketMqTpAutoConfiguration.java index 52f51937..91f30be6 100644 --- a/starter/starter-adapter/starter-adapter-rocketmq/src/main/java/com/dtp/starter/adapter/rocketmq/autoconfigure/RocketMqTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-rocketmq/src/main/java/com/dtp/starter/adapter/rocketmq/autoconfigure/RocketMqTpAutoConfiguration.java @@ -3,6 +3,7 @@ package com.dtp.starter.adapter.rocketmq.autoconfigure; import com.dtp.adapter.rocketmq.RocketMqDtpAdapter; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; @@ -16,6 +17,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConditionalOnProperty(prefix = "rocketmq", value = {"name-server"}) +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) @SuppressWarnings("all") public class RocketMqTpAutoConfiguration { diff --git a/starter/starter-adapter/starter-adapter-rocketmq/src/main/java/com/dtp/starter/adapter/rocketmq/autoconfigure/StreamRocketMqTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-rocketmq/src/main/java/com/dtp/starter/adapter/rocketmq/autoconfigure/StreamRocketMqTpAutoConfiguration.java index 3951d6a5..46d89532 100644 --- a/starter/starter-adapter/starter-adapter-rocketmq/src/main/java/com/dtp/starter/adapter/rocketmq/autoconfigure/StreamRocketMqTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-rocketmq/src/main/java/com/dtp/starter/adapter/rocketmq/autoconfigure/StreamRocketMqTpAutoConfiguration.java @@ -3,6 +3,7 @@ package com.dtp.starter.adapter.rocketmq.autoconfigure; import com.dtp.adapter.rocketmq.StreamRocketMqDtpAdapter; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; @@ -16,6 +17,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConditionalOnProperty(prefix = "spring.cloud.stream.rocketmq.binder", value = {"name-server"}) +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) @SuppressWarnings("all") public class StreamRocketMqTpAutoConfiguration { diff --git a/starter/starter-adapter/starter-adapter-sofa/src/main/java/com/dtp/starter/adapter/sofa/autoconfigure/SofaTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-sofa/src/main/java/com/dtp/starter/adapter/sofa/autoconfigure/SofaTpAutoConfiguration.java index 13574662..9a23a59b 100644 --- a/starter/starter-adapter/starter-adapter-sofa/src/main/java/com/dtp/starter/adapter/sofa/autoconfigure/SofaTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-sofa/src/main/java/com/dtp/starter/adapter/sofa/autoconfigure/SofaTpAutoConfiguration.java @@ -3,6 +3,7 @@ package com.dtp.starter.adapter.sofa.autoconfigure; import com.dtp.adapter.sofa.SofaDtpAdapter; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; @@ -16,6 +17,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConditionalOnClass(name = "com.alipay.sofa.rpc.config.UserThreadPoolManager") +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) public class SofaTpAutoConfiguration { diff --git a/starter/starter-adapter/starter-adapter-tars/src/main/java/com/dtp/starter/adapter/tars/autoconfigure/TarsTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-tars/src/main/java/com/dtp/starter/adapter/tars/autoconfigure/TarsTpAutoConfiguration.java index 6644d272..f9cf4a89 100644 --- a/starter/starter-adapter/starter-adapter-tars/src/main/java/com/dtp/starter/adapter/tars/autoconfigure/TarsTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-tars/src/main/java/com/dtp/starter/adapter/tars/autoconfigure/TarsTpAutoConfiguration.java @@ -3,6 +3,7 @@ package com.dtp.starter.adapter.tars.autoconfigure; import com.dtp.adapter.tars.TarsDtpAdapter; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; @@ -17,6 +18,7 @@ import org.springframework.context.annotation.Configuration; @Configuration @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) @ConditionalOnClass(name = "com.qq.tars.client.Communicator") +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) public class TarsTpAutoConfiguration { @Bean diff --git a/starter/starter-adapter/starter-adapter-webserver/src/main/java/com/dtp/starter/adapter/webserver/autocconfigure/WebServerTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-webserver/src/main/java/com/dtp/starter/adapter/webserver/autocconfigure/WebServerTpAutoConfiguration.java index 4b405e0b..36cf6066 100644 --- a/starter/starter-adapter/starter-adapter-webserver/src/main/java/com/dtp/starter/adapter/webserver/autocconfigure/WebServerTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-webserver/src/main/java/com/dtp/starter/adapter/webserver/autocconfigure/WebServerTpAutoConfiguration.java @@ -8,6 +8,7 @@ import com.dtp.starter.adapter.webserver.autocconfigure.condition.ConditionalOnT import com.dtp.starter.adapter.webserver.autocconfigure.condition.ConditionalOnUndertowWebServer; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -20,6 +21,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConditionalOnWebApplication +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) public class WebServerTpAutoConfiguration { -- Gitee