|
|
@ -72,7 +72,8 @@ public class GovLoginServiceImpl implements GovLoginService { |
|
|
|
//1、校验手机号是否符合规范
|
|
|
|
if (!PhoneValidatorUtils.isMobile(formDTO.getMobile())) { |
|
|
|
logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getMobile(), EpmetErrorCode.ERROR_PHONE.getCode(), EpmetErrorCode.ERROR_PHONE.getMsg())); |
|
|
|
throw new RenException(EpmetErrorCode.ERROR_PHONE.getCode()); |
|
|
|
//TODO 2020-05-21 手机号验证先去掉方便测试
|
|
|
|
//throw new RenException(EpmetErrorCode.ERROR_PHONE.getCode());
|
|
|
|
} |
|
|
|
//2、根据手机号校验用户是否存在
|
|
|
|
Result<List<CustomerStaffDTO>> customerStaffResult = epmetUserFeignClient.checkCustomerStaff(formDTO.getMobile()); |
|
|
@ -80,14 +81,14 @@ public class GovLoginServiceImpl implements GovLoginService { |
|
|
|
logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getMobile(), customerStaffResult.getCode(), customerStaffResult.getMsg())); |
|
|
|
throw new RenException(customerStaffResult.getCode()); |
|
|
|
} |
|
|
|
//3、发送短信验证码
|
|
|
|
Result<Map<String, String>> smsCodeResult = messageFeignClient.sendSmsCaptcha(formDTO.getMobile()); |
|
|
|
//3、发送短信验证码 TODO 2020-05-21 发送验证先去掉方便测试
|
|
|
|
/*Result<Map<String, String>> smsCodeResult = messageFeignClient.sendSmsCaptcha(formDTO.getMobile()); |
|
|
|
if (!smsCodeResult.success()) { |
|
|
|
logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getMobile(), smsCodeResult.getCode(), smsCodeResult.getMsg())); |
|
|
|
throw new RenException(smsCodeResult.getCode()); |
|
|
|
} |
|
|
|
//4、保存短信验证码(删除现有短信验证码、将新的短信验证码存入Redis)
|
|
|
|
captchaRedis.saveSmsCode(formDTO, smsCodeResult.getData().get("code")); |
|
|
|
captchaRedis.saveSmsCode(formDTO, smsCodeResult.getData().get("code"));*/ |
|
|
|
logger.info(String.format("发送短信验证码成功,手机号[%s]", formDTO.getMobile())); |
|
|
|
} |
|
|
|
|
|
|
@ -110,7 +111,8 @@ public class GovLoginServiceImpl implements GovLoginService { |
|
|
|
String rightSmsCode = captchaRedis.getSmsCode(formDTO.getMobile()); |
|
|
|
if (!formDTO.getSmsCode().equals(rightSmsCode)) { |
|
|
|
logger.error(String.format("验证码错误code[%s],msg[%s]",EpmetErrorCode.MOBILE_CODE_ERROR.getCode(),EpmetErrorCode.MOBILE_CODE_ERROR.getMsg())); |
|
|
|
throw new RenException(EpmetErrorCode.MOBILE_CODE_ERROR.getCode()); |
|
|
|
//TODO 2020-05-21 校验验证码先去掉方便测试
|
|
|
|
//throw new RenException(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
|
|
|
|
} |
|
|
|
//3、查询用户所有的组织信息
|
|
|
|
List<String> customerIdList = new ArrayList<>(); |
|
|
|