admin/sms4j
1
0
Fork 0
mirror of https://gitee.com/dromara/sms4j.git synced 2025-12-06 17:08:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

!190 sms4j-solon-plugin: 优化适配，保持与 spring 的体验一致

Browse Source 
Merge pull request !190 from 西东/dev-3.0.x
This commit is contained in:
风如歌 2025-02-06 09:14:41 +00:00 committed by Gitee
commit aeecaaa8f5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sms4j-solon-plugin/src/main/java/org/dromara/sms4j/solon/config/SupplierConfigure.java
View File

@ -22,7 +22,6 @@ import java.util.Map;
/** /**
* smsConfig 参数意义为确保注入时 smsConfig 已经存在 * smsConfig 参数意义为确保注入时 smsConfig 已经存在
*/ */
@Condition(onProperty = "${sms.configType}=yaml")
@Configuration @Configuration
public class SupplierConfigure { public class SupplierConfigure {
@Inject @Inject
@ -35,8 +34,8 @@ public class SupplierConfigure {
} }
@Bean("blends") @Bean("blends")
@Condition(onProperty = "${sms.configType} = yaml")
public Map<String, Map<String, Object>> blends() { public Map<String, Map<String, Object>> blends() {
//确保能产生（给下面用）//springboot 就算没产生，也会给个默认
return context.cfg().getProp("sms.blends").bindTo(new LinkedHashMap<>()); return context.cfg().getProp("sms.blends").bindTo(new LinkedHashMap<>());
} }
@ -67,11 +66,7 @@ public class SupplierConfigure {
public SmsBlendsInitializer smsBlendsInitializer(List<BaseProviderFactory<? extends SmsBlend, ? extends SupplierConfig>> factoryList, public SmsBlendsInitializer smsBlendsInitializer(List<BaseProviderFactory<? extends SmsBlend, ? extends SupplierConfig>> factoryList,
SmsConfig smsConfig, SmsConfig smsConfig,
@Inject("blends") Map<String, Map<String, Object>> blends, @Inject("blends") Map<String, Map<String, Object>> blends,
@Inject(required = false) List<SmsReadConfig> extendsSmsConfigs) { List<SmsReadConfig> extendsSmsConfigs) {
if (extendsSmsConfigs == null) {
extendsSmsConfigs = new ArrayList<>();
}
return new SmsBlendsInitializer(factoryList, smsConfig, blends, extendsSmsConfigs); return new SmsBlendsInitializer(factoryList, smsConfig, blends, extendsSmsConfigs);
} }
} }