diff --git a/src/main/java/com/ifish/helper/UserHelper.java b/src/main/java/com/ifish/helper/UserHelper.java index 11438c8..6c7edd0 100644 --- a/src/main/java/com/ifish/helper/UserHelper.java +++ b/src/main/java/com/ifish/helper/UserHelper.java @@ -19,12 +19,14 @@ import com.ifish.gwell.GwellApi; import com.ifish.mapper.Tbl_Device_User_Mapper; import com.ifish.mapper.Tbl_User_Mapper; import com.ifish.netease.NeteaseIM; +import com.ifish.service.BaseService; import com.ifish.service.UserService; import com.ifish.util.IfishFilePath; import com.ifish.util.IfishUtil; import com.ifish.util.RedisKey; import com.ifish.util.StringUtil; +import java.math.BigDecimal; import java.time.Instant; import java.time.ZoneId; import java.util.*; @@ -94,8 +96,11 @@ public class UserHelper implements UserHelperI { @Autowired private Destination ifish7PushQueueDestination; + @Autowired + private BaseService baseService; + public static void main(String[] args) { - String pwd = "366b8eb3ba593f627567a06ebe0279e2"; + String pwd = "yiyan123"; System.out.println(DigestUtils.md5Hex(pwd)); } @@ -112,7 +117,6 @@ public class UserHelper implements UserHelperI { User tmpUser = tbl_User_Mapper.getUserByPhoneNumber(user.getPhoneNumber()); //2.如果都为空，则没有此用户，返回未注册信息 if (tmpUser == null) { - //用户不存在 return IfishUtil.returnJson(ResultEnum.warn202.getKey(), ""); } diff --git a/src/main/java/com/ifish/jpush/SmsNumSend.java b/src/main/java/com/ifish/jpush/SmsNumSend.java index 4580000..012fc56 100644 --- a/src/main/java/com/ifish/jpush/SmsNumSend.java +++ b/src/main/java/com/ifish/jpush/SmsNumSend.java @@ -14,7 +14,7 @@ public class SmsNumSend { //签名模板,在阿里大鱼"管理中心-短信签名管理中"中的可用签名 //private String sms_free_sign_name="注册验证"; //短信模板变量 - private String sms_param="爱鱼奇"; + private String sms_param="登录验证"; //短信模板ID,在阿里大鱼"管理中心-短信签名管理中"中的可用模板 //private String sms_template_code; //URL @@ -40,10 +40,10 @@ public class SmsNumSend { AlibabaAliqinFcSmsNumSendRequest req = new AlibabaAliqinFcSmsNumSendRequest(); req.setExtend(extend); req.setSmsType(sms_type); - req.setSmsFreeSignName(sign_name); - req.setSmsParam("{\"code\":\""+code+"\",\"product\":"+sms_param+"}"); + req.setSmsFreeSignName("宁波睿芯电子"); + req.setSmsParam("{\"code\":\""+code+"\"}"); req.setRecNum(rec_num); - req.setSmsTemplateCode(template_code); + req.setSmsTemplateCode("SMS_465955225"); try { AlibabaAliqinFcSmsNumSendResponse rsp = client.execute(req); return rsp.getResult().getSuccess(); diff --git a/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java b/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java index 3fe3ef1..6dafe54 100644 --- a/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java +++ b/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java @@ -16,6 +16,7 @@ import com.ifish.entity.event.QueueEventEntity; import com.ifish.mapper.Tbl_Camera_User_Mapper; import com.ifish.util.StringUtil; import com.ifish.util.WeChatUtils; +import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang3.StringUtils; import org.hibernate.criterion.Restrictions; import org.springframework.beans.factory.annotation.Autowired; @@ -167,6 +168,33 @@ public class UserServiceImpl implements UserService { String phoneNumber = loginParam.getPhoneNumber(); //用户是否存在 User user = userDao.findUniqueByProperty(Restrictions.eq("phoneNumber",phoneNumber)); + + if (user == null) { + //用户不存在 + String mobileLast4 = new StringBuffer(new StringBuffer(loginParam.getPhoneNumber()).reverse().substring(0, 4)).reverse().toString(); + if (!DigestUtils.md5Hex("ifish" + mobileLast4).equals(loginParam.getUserPassword())) { + return new JsonResult(ResultEnum.warn204.getKey()); + } + User userRegister = new User(); + userRegister.setPhoneNumber(loginParam.getPhoneNumber()); + userRegister.setUserPassword(DigestUtils.md5Hex("ifish" + mobileLast4)); + userRegister.setPhoneType(loginParam.getLoginType()); + userRegister.setLoginType(loginParam.getLoginType()); + userRegister.setIsRegisterGwell(BooleanEnum.NO.getKey()); + userRegister.setIsRegisterNetease(BooleanEnum.NO.getKey()); + userRegister.setNeteaseToken(""); + userRegister.setUserType(UserTypeEnum.userType0.getKey()); + //随机给一个默认头像 + String userImg = "default/"+(new Random().nextInt(7)+1)+".png"; + userRegister.setUserImg(userImg); + //随机生成用户名 + String nickName = "鱼友"+IfishUtil.getCharAndNumr(5); + userRegister.setNickName(nickName); + userRegister.setCreateTime(new Date()); + userDao.save(userRegister); + user = userRegister; + } + if(user!=null){ //密码是否正确 if(user.getUserPassword().equals(loginParam.getUserPassword())){ @@ -253,7 +281,29 @@ public class UserServiceImpl implements UserService { User user = userDao.findUniqueByProperty(Restrictions.eq("phoneNumber",phoneNumber), Restrictions.eq("status", 0)); //用户不存在 if(user==null){ - throw new IfishException(ResultEnum.warn202); + //用户不存在 + String mobileLast4 = new StringBuffer(new StringBuffer(loginParam.getPhoneNumber()).reverse().substring(0, 4)).reverse().toString(); + if (!DigestUtils.md5Hex("ifish" + mobileLast4).equals(loginParam.getUserPassword())) { + return new JsonResult(ResultEnum.warn204.getKey()); + } + User userRegister = new User(); + userRegister.setPhoneNumber(loginParam.getPhoneNumber()); + userRegister.setUserPassword(DigestUtils.md5Hex("ifish" + mobileLast4)); + userRegister.setPhoneType(loginParam.getLoginType()); + userRegister.setLoginType(loginParam.getLoginType()); + userRegister.setIsRegisterGwell(BooleanEnum.NO.getKey()); + userRegister.setIsRegisterNetease(BooleanEnum.NO.getKey()); + userRegister.setNeteaseToken(""); + userRegister.setUserType(UserTypeEnum.userType0.getKey()); + //随机给一个默认头像 + String userImg = "default/"+(new Random().nextInt(7)+1)+".png"; + userRegister.setUserImg(userImg); + //随机生成用户名 + String nickName = "鱼友"+IfishUtil.getCharAndNumr(5); + userRegister.setNickName(nickName); + userRegister.setCreateTime(new Date()); + userDao.save(userRegister); + user = userRegister; } //密码不正确 if(!loginParam.getUserPassword().equals(user.getUserPassword())){