From 3fd7eae3ea370489874113babbe4977ac45c1463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E6=B5=A9=E7=84=B6?= <1315077391@qq.com>
Date: Wed, 5 Jun 2024 19:45:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20Qualifier=20=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E9=85=8D=E7=BD=AEMap=E6=B3=A8=E5=85=A5Bean=EF=BC=8C?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3OA=E4=B8=8ESms=E5=90=8C=E6=97=B6=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/dromara/oa/core/config/OaSupplierConfig.java    | 3 ++-
 .../org/dromara/sms4j/starter/config/SupplierConfig.java     | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

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<OaBaseProviderFactory<? extends OaSender, ? extends org.dromara.oa.comm.config.OaSupplierConfig>> factoryList,
             OaConfig oaConfig,
-            Map<String, Map<String, Object>> oas) {
+            @Qualifier("oas") Map<String, Map<String, Object>> 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 1442ae7f..01f86f92 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
@@ -13,6 +13,7 @@ import org.dromara.sms4j.core.datainterface.SmsBlendsSelectedConfig;
 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;
@@ -38,7 +39,7 @@ public class SupplierConfig {
     @Bean
     @ConditionalOnBean({SmsConfig.class})
     @SneakyThrows
-    protected List<BaseProviderFactory<? extends SmsBlend, ? extends org.dromara.sms4j.api.universal.SupplierConfig>> factoryList(Map<String, Map<String, Object>> blends, SmsConfig smsConfig) {
+    protected List<BaseProviderFactory<? extends SmsBlend, ? extends org.dromara.sms4j.api.universal.SupplierConfig>> factoryList(@Qualifier("blends") Map<String, Map<String, Object>> blends, SmsConfig smsConfig) {
         //注入自定义实现工厂
         List<BaseProviderFactory<? extends SmsBlend, ? extends org.dromara.sms4j.api.universal.SupplierConfig>> factoryList = new ArrayList<>();
         if (ConfigType.YAML.equals(smsConfig.getConfigType())) {
@@ -59,7 +60,7 @@ public class SupplierConfig {
     @Bean
     protected SmsBlendsInitializer smsBlendsInitializer(List<BaseProviderFactory<? extends SmsBlend, ? extends org.dromara.sms4j.api.universal.SupplierConfig>> factoryList,
                                                         SmsConfig smsConfig,
-                                                        Map<String, Map<String, Object>> blends,
+                                                        @Qualifier("blends") Map<String, Map<String, Object>> blends,
                                                         ObjectProvider<SmsDao> smsDaos,
                                                         ObjectProvider<SmsBlendsBeanConfig> beanConfigs,
                                                         ObjectProvider<SmsBlendsSelectedConfig> selectedConfigs,