From 287a30e3f55cb9f531c0a3a0ce511cb59937aa6e Mon Sep 17 00:00:00 2001 From: syruan <1555146157@163.com> Date: Wed, 13 Dec 2023 10:29:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9F=AD=E4=BF=A1=E7=9A=84?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=9C=8D=E5=8A=A1=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/system/api/RemoteUserService.java | 16 +++++++++++----- .../api/factory/RemoteUserFallbackFactory.java | 10 ++++++++++ .../bonus/sgzb/auth/service/SysLoginService.java | 5 +---- .../sgzb/system/controller/SysSmsController.java | 9 +++++++++ .../sgzb/system/service/ISysSmsService.java | 1 + 5 files changed, 32 insertions(+), 9 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 b4611c84..fdd108da 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 @@ -4,11 +4,7 @@ import com.bonus.sgzb.system.api.domain.SysUser; import com.bonus.sgzb.system.api.factory.RemoteUserFallbackFactory; import com.bonus.sgzb.system.api.model.LoginUser; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.*; import com.bonus.sgzb.common.core.constant.SecurityConstants; import com.bonus.sgzb.common.core.constant.ServiceNameConstants; import com.bonus.sgzb.common.core.domain.R; @@ -43,7 +39,17 @@ public interface RemoteUserService @GetMapping("/user/info/{phone}") public R getUserInfoByPhone(@PathVariable("phone") String phone, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + /** + * 发送短信 + */ + @PostMapping("/sms/codeLogin") + public R codeLogin(@RequestBody String phone); + /** + * 验证码校验 + */ + @PostMapping("/sms/checkCode") + public Boolean 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 8df5827b..8d73293d 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 @@ -37,6 +37,16 @@ public class RemoteUserFallbackFactory implements FallbackFactory codeLogin(String phone) { + return R.fail("发送登录验证码失败:" + throwable.getMessage()); + } + + @Override + public Boolean checkCode(String phone, String code) { + return false; + } + @Override public R registerUserInfo(SysUser sysUser, String source) { return R.fail("注册用户失败:" + throwable.getMessage()); 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 1b3cd978..3cde9d26 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 @@ -35,9 +35,6 @@ public class SysLoginService @Autowired private SysPasswordService passwordService; - @Resource - private ISysSmsService smsService; - @Autowired private SysRecordLogService recordLogService; @@ -146,7 +143,7 @@ public class SysLoginService recordLogService.recordLogininfor(phone, Constants.LOGIN_FAIL, "用户已停用，请联系管理员"); throw new ServiceException("对不起，您的账号：" + phone + " 已停用"); } - if (!smsService.checkCode(phone, code)) { + if (!remoteUserService.checkCode(phone, code)) { throw new ServiceException("对不起，您输入的验证码：" + code + " 不存在"); } else { recordLogService.recordLogininfor(phone, Constants.LOGIN_SUCCESS, "登录成功"); diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysSmsController.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysSmsController.java index 2bb6c7f4..30c89738 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysSmsController.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysSmsController.java @@ -35,6 +35,15 @@ public class SysSmsController extends BaseController { } } + @PostMapping("checkCode") + public AjaxResult codeLogin(@RequestParam(value = "phone") String phone, @RequestParam(value = "code") String code){ + try { + return toAjax(smsService.checkCode(phone, code)); + } catch (Exception e) { + return error(e.getMessage()); + } + } + @PostMapping("send") public AjaxResult send(@RequestParam(value = "phone") String phone, @RequestParam(value = "msg",required = false) String msg){ try { diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/ISysSmsService.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/ISysSmsService.java index bf080bd5..a1b7918b 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/ISysSmsService.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/ISysSmsService.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.system.service; import com.bonus.sgzb.common.core.web.domain.AjaxResult; +import org.springframework.stereotype.Service; /** * Description: