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

优化，每日最大发送量计时截止每日0点，而不是持续24小时

Browse Source
This commit is contained in:
wind 2025-02-26 19:25:31 +08:00
parent 8498fafa65
commit a62bca40b6
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/processor/RestrictedProcessor.java
View File

@ -10,6 +10,8 @@ import org.dromara.sms4j.comm.utils.SmsUtils;
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;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.Collections; import java.util.Collections;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
@ -26,7 +28,6 @@ import java.util.Objects;
@Slf4j @Slf4j
public class RestrictedProcessor implements CoreMethodProcessor, SmsDaoAware { public class RestrictedProcessor implements CoreMethodProcessor, SmsDaoAware {
static Long minTimer = 60 * 1000L; static Long minTimer = 60 * 1000L;
static Long accTimer = 24 * 60 * 60 * 1000L;
private static final String REDIS_KEY = "sms:restricted:"; private static final String REDIS_KEY = "sms:restricted:";
/** /**
@ -59,6 +60,13 @@ public class RestrictedProcessor implements CoreMethodProcessor, SmsDaoAware {
doRestricted(phones); doRestricted(phones);
} }
private long calculateExpiryTime() {
LocalDateTime now = LocalDateTime.now();
LocalDateTime tomorrowMidnight = now.toLocalDate().plusDays(1).atStartOfDay();
Duration duration = Duration.between(now, tomorrowMidnight);
return duration.getSeconds();
}
public void doRestricted(List<String> phones) { public void doRestricted(List<String> phones) {
if (Objects.isNull(smsDao)) { if (Objects.isNull(smsDao)) {
throw new SmsBlendException("The smsDao tool could not be found"); throw new SmsBlendException("The smsDao tool could not be found");
@ -86,12 +94,12 @@ public class RestrictedProcessor implements CoreMethodProcessor, SmsDaoAware {
if (dailyMaxLimitExists) { if (dailyMaxLimitExists) {
Integer dailyCount = (Integer) smsDao.get(accountMaxKey); Integer dailyCount = (Integer) smsDao.get(accountMaxKey);
if (SmsUtils.isEmpty(dailyCount)) { if (SmsUtils.isEmpty(dailyCount)) {
smsDao.set(accountMaxKey, 1, accTimer / 1000); smsDao.set(accountMaxKey, 1, calculateExpiryTime());
} else if (dailyCount >= accountMax) { } else if (dailyCount >= accountMax) {
log.info("The phone: {},number of short messages reached the maximum today", phone); log.info("The phone: {},number of short messages reached the maximum today", phone);
throw new SmsBlendException("The phone: {},number of short messages reached the maximum today", phone); throw new SmsBlendException("The phone: {},number of short messages reached the maximum today", phone);
} else { } else {
smsDao.set(accountMaxKey, dailyCount + 1, accTimer / 1000); smsDao.set(accountMaxKey, dailyCount + 1, calculateExpiryTime());
} }
} }
// 是否配置了每分钟最大限制 // 是否配置了每分钟最大限制
@ -105,7 +113,7 @@ public class RestrictedProcessor implements CoreMethodProcessor, SmsDaoAware {
if (dailyMaxLimitExists) { if (dailyMaxLimitExists) {
Integer dailyCount = (Integer) smsDao.get(accountMaxKey); Integer dailyCount = (Integer) smsDao.get(accountMaxKey);
if (dailyCount > 1) { if (dailyCount > 1) {
smsDao.set(accountMaxKey, dailyCount - 1, accTimer / 1000); smsDao.set(accountMaxKey, dailyCount - 1, calculateExpiryTime());
} else { } else {
smsDao.remove(accountMaxKey); smsDao.remove(accountMaxKey);
} }