moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

短信-限流-开关

Browse Source
This commit is contained in:
khalil
2025-02-06 10:57:54 +08:00
parent 242c86f673
commit 30baa20254
6 changed files with 19 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/system/AdminUserService.java
View File

@@ -167,7 +167,7 @@ public class AdminUserService extends BaseService {
logger.info("sendCodeAliyunSmsOrThrowEx"); logger.info("sendCodeAliyunSmsOrThrowEx");
DeviceInfo deviceInfo = new DeviceInfo(); DeviceInfo deviceInfo = new DeviceInfo();
deviceInfo.setApp("admin"); deviceInfo.setApp("admin");
smsService.sendSmsCode(adminUser.getPhone(), SmsTypeEnum.SUPER_ADMIN_LOGIN.value, deviceInfo, realIpAddress, smsCode); smsService.sendSmsCode(adminUser.getPhone(), SmsTypeEnum.SUPER_ADMIN_LOGIN.value, deviceInfo, realIpAddress, smsCode, false);
saveSmsCode(adminUser, smsCode, realIpAddress); saveSmsCode(adminUser, smsCode, realIpAddress);
return new BusiResult<>(BusiStatus.SUCCESS); return new BusiResult<>(BusiStatus.SUCCESS);
} }

2
accompany-admin/accompany-flow-team-admin-service/src/main/java/com/accompany/service/FlowTeamAdminUserService.java
View File

@@ -70,7 +70,7 @@ public class FlowTeamAdminUserService extends BaseService {
} }
String smsCode = String.format("%d", RandomUtil.getFiveRandomNumber()); String smsCode = String.format("%d", RandomUtil.getFiveRandomNumber());
smsService.sendSmsCode(phone, smsService.sendSmsCode(phone,
SmsTypeEnum.SUPER_ADMIN_LOGIN.value, null, realIpAddress, smsCode); SmsTypeEnum.SUPER_ADMIN_LOGIN.value, null, realIpAddress, smsCode, false);
saveSmsCode(phone, smsCode, realIpAddress); saveSmsCode(phone, smsCode, realIpAddress);
return new BusiResult(BusiStatus.SUCCESS); return new BusiResult(BusiStatus.SUCCESS);
} }

25
accompany-base/accompany-sms/accompany-sms-service/src/main/java/com/accompany/sms/service/SmsService.java
View File

@@ -45,7 +45,7 @@ public class SmsService extends BaseService {
@Autowired @Autowired
private SysConfService sysConfService; private SysConfService sysConfService;
public void sendSmsCode(String mobile, Integer type, DeviceInfo deviceInfo, String ip, String code) { public void sendSmsCode(String mobile, Integer type, DeviceInfo deviceInfo, String ip, String code, boolean needRateLimit) {
if (StringUtils.isBlank(code)) { if (StringUtils.isBlank(code)) {
code = String.format("%d", RandomUtil.getFiveRandomNumber()); code = String.format("%d", RandomUtil.getFiveRandomNumber());
} }
@@ -55,15 +55,18 @@ public class SmsService extends BaseService {
throw new ServiceException(BusiStatus.SMS_NOT_EXPIRED); throw new ServiceException(BusiStatus.SMS_NOT_EXPIRED);
} }
String ipKey = RedisKey.sms_send_interval.getKey(ip); RRateLimiter rateLimiter = null;
RRateLimiter rateLimiter = redissonClient.getRateLimiter(ipKey); if (needRateLimit){
if (!rateLimiter.isExists()) { String ipKey = RedisKey.sms_send_interval.getKey(ip);
rateLimiter.trySetRate(RateType.OVERALL, 5, 1, RateIntervalUnit.DAYS); rateLimiter = redissonClient.getRateLimiter(ipKey);
} if (!rateLimiter.isExists()) {
rateLimiter.trySetRate(RateType.OVERALL, 5, 1, RateIntervalUnit.DAYS);
}
if (!rateLimiter.tryAcquire()){ if (!rateLimiter.tryAcquire()){
log.error("[sms rateLimiter] {} {} 被限流了", ip, type); log.error("[sms rateLimiter] {} {} 被限流了", ip, type);
throw new ServiceException(BusiStatus.SMS_IP_TO_OFTEN); throw new ServiceException(BusiStatus.SMS_IP_TO_OFTEN);
}
} }
try { try {
@@ -98,7 +101,9 @@ public class SmsService extends BaseService {
// 写入缓存 // 写入缓存
jedisService.setex(getSmsKey(mobile), SmsConstant.SMS_EXPIRE_SECONDS, code); jedisService.setex(getSmsKey(mobile), SmsConstant.SMS_EXPIRE_SECONDS, code);
rateLimiter.expire(1, TimeUnit.DAYS); if (null != rateLimiter){
rateLimiter.expire(1, TimeUnit.DAYS);
}
} }
public boolean verifySmsCode(String mobile, String code) { public boolean verifySmsCode(String mobile, String code) {

2
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/AbstractCertifyService.java
View File

@@ -103,7 +103,7 @@ public abstract class AbstractCertifyService {
if (StringUtils.isNotBlank(userLimit) && Integer.parseInt(userLimit) > Constant.USER_CERTIFY_LIMIT_TIMES) { if (StringUtils.isNotBlank(userLimit) && Integer.parseInt(userLimit) > Constant.USER_CERTIFY_LIMIT_TIMES) {
throw new ServiceException(BusiStatus.SMS_DEVICE_LIMIT); throw new ServiceException(BusiStatus.SMS_DEVICE_LIMIT);
} }
smsService.sendSmsCode(phone, SmsTypeEnum.CERTIFICATION.value, deviceInfo, ip, null); smsService.sendSmsCode(phone, SmsTypeEnum.CERTIFICATION.value, deviceInfo, ip, null, false);
} }
protected String getDeviceId(Long uid) { protected String getDeviceId(Long uid) {

2
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/SmsController.java
View File

@@ -95,7 +95,7 @@ public class SmsController extends BaseController {
return new BusiResult<>(BusiStatus.ACCOUNT_BLOCK_ERROR, I18NMessageSourceUtil.getMessage(ACCOUNT_LOGIN_BLOCK_MSG, new Object[]{mobile}, PartitionEnum.ENGLISH.getId())); return new BusiResult<>(BusiStatus.ACCOUNT_BLOCK_ERROR, I18NMessageSourceUtil.getMessage(ACCOUNT_LOGIN_BLOCK_MSG, new Object[]{mobile}, PartitionEnum.ENGLISH.getId()));
} }
smsService.sendSmsCode(mobile, type, deviceInfo, ip, null); smsService.sendSmsCode(mobile, type, deviceInfo, ip, null, true);
return new BusiResult<>(BusiStatus.SMS_SEND_SUCCESS); return new BusiResult<>(BusiStatus.SMS_SEND_SUCCESS);
} }

17
accompany-business/accompany-business-web/src/test/java/servicetest/SmsSendTest.java
View File

@@ -1,17 +0,0 @@
package servicetest;
import com.accompany.sms.service.SmsService;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
public class SmsSendTest extends CommonTest {
@Autowired
private SmsService smsService;
@Test
public void sendSms() throws InterruptedException {
smsService.sendSmsCode("8617817447469",15,null,"127.0.0.1","51145");
smsService.sendSmsCode("17817447469",15,null,"127.0.0.1","88154");
}
}