diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/kit/AliSmsKit.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/kit/AliSmsKit.java index 9a7d129f..6ffa3b93 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/kit/AliSmsKit.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/kit/AliSmsKit.java @@ -90,11 +90,11 @@ public class AliSmsKit { String data = response.getData(); JSONObject jsonObject = JSONObject.parseObject(data); if(jsonObject.get("Code") == null || !"OK".equals(jsonObject.get("Code"))){ - log.error("短信发送失败 response={}", jsonObject.toJSONString()); + log.error("短信发送失败!phone={}, template={}, response={}", phone, messageTemplate, jsonObject.toJSONString()); return false; } } catch (ClientException e) { - log.error(e.getMessage(),e); + log.error("短信发送失败!phone={},template={},e={}",phone,messageTemplate,e.getMessage(),e); throw new RuntimeException("短信发送失败!"); } return true; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/SmsVerifyServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/SmsVerifyServiceImpl.java index 9a17eee7..03dc8a97 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/SmsVerifyServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/SmsVerifyServiceImpl.java @@ -105,9 +105,11 @@ public class SmsVerifyServiceImpl extends ServiceImpl throw new ServiceException("请"+(60-diff)+"秒之后再重试发送!"); } } - long count = userInfoService.count(Wrappers.lambdaQuery(UserInfo.class).eq(UserInfo::getRegIp, clientIP)); - if(count > 8){ - throw new ServiceException("验证码发送失败!2"+count); + if(codeEnum == CodeEnum.REGISTER){ + long count = userInfoService.count(Wrappers.lambdaQuery(UserInfo.class).eq(UserInfo::getRegIp, clientIP)); + if(count > 8){ + throw new ServiceException("验证码发送失败!次数过多!"+count); + } } String code = RandomUtil.randomNumbers(6); SmsVerify smsVerify = new SmsVerify(); diff --git a/ruoyi-websocket-boot/src/main/java/com/ruoyi/service/RoomCheckJobService.java b/ruoyi-websocket-boot/src/main/java/com/ruoyi/service/RoomCheckJobService.java index 4b52922d..438bcb41 100644 --- a/ruoyi-websocket-boot/src/main/java/com/ruoyi/service/RoomCheckJobService.java +++ b/ruoyi-websocket-boot/src/main/java/com/ruoyi/service/RoomCheckJobService.java @@ -115,7 +115,7 @@ public class RoomCheckJobService { } - // 检测是不是3分钟没有接听 + // 检测是不是2分钟没有接听 private JobResp checkRoomCallerTimeOut(Room room){ if(!RoomStatusEnums.STATUS_CALLER_CONNECT.getCode().equals(room.getStatus()) && !RoomStatusEnums.STATUS_RECEIVER_CONNECT.getCode().equals(room.getStatus())) {