From a8f5ffa5f33cdfb04e063902170a16d6c6909042 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 13 Oct 2021 10:46:17 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=AE=A1=E7=90=86=E7=AB=AF=20?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=AA=8C=E8=AF=81=E7=A0=81=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E5=92=8C=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=20=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=8F=91=E9=80=81=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=E5=88=A4=E6=96=AD=E9=87=8D=E7=BD=AE=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E5=92=8C=E7=99=BB=E5=BD=95=E4=B8=A4=E7=A7=8D=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/company/controller/CompanyLoginController.java | 5 +++-- .../jero/modules/system/controller/LoginController.java | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java index 3cb3d0b6..a077ef1d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java @@ -258,14 +258,15 @@ public class CompanyLoginController { @ApiOperation(value = "发送手机号验证码") @GetMapping(value = "/sendVerificationCode") - public Result sendVerificationCode(String phone) { + public Result sendVerificationCode(@RequestParam(name="phone") String phone, + @RequestParam(name="codeType") String codeType) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(PayContactsManagement::getPhone, PasswordUtil.encrypt(phone)); PayContactsManagement contactsManagement = payContactsManagementService.getOne(queryWrapper); if (Objects.isNull(contactsManagement)){ throw new JeroBootException("手机号不是企业联系人"); } - sysBaseAPI.sendVerificationCode(phone,"2",null,null); + sysBaseAPI.sendVerificationCode(phone,codeType,"300",null); String string = redisUtil.get("_verification:_phone:" + phone).toString(); return Result.OK(string); } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java index f8c1634b..ad772196 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java @@ -602,14 +602,16 @@ public class LoginController { @ApiOperation(value = "发送手机号验证码") @GetMapping(value = "/sendVerificationCode") - public Result sendVerificationCode(String phone) { + public Result sendVerificationCode(@RequestParam(name="phone") String phone, + @RequestParam(name="userName") String userName) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(SysUser::getPhone, PasswordUtil.encrypt(phone)); + queryWrapper.eq(SysUser::getUsername, userName); SysUser sysUser = sysUserService.getOne(queryWrapper); if (Objects.isNull(sysUser)){ - throw new JeroBootException("手机号不存在"); + throw new JeroBootException("手机号或用户名不存在"); } - sysBaseAPI.sendVerificationCode(phone,"2",null,null); + sysBaseAPI.sendVerificationCode(phone,"2","300",null); String string = redisUtil.get("_verification:_phone:" + phone).toString(); return Result.OK(string); }