From 07d826f2d3be89b770536cd6c4e5646391c67567 Mon Sep 17 00:00:00 2001 From: syruan <1555146157@163.com> Date: Thu, 14 Dec 2023 10:59:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E9=AA=8C=E8=AF=81=E9=87=8D?= =?UTF-8?q?=E5=86=99=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/sgzb/system/api/RemoteUserService.java | 2 +- .../sgzb/system/api/factory/RemoteUserFallbackFactory.java | 4 ++-- .../java/com/bonus/sgzb/auth/service/SysLoginService.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/RemoteUserService.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/RemoteUserService.java index 8ffadf71..d1fab462 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/RemoteUserService.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/RemoteUserService.java @@ -49,7 +49,7 @@ public interface RemoteUserService * 验证码校验 */ @PostMapping("/sms/checkCode") - public Boolean checkCode(@RequestParam("phone") String phone, @RequestParam("code") String code); + public R checkCode(@RequestParam("phone") String phone, @RequestParam("code") String code); /** * 注册用户信息 diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/factory/RemoteUserFallbackFactory.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/factory/RemoteUserFallbackFactory.java index 54b98e21..3338d83b 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/factory/RemoteUserFallbackFactory.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/factory/RemoteUserFallbackFactory.java @@ -43,8 +43,8 @@ public class RemoteUserFallbackFactory implements FallbackFactory checkCode(String phone, String code) { + return R.fail("校验验证码失败:" + throwable.getMessage()); } @Override diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java index 79b435de..57e8184a 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java @@ -143,7 +143,7 @@ public class SysLoginService recordLogService.recordLogininfor(phone, Constants.LOGIN_FAIL, "用户已停用，请联系管理员"); throw new ServiceException("对不起，您的账号：" + phone + " 已停用"); } - if (!remoteUserService.checkCode(phone, code)) { + if (remoteUserService.checkCode(phone, code).getCode() != Constants.SUCCESS) { throw new ServiceException("对不起，您输入的验证码：" + code + " 不存在"); } else { recordLogService.recordLogininfor(phone, Constants.LOGIN_SUCCESS, "登录成功");