修改发送短信限制bug

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;
             }
         }

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;
             }
         }

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);
-//    }
 }
 

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;
             }
         }

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;

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;
             }
         }