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

修复，异步短信无法获取线程池问题

Browse Source
This commit is contained in:
wind 2023-10-19 16:28:45 +08:00
parent d07676370c
commit a5adf2afdb
3 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sms4j-core/src/main/java/org/dromara/sms4j/core/factory/SmsFactory.java
View File

@ -63,7 +63,7 @@ public abstract class SmsFactory {
* @author :Wind * @author :Wind
*/ */
public static void createSmsBlend(SmsReadConfig smsReadConfig, String configId) { public static void createSmsBlend(SmsReadConfig smsReadConfig, String configId) {
BaseConfig supplierConfig = smsReadConfig.getSupplierConfig(configId); SupplierConfig supplierConfig = (SupplierConfig)smsReadConfig.getSupplierConfig(configId);
supplierConfig.setConfigId(configId); supplierConfig.setConfigId(configId);
SmsBlend smsBlend = create(supplierConfig); SmsBlend smsBlend = create(supplierConfig);
register(smsBlend); register(smsBlend);
@ -81,7 +81,7 @@ public abstract class SmsFactory {
public static void createSmsBlend(SmsReadConfig smsReadConfig) { public static void createSmsBlend(SmsReadConfig smsReadConfig) {
List<BaseConfig> supplierConfigList = smsReadConfig.getSupplierConfigList(); List<BaseConfig> supplierConfigList = smsReadConfig.getSupplierConfigList();
supplierConfigList.forEach(supplierConfig -> { supplierConfigList.forEach(supplierConfig -> {
SmsBlend smsBlend = create(supplierConfig); SmsBlend smsBlend = create((SupplierConfig)supplierConfig);
register(smsBlend); register(smsBlend);
}); });
} }

13
sms4j-provider/src/main/java/org/dromara/sms4j/provider/factory/BeanFactory.java
View File

@ -54,6 +54,19 @@ public class BeanFactory {
} }
public static Executor getExecutor() { public static Executor getExecutor() {
if (executor == null){
// 创建一个线程池对象
ThreadPoolExecutor ex = new ThreadPoolExecutor(
smsConfig.getCorePoolSize(),
smsConfig.getMaxPoolSize(),
smsConfig.getQueueCapacity(),
TimeUnit.SECONDS,
new ArrayBlockingQueue<>(smsConfig.getMaxPoolSize())
);
// 线程池对拒绝任务的处理策略,当线程池没有处理能力的时候，该策略会直接在 execute 方法的调用线程中运行被拒绝的任务；如果执行程序已关闭，则会丢弃该任务
ex.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
executor = ex;
}
return executor; return executor;
} }

37
sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsMainConfig.java
View File

@ -2,7 +2,6 @@ package org.dromara.sms4j.starter.config;
import lombok.Data; import lombok.Data;
import org.dromara.sms4j.comm.constant.Constant; import org.dromara.sms4j.comm.constant.Constant;
import org.dromara.sms4j.comm.delayedTime.DelayedTime;
import org.dromara.sms4j.provider.config.SmsBanner; import org.dromara.sms4j.provider.config.SmsBanner;
import org.dromara.sms4j.provider.config.SmsConfig; import org.dromara.sms4j.provider.config.SmsConfig;
import org.dromara.sms4j.provider.factory.BeanFactory; import org.dromara.sms4j.provider.factory.BeanFactory;
@ -16,8 +15,6 @@ import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.context.event.EventListener; import org.springframework.context.event.EventListener;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import java.util.concurrent.Executor;
@Data @Data
public class SmsMainConfig { public class SmsMainConfig {
@ -33,23 +30,23 @@ public class SmsMainConfig {
return BeanFactory.getSmsConfig(); return BeanFactory.getSmsConfig();
} }
/** // /**
* 注入一个定时器 // * 注入一个定时器
*/ // */
@Bean // @Bean
@Lazy // @Lazy
protected DelayedTime delayedTime() { // protected DelayedTime delayedTime() {
return BeanFactory.getDelayedTime(); // return BeanFactory.getDelayedTime();
} // }
//
/** // /**
* 注入线程池 // * 注入线程池
*/ // */
@Bean("smsExecutor") // @Bean("smsExecutor")
@Lazy // @Lazy
protected Executor taskExecutor(SmsConfig config) { // protected Executor taskExecutor(SmsConfig config) {
return BeanFactory.setExecutor(config); // return BeanFactory.setExecutor(config);
} // }
/** /**
* 注入一个配置文件读取工具 * 注入一个配置文件读取工具