From 70cd7681d2b17887c00f520acfe3845ec3fe39c9 Mon Sep 17 00:00:00 2001 From: wu Date: Thu, 14 Nov 2024 10:26:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E9=80=81=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E9=99=90=E5=88=B6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- alarm/src/main/java/com/yingji/utils/SmsUtil.java | 7 ++++++- fire/src/main/java/com/yingji/utils/SmsUtil.java | 7 ++++++- .../java/com/yingji/controller/AlarmController.java | 13 ------------- page/src/main/java/com/yingji/utils/SmsUtil.java | 7 ++++++- .../src/main/java/com/yingji/entity/QuartzLog.java | 2 +- rescue/src/main/java/com/yingji/utils/SmsUtil.java | 7 ++++++- 6 files changed, 25 insertions(+), 18 deletions(-) diff --git a/alarm/src/main/java/com/yingji/utils/SmsUtil.java b/alarm/src/main/java/com/yingji/utils/SmsUtil.java index d857965..b724c74 100644 --- a/alarm/src/main/java/com/yingji/utils/SmsUtil.java +++ b/alarm/src/main/java/com/yingji/utils/SmsUtil.java @@ -64,7 +64,12 @@ public class SmsUtil { return; } if (minutes < 10) { - redisCache.setCacheObject(errorMes, minutes + 1); + long expireTime = redisCache.getExpire(errorMes); + if (expireTime == -1 || expireTime == -2) { + redisCache.setCacheObject(errorMes, 1, 10, TimeUnit.MINUTES); + } else { + redisCache.setCacheObject(errorMes, minutes + 1, (int) expireTime, TimeUnit.SECONDS); + } return; } } diff --git a/fire/src/main/java/com/yingji/utils/SmsUtil.java b/fire/src/main/java/com/yingji/utils/SmsUtil.java index d857965..b724c74 100644 --- a/fire/src/main/java/com/yingji/utils/SmsUtil.java +++ b/fire/src/main/java/com/yingji/utils/SmsUtil.java @@ -64,7 +64,12 @@ public class SmsUtil { return; } if (minutes < 10) { - redisCache.setCacheObject(errorMes, minutes + 1); + long expireTime = redisCache.getExpire(errorMes); + if (expireTime == -1 || expireTime == -2) { + redisCache.setCacheObject(errorMes, 1, 10, TimeUnit.MINUTES); + } else { + redisCache.setCacheObject(errorMes, minutes + 1, (int) expireTime, TimeUnit.SECONDS); + } return; } } diff --git a/page/src/main/java/com/yingji/controller/AlarmController.java b/page/src/main/java/com/yingji/controller/AlarmController.java index 3f16930..ded93db 100644 --- a/page/src/main/java/com/yingji/controller/AlarmController.java +++ b/page/src/main/java/com/yingji/controller/AlarmController.java @@ -152,18 +152,5 @@ public class AlarmController extends BaseController { return success(); } -// public static void main(String[] args) { -// String encode = Base64.encode("123QWQAVA1314543"); -// System.err.println(encode); -// MD5 md5 = MD5.create(); -// String s = md5.digestHex16(encode); -// System.err.println(s); -// -// String encode2 = Base64.encode("321123QWQAVAORZ"); -// System.err.println(encode2); -// MD5 md52 = MD5.create(); -// String s2 = md5.digestHex16(encode2); -// System.err.println(s2); -// } } diff --git a/page/src/main/java/com/yingji/utils/SmsUtil.java b/page/src/main/java/com/yingji/utils/SmsUtil.java index d857965..b724c74 100644 --- a/page/src/main/java/com/yingji/utils/SmsUtil.java +++ b/page/src/main/java/com/yingji/utils/SmsUtil.java @@ -64,7 +64,12 @@ public class SmsUtil { return; } if (minutes < 10) { - redisCache.setCacheObject(errorMes, minutes + 1); + long expireTime = redisCache.getExpire(errorMes); + if (expireTime == -1 || expireTime == -2) { + redisCache.setCacheObject(errorMes, 1, 10, TimeUnit.MINUTES); + } else { + redisCache.setCacheObject(errorMes, minutes + 1, (int) expireTime, TimeUnit.SECONDS); + } return; } } diff --git a/rescue/src/main/java/com/yingji/entity/QuartzLog.java b/rescue/src/main/java/com/yingji/entity/QuartzLog.java index 6e0cf00..17c2191 100644 --- a/rescue/src/main/java/com/yingji/entity/QuartzLog.java +++ b/rescue/src/main/java/com/yingji/entity/QuartzLog.java @@ -42,7 +42,7 @@ public class QuartzLog implements Serializable { private LocalDateTime createTime; /** - * 状态 + * 状态 1成功 2失败 */ @ApiModelProperty(value = "状态 1成功 2失败") private Integer status; diff --git a/rescue/src/main/java/com/yingji/utils/SmsUtil.java b/rescue/src/main/java/com/yingji/utils/SmsUtil.java index d857965..b724c74 100644 --- a/rescue/src/main/java/com/yingji/utils/SmsUtil.java +++ b/rescue/src/main/java/com/yingji/utils/SmsUtil.java @@ -64,7 +64,12 @@ public class SmsUtil { return; } if (minutes < 10) { - redisCache.setCacheObject(errorMes, minutes + 1); + long expireTime = redisCache.getExpire(errorMes); + if (expireTime == -1 || expireTime == -2) { + redisCache.setCacheObject(errorMes, 1, 10, TimeUnit.MINUTES); + } else { + redisCache.setCacheObject(errorMes, minutes + 1, (int) expireTime, TimeUnit.SECONDS); + } return; } }