diff --git a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/config/OaSupplierConfig.java b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/config/OaSupplierConfig.java index bc56064d..e4dbbb6f 100644 --- a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/config/OaSupplierConfig.java +++ b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/config/OaSupplierConfig.java @@ -3,6 +3,7 @@ package org.dromara.oa.core.config; import org.dromara.oa.api.OaSender; import org.dromara.oa.core.provider.config.OaConfig; import org.dromara.oa.core.provider.factory.OaBaseProviderFactory; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -31,7 +32,7 @@ public class OaSupplierConfig { protected OaBlendsInitializer smsOasInitializer( List> factoryList, OaConfig oaConfig, - Map> oas) { + @Qualifier("oas") Map> oas) { return new OaBlendsInitializer(factoryList,oaConfig,oas); } } diff --git a/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SupplierConfig.java b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SupplierConfig.java index a4760904..db71fbe4 100644 --- a/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SupplierConfig.java +++ b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SupplierConfig.java @@ -9,6 +9,7 @@ import org.dromara.sms4j.core.datainterface.SmsReadConfig; import org.dromara.sms4j.provider.config.SmsConfig; import org.dromara.sms4j.provider.factory.BaseProviderFactory; import org.springframework.beans.factory.ObjectProvider; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -34,7 +35,7 @@ public class SupplierConfig { @Bean @ConditionalOnBean({SmsConfig.class}) @SneakyThrows - protected List> factoryList(Map> blends, SmsConfig smsConfig) { + protected List> factoryList(@Qualifier("blends") Map> blends, SmsConfig smsConfig) { //注入自定义实现工厂 List> factoryList = new ArrayList<>(); if (ConfigType.YAML.equals(smsConfig.getConfigType())) { @@ -55,7 +56,7 @@ public class SupplierConfig { @Bean protected SmsBlendsInitializer smsBlendsInitializer(List> factoryList, SmsConfig smsConfig, - Map> blends, + @Qualifier("blends") Map> blends, ObjectProvider extendsSmsConfigs) { return new SmsBlendsInitializer(factoryList, smsConfig, blends, extendsSmsConfigs); }