zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

登录注册添加邮箱方式

Browse Source
This commit is contained in:
wuchunlei
2023-12-26 10:56:58 +08:00
parent f9d95718cd
commit 6c6887c629
2 changed files with 72 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/main/java/com/peanut/modules/book/controller/MyUserController.java
View File

@@ -237,8 +237,7 @@ public class MyUserController {
//redis 缓存验证码
redisTemplate.opsForValue().set("RegistEMail"+email,timeCode,5, TimeUnit.MINUTES);
//发送
MailUtil.sendMail("疯子读书邮箱验证码",code,email);
return R.ok();
return MailUtil.sendMail("疯子读书邮箱验证码",code,email);
}
@RequestMapping("/register")
@@ -276,43 +275,41 @@ public class MyUserController {
* 常规注册 / 验证码 登录
*/
@RequestMapping("/registerOrLogin")
public R register(@RequestParam("tel") String tel,
@RequestParam("code") String code) {
public R register(String tel, String code) {
String redisCode = redisTemplate.opsForValue().get("RegistCode" + tel);
System.out.println(redisCode);
if (StringUtils.isEmpty(redisCode)){
return R.error(500,"短信验证码已过期，请重试");
}
String lcode = redisCode.split("_")[0];
if (!lcode.equals(code)) {
return R.error(500,"短信验证码不符！");
}
//查询是否存在当前用户手机号
MyUserEntity userEntity = userService.getBaseMapper().selectOne(new QueryWrapper<MyUserEntity>().eq("tel", tel));
if (userEntity == null) {
// 用户不存在则创建用户 注册成功
MyUserEntity myUserEntity = new MyUserEntity();
LambdaQueryWrapper<MyUserEntity> wrapper = new LambdaQueryWrapper();
if (tel.contains("@")){
wrapper.eq(MyUserEntity::getEmail,tel);
}else {
wrapper.eq(MyUserEntity::getTel,tel);
}
wrapper.orderByDesc(MyUserEntity::getLastLoginTime);
//防止多账号报错
List<MyUserEntity> userList = userService.getBaseMapper().selectList(wrapper);
if (userList == null || userList.size() == 0) {
// 用户不存在则创建用户 注册成功
MyUserEntity myUserEntity = new MyUserEntity();
if (tel.contains("@")){
myUserEntity.setEmail(tel);
}else {
myUserEntity.setTel(tel);
userService.save(myUserEntity);
R r = sysUserTokenService.createToken(myUserEntity.getId());
return R.ok("注册成功").put("userInfo",myUserEntity).put("token",r);
}
if (userEntity != null) {
R r = sysUserTokenService.createToken(userEntity.getId());
return R.ok("登录成功！").put("userInfo",userEntity).put("token",r);
}
return R.ok();
userService.save(myUserEntity);
R r = sysUserTokenService.createToken(myUserEntity.getId());
return R.ok("注册成功").put("userInfo",myUserEntity).put("token",r);
}else {
R r = sysUserTokenService.createToken(userList.get(0).getId());
return R.ok("登录成功！").put("userInfo",userList.get(0)).put("token",r);
}
}
/**
@@ -328,21 +325,26 @@ public class MyUserController {
}else {
wrapper.eq(MyUserEntity::getTel,phone);
}
MyUserEntity user = userService.getBaseMapper().selectOne(wrapper);
if (user == null) {
//防止多账号报错
List<MyUserEntity> userList = userService.getBaseMapper().selectList(wrapper);
if (userList == null || userList.size() == 0) {
return R.error(500,"用户不存在！");
}
if (user.getPassword() == null) {
return R.error(500,"当前未设置密码，请使用验证码登录！");
}
if (MD5Utils.getSaltverifyMD5(password,user.getPassword())){
// if(true){
R r = sysUserTokenService.createToken(user.getId());
return R.ok("登陆成功！").put("userInfo",user).put("token",r);
}else {
int flag = 0;
for (MyUserEntity user : userList) {
if (user.getPassword() == null) {
flag++;
}
if (MD5Utils.getSaltverifyMD5(password,user.getPassword())){
R r = sysUserTokenService.createToken(user.getId());
return R.ok("登陆成功！").put("userInfo",user).put("token",r);
}
}
if (flag>0){
return R.error(500,"当前未设置密码，请使用验证码登录！");
}
return R.error(500,"密码不正确，请重试！");
}
}
/**