From f7659aa7bf206036f02b5e9a579e29c0d49b98cf Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Fri, 29 Dec 2023 11:54:49 +0800 Subject: [PATCH 1/4] bug --- src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6a542f65..ef47e47e 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -11,7 +11,7 @@ connection-timeout: 6000000ms spring: # 环境 dev|test|prod profiles: - active: test + active: dev # jackson时间格式化 jackson: time-zone: GMT+8 From 889adeb00c348f433531b62460ebc5e188a2111d Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Fri, 29 Dec 2023 15:43:28 +0800 Subject: [PATCH 2/4] bug --- .../book/controller/MyUserController.java | 52 ++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/peanut/modules/book/controller/MyUserController.java b/src/main/java/com/peanut/modules/book/controller/MyUserController.java index 7fc84c89..d23f91a8 100644 --- a/src/main/java/com/peanut/modules/book/controller/MyUserController.java +++ b/src/main/java/com/peanut/modules/book/controller/MyUserController.java @@ -240,13 +240,63 @@ public class MyUserController { return MailUtil.sendMail("疯子读书邮箱验证码",code,email); } + /** + * 绑定用户电话号 + * @param phone + * @param code + * @param id + * @return + */ + @RequestMapping("/updateUserTel") + public R updateUserTel(@RequestParam("phone") String phone, + @RequestParam("code") String code, + @RequestParam("id") int id){ + String redisCode = redisTemplate.opsForValue().get("RegistCode"+phone); + if(StringUtils.isEmpty(redisCode)){ + return R.error("验证码已过期，请重试"); + } + String lcode = redisCode.split("_")[0]; + if (!lcode.equals(code)) { + return R.error("短信验证码不符！"); + } + MyUserEntity userInfo = userService.getById(id); + userInfo.setTel(phone); + userService.updateById(userInfo); + return R.ok(); + } + + /** + * 绑定用户邮件 + * @param email + * @param code + * @param id + * @return + */ + @RequestMapping("/updateUserEmail") + public R updateUserEmail(@RequestParam("email") String email, + @RequestParam("code") String code, + @RequestParam("id") int id){ + String redisCode = redisTemplate.opsForValue().get("RegistCode"+email); + if(StringUtils.isEmpty(redisCode)){ + return R.error("验证码已过期，请重试"); + } + String lcode = redisCode.split("_")[0]; + if (!lcode.equals(code)) { + return R.error("短信验证码不符！"); + } + MyUserEntity userInfo = userService.getById(id); + userInfo.setEmail(email); + userService.updateById(userInfo); + return R.ok(); + + } + @RequestMapping("/register") public R register(@RequestParam("tel") String tel, @RequestParam("code") String code, @RequestParam("password") String password){ String redisCode = redisTemplate.opsForValue().get("RegistCode" + tel); - System.out.println(redisCode); if (StringUtils.isEmpty(redisCode)){ return R.error(500,"短信验证码已过期，请重试"); From 43ce513550dd87f7f169ed1bf462565b9fa738c5 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Fri, 29 Dec 2023 15:59:41 +0800 Subject: [PATCH 3/4] bug --- .../com/peanut/modules/book/controller/MyUserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/peanut/modules/book/controller/MyUserController.java b/src/main/java/com/peanut/modules/book/controller/MyUserController.java index d23f91a8..e2bc1e15 100644 --- a/src/main/java/com/peanut/modules/book/controller/MyUserController.java +++ b/src/main/java/com/peanut/modules/book/controller/MyUserController.java @@ -382,7 +382,7 @@ public class MyUserController { }else { int flag = 0; for (MyUserEntity user : userList) { - if (user.getPassword() == null) { + if (user.getPassword() == null|| user.getPassword().equals("")) { flag++; continue; } From 2cf70e4f6afa1ffedef200ebfab943caa0d236ae Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Fri, 29 Dec 2023 17:52:48 +0800 Subject: [PATCH 4/4] bug --- .../book/controller/MyUserController.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/controller/MyUserController.java b/src/main/java/com/peanut/modules/book/controller/MyUserController.java index e2bc1e15..49c1aad4 100644 --- a/src/main/java/com/peanut/modules/book/controller/MyUserController.java +++ b/src/main/java/com/peanut/modules/book/controller/MyUserController.java @@ -242,15 +242,13 @@ public class MyUserController { /** * 绑定用户电话号 - * @param phone - * @param code - * @param id * @return */ @RequestMapping("/updateUserTel") - public R updateUserTel(@RequestParam("phone") String phone, - @RequestParam("code") String code, - @RequestParam("id") int id){ + public R updateUserTel(@RequestBody Map map){ + String phone = map.get("phone").toString(); + String code = map.get("code").toString(); + Integer id = Integer.valueOf(map.get("id").toString()); String redisCode = redisTemplate.opsForValue().get("RegistCode"+phone); if(StringUtils.isEmpty(redisCode)){ return R.error("验证码已过期，请重试"); @@ -267,15 +265,13 @@ public class MyUserController { /** * 绑定用户邮件 - * @param email - * @param code - * @param id * @return */ @RequestMapping("/updateUserEmail") - public R updateUserEmail(@RequestParam("email") String email, - @RequestParam("code") String code, - @RequestParam("id") int id){ + public R updateUserEmail(@RequestBody Map map){ + String email = map.get("email").toString(); + String code = map.get("code").toString(); + Integer id = Integer.valueOf(map.get("id").toString()); String redisCode = redisTemplate.opsForValue().get("RegistCode"+email); if(StringUtils.isEmpty(redisCode)){ return R.error("验证码已过期，请重试");