From e32801b26236a644584c40885446ae9e7adda71a Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Fri, 12 Jun 2020 18:23:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 7 ++++++-
kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-center-server/src/main/java/com/kidgrow/sms/lanchuang/controller/SmsChuangLanController.java | 23 +++++++++++------------
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/utils/DateUtils.java | 10 ++++++++++
3 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
index 1eefc21..7cf298c 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -265,6 +265,7 @@
SysUser user = new SysUser();
user.setId(id);
user.setMobile(newTel);
+ user.setUsername(newTel);
//修改doctor表
com.kidgrow.usercenter.model.SysDoctor sysDoctorModel= findDoctorByUserId(user.getId());
com.kidgrow.usercenter.model.SysDoctor newsysDoctorModel= new com.kidgrow.usercenter.model.SysDoctor();
@@ -274,8 +275,9 @@
newsysDoctorModel.setDoctorTel(newTel);
sysDoctorMapper.updateById(newsysDoctorModel);
}
-
if (baseMapper.updateById(user) > 0) {
+ //将Redis清除
+ redisUtils.hdel(ConstantSMS.PHONE_SMS,newTel);
return ResultBody.ok().msg("手机号修改成功！");
} else {
return ResultBody.failed("手机号修改失败！");
@@ -527,6 +529,9 @@
if (StringUtils.isBlank(phone)) {
return ResultBody.failed("请输入新手机号");
}
+ if(!sysUser.getMobile().equals(password)){
+ return ResultBody.failed("请输入原手机号");
+ }
String verificationCode = MapUtils.getString(map, "verificationCode");
if (StringUtils.isBlank(verificationCode)) {
return ResultBody.failed("请输入验证码");
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/utils/DateUtils.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/utils/DateUtils.java
index 41f04b5..694b88b 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/utils/DateUtils.java
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/utils/DateUtils.java
@@ -483,5 +483,15 @@
System.out.println(formatDate(getAfterDay(new Date()), "yyyy-MM-dd"));
System.out.println(formatDate(getAfterWeek(new Date()), "yyyy-MM-dd"));
System.out.println(formatDate(getAfterYear(new Date()), "yyyy-MM-dd"));
+ System.out.println(getSecondsNextEarlyMorning());
+
+ }
+ //（到今晚的秒数）
+ public static Long getSecondsNextEarlyMorning() {
+ Date afterDay = getAfterDay(new Date());
+ String s = formatDate(afterDay, null);
+ Date date = parseDate(s);
+ long second= (date.getTime()-System.currentTimeMillis())/1000;
+ return second;
}
}
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