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

修改solon适配中的错误，去除过时的引用

Browse Source
This commit is contained in:
wind 2023-09-18 23:20:09 +08:00
parent 31d9173792
commit d69b192f6c
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sms4j-provider/src/main/java/org/dromara/sms4j/provider/config/SmsConfig.java
View File

@ -20,11 +20,6 @@ public class SmsConfig {
*/
private Boolean restricted = false;
/**
* 是否使用redis进行缓存
*/
private Boolean redisCache = false;
/**
* 单账号每日最大发送量
*/

4
sms4j-solon-plugin/src/main/java/org/dromara/sms4j/solon/aop/SolonRestrictedProcess.java
View File

@ -2,6 +2,7 @@ package org.dromara.sms4j.solon.aop;
import lombok.extern.slf4j.Slf4j;
import org.dromara.sms4j.api.dao.SmsDao;
import org.dromara.sms4j.api.dao.SmsDaoDefaultImpl;
import org.dromara.sms4j.api.proxy.RestrictedProcess;
import org.dromara.sms4j.comm.exception.SmsBlendException;
import org.dromara.sms4j.comm.utils.SmsUtils;
@ -23,6 +24,9 @@ public class SolonRestrictedProcess implements RestrictedProcess {
@Override
public SmsBlendException process(String phone) {
if (SmsUtils.isEmpty(smsDao)){
smsDao = SmsDaoDefaultImpl.getInstance();
}
SmsConfig config = BeanFactory.getSmsConfig();
Integer accountMax = config.getAccountMax(); // 每日最大发送量
Integer minuteMax = config.getMinuteMax(); // 每分钟最大发送量

6
sms4j-solon-plugin/src/main/java/org/dromara/sms4j/solon/config/SmsAutowiredConfig.java
View File

@ -54,12 +54,6 @@ public class SmsAutowiredConfig implements LifecycleBean {
//是在 solon 容器扫描完成之后执行的
@Override
public void start() {
/* 如果配置中启用了redis，则注入redis工具*/
if (BeanFactory.getSmsConfig().getRedisCache()) {
SmsInvocationHandler.setRestrictedProcess(new SolonRestrictedProcess(context));
log.debug("The redis cache is enabled for sms4j");
}
//打印banner
if (BeanFactory.getSmsConfig().getIsPrint()) {
SmsBanner.PrintBanner(Constant.VERSION);

4
sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/aop/SpringRestrictedProcess.java
View File

@ -2,6 +2,7 @@ package org.dromara.sms4j.starter.aop;
import lombok.extern.slf4j.Slf4j;
import org.dromara.sms4j.api.dao.SmsDao;
import org.dromara.sms4j.api.dao.SmsDaoDefaultImpl;
import org.dromara.sms4j.api.proxy.RestrictedProcess;
import org.dromara.sms4j.comm.exception.SmsBlendException;
import org.dromara.sms4j.comm.utils.SmsUtils;
@ -20,6 +21,9 @@ public class SpringRestrictedProcess implements RestrictedProcess {
public SmsBlendException process(String phone) {
SmsConfig config = BeanFactory.getSmsConfig();
SmsDao smsDao = SmsSpringUtils.getBean(SmsDao.class);
if (SmsUtils.isEmpty(smsDao)){
smsDao = SmsDaoDefaultImpl.getInstance();
}
Integer accountMax = config.getAccountMax(); // 每日最大发送量
Integer minuteMax = config.getMinuteMax(); // 每分钟最大发送量
if (SmsUtils.isNotEmpty(accountMax)) { // 是否配置了每日限制

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

@ -1,6 +1,7 @@
package org.dromara.sms4j.starter.config;
import lombok.Data;
import org.dromara.sms4j.api.dao.SmsDaoDefaultImpl;
import org.dromara.sms4j.comm.constant.Constant;
import org.dromara.sms4j.comm.delayedTime.DelayedTime;
import org.dromara.sms4j.provider.config.SmsBanner;