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); }