From ceb50b24ebe0724434ca4d079a51531c918a4a79 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 21 May 2020 19:24:54 +0800
Subject: [PATCH] =?UTF-8?q?sendSmsCode=EF=BC=8CgetMyOrg=20=E5=B1=8F?=
 =?UTF-8?q?=E8=94=BD=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=AD=A3=E7=A1=AE=E6=80=A7?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=EF=BC=8C=E5=B1=8F=E8=94=BD=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E9=AA=8C=E8=AF=81=E7=A0=81=EF=BC=8C=E5=B1=8F?=
 =?UTF-8?q?=E8=94=BD=E9=AA=8C=E8=AF=81=E7=A0=81=E6=AD=A3=E7=A1=AE=E6=80=A7?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=EF=BC=8C=E6=96=B9=E4=BE=BF=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/GovLoginServiceImpl.java  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java
index b7023b0f37..42c52ff600 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java
@@ -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<>();