From aaac9cccd923279224e47d9500769ea4ab4c6fa5 Mon Sep 17 00:00:00 2001 From: liubozhi Date: Wed, 26 Mar 2025 14:56:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A0=A1=E9=AA=8C=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../multishop/ShopUserController.java | 20 ++++++++++--------- .../service/impl/ShopDetailServiceImpl.java | 7 ++++--- .../auth/controller/LoginController.java | 2 +- .../common/response/ServerResponseEntity.java | 2 +- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopUserController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopUserController.java index 3b359d0..11a929d 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopUserController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopUserController.java @@ -128,13 +128,14 @@ public class ShopUserController { if (shopUserDTO.getPhone().contains(Constant.ASTERISK)) { shopUserDTO.setPhone(dbShopUser.getPhone()); } + //TODO 去掉验证码校验 // 如果修改了手机号码，就需要校验验证码 - if (!StrUtil.equals(dbShopUser.getPhone(), shopUserDTO.getPhone())) { - if (StrUtil.isBlank(shopUserDTO.getValidCode())) { - throw new LuckException("修改了手机号，请输入验证码校验"); - } - checkCode(shopUserDTO); - } +// if (!StrUtil.equals(dbShopUser.getPhone(), shopUserDTO.getPhone())) { +// if (StrUtil.isBlank(shopUserDTO.getValidCode())) { +// throw new LuckException("修改了手机号，请输入验证码校验"); +// } +// checkCode(shopUserDTO); +// } shopUserDTO.setShopId(dbShopUser.getShopId()); ServerResponseEntity authAccountEntity = accountFeignClient.getByUserIdAndType(dbShopUser.getShopUserId(), SysTypeEnum.MULTISHOP.value()); if (!authAccountEntity.isSuccess()) { @@ -180,9 +181,10 @@ public class ShopUserController { if (StrUtil.isNotBlank(phone)) { ServerResponseEntity sendNotifyResponse = notifyFeignClient.checkValidCode(phone, shopUserDTO.getValidCode(), SendTypeEnum.VALID); Boolean data = sendNotifyResponse.getData(); - if (Objects.equals(sendNotifyResponse.getCode(), ResponseEnum.OK.value()) && Objects.nonNull(data) && !data) { - throw new LuckException("验证码有误或已过期!"); - } + //TODO 去掉验证码校验 +// if (Objects.equals(sendNotifyResponse.getCode(), ResponseEnum.OK.value()) && Objects.nonNull(data) && !data) { +// throw new LuckException("验证码有误或已过期!"); +// } } //邮箱验证码 } diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/service/impl/ShopDetailServiceImpl.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/service/impl/ShopDetailServiceImpl.java index 173419d..c3bc1ab 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/service/impl/ShopDetailServiceImpl.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/service/impl/ShopDetailServiceImpl.java @@ -546,9 +546,10 @@ public class ShopDetailServiceImpl implements ShopDetailService { ShopUserRegisterDTO shopUserRegisterInfo = shopCreateInfoDTO.getShopUserRegisterInfo(); ServerResponseEntity sendNotifyResponse = notifyFeignClient.checkValidCode(shopUserRegisterInfo.getMobile(), shopUserRegisterInfo.getValidCode(), SendTypeEnum.VALID); Boolean data = sendNotifyResponse.getData(); - if (Objects.equals(sendNotifyResponse.getCode(), ResponseEnum.OK.value()) && Objects.nonNull(data) && !data) { - throw new LuckException("验证码有误或已过期!"); - } + //TODO 去掉验证码校验 +// if (Objects.equals(sendNotifyResponse.getCode(), ResponseEnum.OK.value()) && Objects.nonNull(data) && !data) { +// throw new LuckException("验证码有误或已过期!"); +// } // 2、保存店铺基本信息 Date now = new Date(); ShopDetailDTO shopDetailDTO = shopCreateInfoDTO.getShopDetail(); diff --git a/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/LoginController.java b/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/LoginController.java index 1f70649..dee77be 100644 --- a/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/LoginController.java +++ b/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/LoginController.java @@ -104,7 +104,7 @@ public class LoginController { && flag) { return ServerResponseEntity.showFailMsg("tempUid is blank"); } -// //校验验证码 +// //TODO 校验验证码 // ServerResponseEntity validCodeResponse = notifyFeignClient.checkValidCode(loginCode.getMobile(), loginCode.getValidCode(), SendTypeEnum.LOGIN); // if (!validCodeResponse.isSuccess() || !validCodeResponse.getData()) { // return ServerResponseEntity.fail(ResponseEnum.VERIFICATION_CODE_ERROR); diff --git a/tmerclub-common/tmerclub-common-core/src/main/java/com/tmerclub/cloud/common/response/ServerResponseEntity.java b/tmerclub-common/tmerclub-common-core/src/main/java/com/tmerclub/cloud/common/response/ServerResponseEntity.java index 6a1d81a..cd85491 100644 --- a/tmerclub-common/tmerclub-common-core/src/main/java/com/tmerclub/cloud/common/response/ServerResponseEntity.java +++ b/tmerclub-common/tmerclub-common-core/src/main/java/com/tmerclub/cloud/common/response/ServerResponseEntity.java @@ -99,7 +99,7 @@ public class ServerResponseEntity implements Serializable { public ServerResponseEntity() { // 版本号 - this.version = "mall4j.v240108"; + this.version = "tmerclub.v250326"; } public boolean isSuccess() {