mirror of
https://gitee.com/dromara/sms4j.git
synced 2025-12-07 01:18:33 +08:00
修改solon适配中的错误,去除过时的引用
This commit is contained in:
parent
31d9173792
commit
d69b192f6c
@ -20,11 +20,6 @@ public class SmsConfig {
|
|||||||
*/
|
*/
|
||||||
private Boolean restricted = false;
|
private Boolean restricted = false;
|
||||||
|
|
||||||
/**
|
|
||||||
* 是否使用redis进行缓存
|
|
||||||
*/
|
|
||||||
private Boolean redisCache = false;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 单账号每日最大发送量
|
* 单账号每日最大发送量
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -2,6 +2,7 @@ package org.dromara.sms4j.solon.aop;
|
|||||||
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.dromara.sms4j.api.dao.SmsDao;
|
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.api.proxy.RestrictedProcess;
|
||||||
import org.dromara.sms4j.comm.exception.SmsBlendException;
|
import org.dromara.sms4j.comm.exception.SmsBlendException;
|
||||||
import org.dromara.sms4j.comm.utils.SmsUtils;
|
import org.dromara.sms4j.comm.utils.SmsUtils;
|
||||||
@ -23,6 +24,9 @@ public class SolonRestrictedProcess implements RestrictedProcess {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public SmsBlendException process(String phone) {
|
public SmsBlendException process(String phone) {
|
||||||
|
if (SmsUtils.isEmpty(smsDao)){
|
||||||
|
smsDao = SmsDaoDefaultImpl.getInstance();
|
||||||
|
}
|
||||||
SmsConfig config = BeanFactory.getSmsConfig();
|
SmsConfig config = BeanFactory.getSmsConfig();
|
||||||
Integer accountMax = config.getAccountMax(); // 每日最大发送量
|
Integer accountMax = config.getAccountMax(); // 每日最大发送量
|
||||||
Integer minuteMax = config.getMinuteMax(); // 每分钟最大发送量
|
Integer minuteMax = config.getMinuteMax(); // 每分钟最大发送量
|
||||||
|
|||||||
@ -54,12 +54,6 @@ public class SmsAutowiredConfig implements LifecycleBean {
|
|||||||
//是在 solon 容器扫描完成之后执行的
|
//是在 solon 容器扫描完成之后执行的
|
||||||
@Override
|
@Override
|
||||||
public void start() {
|
public void start() {
|
||||||
/* 如果配置中启用了redis,则注入redis工具*/
|
|
||||||
if (BeanFactory.getSmsConfig().getRedisCache()) {
|
|
||||||
SmsInvocationHandler.setRestrictedProcess(new SolonRestrictedProcess(context));
|
|
||||||
log.debug("The redis cache is enabled for sms4j");
|
|
||||||
}
|
|
||||||
|
|
||||||
//打印banner
|
//打印banner
|
||||||
if (BeanFactory.getSmsConfig().getIsPrint()) {
|
if (BeanFactory.getSmsConfig().getIsPrint()) {
|
||||||
SmsBanner.PrintBanner(Constant.VERSION);
|
SmsBanner.PrintBanner(Constant.VERSION);
|
||||||
|
|||||||
@ -2,6 +2,7 @@ package org.dromara.sms4j.starter.aop;
|
|||||||
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.dromara.sms4j.api.dao.SmsDao;
|
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.api.proxy.RestrictedProcess;
|
||||||
import org.dromara.sms4j.comm.exception.SmsBlendException;
|
import org.dromara.sms4j.comm.exception.SmsBlendException;
|
||||||
import org.dromara.sms4j.comm.utils.SmsUtils;
|
import org.dromara.sms4j.comm.utils.SmsUtils;
|
||||||
@ -20,6 +21,9 @@ public class SpringRestrictedProcess implements RestrictedProcess {
|
|||||||
public SmsBlendException process(String phone) {
|
public SmsBlendException process(String phone) {
|
||||||
SmsConfig config = BeanFactory.getSmsConfig();
|
SmsConfig config = BeanFactory.getSmsConfig();
|
||||||
SmsDao smsDao = SmsSpringUtils.getBean(SmsDao.class);
|
SmsDao smsDao = SmsSpringUtils.getBean(SmsDao.class);
|
||||||
|
if (SmsUtils.isEmpty(smsDao)){
|
||||||
|
smsDao = SmsDaoDefaultImpl.getInstance();
|
||||||
|
}
|
||||||
Integer accountMax = config.getAccountMax(); // 每日最大发送量
|
Integer accountMax = config.getAccountMax(); // 每日最大发送量
|
||||||
Integer minuteMax = config.getMinuteMax(); // 每分钟最大发送量
|
Integer minuteMax = config.getMinuteMax(); // 每分钟最大发送量
|
||||||
if (SmsUtils.isNotEmpty(accountMax)) { // 是否配置了每日限制
|
if (SmsUtils.isNotEmpty(accountMax)) { // 是否配置了每日限制
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
package org.dromara.sms4j.starter.config;
|
package org.dromara.sms4j.starter.config;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
import org.dromara.sms4j.api.dao.SmsDaoDefaultImpl;
|
||||||
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.comm.delayedTime.DelayedTime;
|
||||||
import org.dromara.sms4j.provider.config.SmsBanner;
|
import org.dromara.sms4j.provider.config.SmsBanner;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user