Commit 31a8bc05 authored by 曹盼盼's avatar 曹盼盼

修改

parent bc41360d
...@@ -112,14 +112,14 @@ public class SafetyServiceImpl implements ISafetyService { ...@@ -112,14 +112,14 @@ public class SafetyServiceImpl implements ISafetyService {
// 0.解析手机号 // 0.解析手机号
String phoneNo = this.parsePhoneNo(param); String phoneNo = this.parsePhoneNo(param);
// 1.判断是否需要进行短信验证码校验 // 1.判断是否需要进行短信验证码校验
boolean isPassCheck = !param.getIsNeedVerify() /* boolean isPassCheck = !param.getIsNeedVerify()
|| ("dev".equals(loginEnvironment) && "666666".equals(param.getVerifyCode())); || ("dev".equals(loginEnvironment) && "666666".equals(param.getVerifyCode()));
isPassCheck = this.smsVerifyCodeCheck(param.getIsNeedVerify(), param.getVerifyCode(), phoneNo); isPassCheck = this.smsVerifyCodeCheck(param.getIsNeedVerify(), param.getVerifyCode(), phoneNo);
if (!isPassCheck) { if (!isPassCheck) {
throw new CommonException(600001, "短信验证不通过"); throw new CommonException(600001, "短信验证不通过");
} }*/
// 2.校验否已经注册过 // 2.校验手机号否已经注册过
List<RegUnitInfo> userList = regUnitInfoMapper.userData(phoneNo); List<RegUnitInfo> userList = regUnitInfoMapper.userData(phoneNo);
if (CollectionUtils.isEmpty(userList)) { if (CollectionUtils.isEmpty(userList)) {
// 没注册过,进行返回 // 没注册过,进行返回
...@@ -193,11 +193,11 @@ public class SafetyServiceImpl implements ISafetyService { ...@@ -193,11 +193,11 @@ public class SafetyServiceImpl implements ISafetyService {
} }
VerifyCodeAuthModel model = new VerifyCodeAuthModel(); VerifyCodeAuthModel model = new VerifyCodeAuthModel();
model.setLoginId(phoneNo); model.setLoginId(phoneNo);
if (!param.getIsNeedVerify() || ("dev".equals(loginEnvironment) && "666666".equals(param.getVerifyCode()))) { /* if (!param.getIsNeedVerify() || ("dev".equals(loginEnvironment) && "666666".equals(param.getVerifyCode()))) {
model.setVerifyCode(DesUtil.encode(phoneNo, phoneNo)); model.setVerifyCode(DesUtil.encode(phoneNo, phoneNo));
} else { } else {
model.setVerifyCode(param.getVerifyCode()); model.setVerifyCode(param.getVerifyCode());
} }*/
FeignClientResult<Map<String, String>> mobileVerifyCodeResult = new FeignClientResult<>(); FeignClientResult<Map<String, String>> mobileVerifyCodeResult = new FeignClientResult<>();
RequestContext.setToken("token"); RequestContext.setToken("token");
RequestContext.setProduct(product); RequestContext.setProduct(product);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment