去掉校验验证码
This commit is contained in:
parent
546f2721d2
commit
aaac9cccd9
@ -128,13 +128,14 @@ public class ShopUserController {
|
|||||||
if (shopUserDTO.getPhone().contains(Constant.ASTERISK)) {
|
if (shopUserDTO.getPhone().contains(Constant.ASTERISK)) {
|
||||||
shopUserDTO.setPhone(dbShopUser.getPhone());
|
shopUserDTO.setPhone(dbShopUser.getPhone());
|
||||||
}
|
}
|
||||||
|
//TODO 去掉验证码校验
|
||||||
// 如果修改了手机号码,就需要校验验证码
|
// 如果修改了手机号码,就需要校验验证码
|
||||||
if (!StrUtil.equals(dbShopUser.getPhone(), shopUserDTO.getPhone())) {
|
// if (!StrUtil.equals(dbShopUser.getPhone(), shopUserDTO.getPhone())) {
|
||||||
if (StrUtil.isBlank(shopUserDTO.getValidCode())) {
|
// if (StrUtil.isBlank(shopUserDTO.getValidCode())) {
|
||||||
throw new LuckException("修改了手机号,请输入验证码校验");
|
// throw new LuckException("修改了手机号,请输入验证码校验");
|
||||||
}
|
// }
|
||||||
checkCode(shopUserDTO);
|
// checkCode(shopUserDTO);
|
||||||
}
|
// }
|
||||||
shopUserDTO.setShopId(dbShopUser.getShopId());
|
shopUserDTO.setShopId(dbShopUser.getShopId());
|
||||||
ServerResponseEntity<AuthAccountVO> authAccountEntity = accountFeignClient.getByUserIdAndType(dbShopUser.getShopUserId(), SysTypeEnum.MULTISHOP.value());
|
ServerResponseEntity<AuthAccountVO> authAccountEntity = accountFeignClient.getByUserIdAndType(dbShopUser.getShopUserId(), SysTypeEnum.MULTISHOP.value());
|
||||||
if (!authAccountEntity.isSuccess()) {
|
if (!authAccountEntity.isSuccess()) {
|
||||||
@ -180,9 +181,10 @@ public class ShopUserController {
|
|||||||
if (StrUtil.isNotBlank(phone)) {
|
if (StrUtil.isNotBlank(phone)) {
|
||||||
ServerResponseEntity<Boolean> sendNotifyResponse = notifyFeignClient.checkValidCode(phone, shopUserDTO.getValidCode(), SendTypeEnum.VALID);
|
ServerResponseEntity<Boolean> sendNotifyResponse = notifyFeignClient.checkValidCode(phone, shopUserDTO.getValidCode(), SendTypeEnum.VALID);
|
||||||
Boolean data = sendNotifyResponse.getData();
|
Boolean data = sendNotifyResponse.getData();
|
||||||
if (Objects.equals(sendNotifyResponse.getCode(), ResponseEnum.OK.value()) && Objects.nonNull(data) && !data) {
|
//TODO 去掉验证码校验
|
||||||
throw new LuckException("验证码有误或已过期!");
|
// if (Objects.equals(sendNotifyResponse.getCode(), ResponseEnum.OK.value()) && Objects.nonNull(data) && !data) {
|
||||||
}
|
// throw new LuckException("验证码有误或已过期!");
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
//邮箱验证码
|
//邮箱验证码
|
||||||
}
|
}
|
||||||
|
@ -546,9 +546,10 @@ public class ShopDetailServiceImpl implements ShopDetailService {
|
|||||||
ShopUserRegisterDTO shopUserRegisterInfo = shopCreateInfoDTO.getShopUserRegisterInfo();
|
ShopUserRegisterDTO shopUserRegisterInfo = shopCreateInfoDTO.getShopUserRegisterInfo();
|
||||||
ServerResponseEntity<Boolean> sendNotifyResponse = notifyFeignClient.checkValidCode(shopUserRegisterInfo.getMobile(), shopUserRegisterInfo.getValidCode(), SendTypeEnum.VALID);
|
ServerResponseEntity<Boolean> sendNotifyResponse = notifyFeignClient.checkValidCode(shopUserRegisterInfo.getMobile(), shopUserRegisterInfo.getValidCode(), SendTypeEnum.VALID);
|
||||||
Boolean data = sendNotifyResponse.getData();
|
Boolean data = sendNotifyResponse.getData();
|
||||||
if (Objects.equals(sendNotifyResponse.getCode(), ResponseEnum.OK.value()) && Objects.nonNull(data) && !data) {
|
//TODO 去掉验证码校验
|
||||||
throw new LuckException("验证码有误或已过期!");
|
// if (Objects.equals(sendNotifyResponse.getCode(), ResponseEnum.OK.value()) && Objects.nonNull(data) && !data) {
|
||||||
}
|
// throw new LuckException("验证码有误或已过期!");
|
||||||
|
// }
|
||||||
// 2、保存店铺基本信息
|
// 2、保存店铺基本信息
|
||||||
Date now = new Date();
|
Date now = new Date();
|
||||||
ShopDetailDTO shopDetailDTO = shopCreateInfoDTO.getShopDetail();
|
ShopDetailDTO shopDetailDTO = shopCreateInfoDTO.getShopDetail();
|
||||||
|
@ -104,7 +104,7 @@ public class LoginController {
|
|||||||
&& flag) {
|
&& flag) {
|
||||||
return ServerResponseEntity.showFailMsg("tempUid is blank");
|
return ServerResponseEntity.showFailMsg("tempUid is blank");
|
||||||
}
|
}
|
||||||
// //校验验证码
|
// //TODO 校验验证码
|
||||||
// ServerResponseEntity<Boolean> validCodeResponse = notifyFeignClient.checkValidCode(loginCode.getMobile(), loginCode.getValidCode(), SendTypeEnum.LOGIN);
|
// ServerResponseEntity<Boolean> validCodeResponse = notifyFeignClient.checkValidCode(loginCode.getMobile(), loginCode.getValidCode(), SendTypeEnum.LOGIN);
|
||||||
// if (!validCodeResponse.isSuccess() || !validCodeResponse.getData()) {
|
// if (!validCodeResponse.isSuccess() || !validCodeResponse.getData()) {
|
||||||
// return ServerResponseEntity.fail(ResponseEnum.VERIFICATION_CODE_ERROR);
|
// return ServerResponseEntity.fail(ResponseEnum.VERIFICATION_CODE_ERROR);
|
||||||
|
@ -99,7 +99,7 @@ public class ServerResponseEntity<T> implements Serializable {
|
|||||||
|
|
||||||
public ServerResponseEntity() {
|
public ServerResponseEntity() {
|
||||||
// 版本号
|
// 版本号
|
||||||
this.version = "mall4j.v240108";
|
this.version = "tmerclub.v250326";
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isSuccess() {
|
public boolean isSuccess() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user