From 8190823a593d3123384d3a75774ad19ecea07204 Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Mon, 15 Jun 2020 11:20:12 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-center-server/src/main/java/com/kidgrow/sms/lanchuang/controller/SmsChuangLanController.java | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-center-server/src/main/java/com/kidgrow/sms/lanchuang/controller/SmsChuangLanController.java b/kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-center-server/src/main/java/com/kidgrow/sms/lanchuang/controller/SmsChuangLanController.java index 2b70364..12ba9dc 100644 --- a/kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-center-server/src/main/java/com/kidgrow/sms/lanchuang/controller/SmsChuangLanController.java +++ b/kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-center-server/src/main/java/com/kidgrow/sms/lanchuang/controller/SmsChuangLanController.java @@ -91,15 +91,16 @@ Date date2 = DateUtils.addMilliseconds(DateUtils.parseDate(s1), CHUANGLAN_SMS_TIMELIMIT); cunMap.put("endTime",DateUtils.formatDateTime(date2)); }else{ - return ResultBody.failed().data("每个手机号限用5次"); + return ResultBody.failed().data("每个手机号限用"+CHUANGLAN_SMS_NUM+"次"); } }else { return ResultBody.failed(); } } if ("0".equals(jsonObject.get("code"))) { - redisUtils.hset(map.get("type").toString(), map.get("phone").toString(),cunMap,getSecondsNextEarlyMorning()); - return ResultBody.ok().data(verificationCode); + redisUtils.hset(map.get("type").toString(), map.get("phone").toString(),cunMap,DateUtils.getSecondsNextEarlyMorning()); +// return ResultBody.ok().data(verificationCode); + return ResultBody.ok(); } else { return ResultBody.failed(); } @@ -143,15 +144,13 @@ return ResultBody.failed("该手机号没有验证码"); } } - //获取 存放 Redis的时间 + //获取 存放 Redis的时间 秒(到今晚的秒数) public Long getSecondsNextEarlyMorning() { - Calendar cal = Calendar.getInstance(); - cal.add(Calendar.DAY_OF_YEAR, 1); - // 改成这样就好了 - cal.set(Calendar.HOUR_OF_DAY, 0); - cal.set(Calendar.SECOND, 0); - cal.set(Calendar.MINUTE, 0); - cal.set(Calendar.MILLISECOND, 0); - return (cal.getTimeInMillis() - System.currentTimeMillis()) / 1000; + Date afterDay = DateUtils.getAfterDay(new Date()); + String s = DateUtils.formatDate(afterDay, null); + Date date = DateUtils.parseDate(s); + System.out.println(date.getTime()-System.currentTimeMillis()); + long second= (date.getTime()-System.currentTimeMillis())/1000; + return second; } } -- Gitblit v1.8.0