From 6024588155b319b149f67726c93b963535e44465 Mon Sep 17 00:00:00 2001 From: yuyang Date: Wed, 15 Jun 2022 09:26:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B3=A8=E5=86=8C=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=E3=80=81?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=8A=A5=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xhpc/user/controller/XhpcAppUserController.java | 2 +- .../user/service/impl/XhpcAppUserServiceImpl.java | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java index 05a78771..57fd9beb 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java @@ -108,7 +108,7 @@ public class XhpcAppUserController extends BaseController { /** * C端用户注册 */ - @Log(title = "C端用户--注册", businessType = BusinessType.INSERT) + //@Log(title = "C端用户--注册", businessType = BusinessType.INSERT) @ApiOperation("注册") @PostMapping("/register") public R register(@RequestBody Map map) { diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java index c2ed2668..e967ba4b 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java @@ -149,8 +149,11 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU return R.fail(HttpStatus.NOT_NULL, "验证码不能为空"); } String captcha = redisService.getCacheObject("pvToken:" + phone); + if(captcha==null || "".equals(captcha)){ + return R.fail(HttpStatus.ERROR_STATUS, "验证码错误"); + } if (!code.equalsIgnoreCase(captcha)) { - R.fail(HttpStatus.ERROR_STATUS, "验证码错误"); + return R.fail(HttpStatus.ERROR_STATUS, "验证码错误"); } XhpcAppUser info = xhpcAppUserMapper.getAppUserByPhone(phone,tenantId); if (StringUtils.isNotNull(info)) { @@ -209,11 +212,15 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU String openid = StringUtils.valueOf(map.get("openid")); logger.info("<<<<<<<<<>>>>>>>>>>>"); logger.info("<<<<<<<<<<登录openid>>>>>>>>>>>>"+openid); + logger.info("<<<<<<<<<>>>>>>>>>>>"); if (StringUtils.isEmpty(openid)) { return R.fail(HttpStatus.NOT_NULL, "openid不能为空"); } String captcha = redisService.getCacheObject("pvToken:" + phone); + if(null ==captcha || "".equals(captcha)){ + return R.fail(HttpStatus.ERROR_STATUS, "验证码错误"); + } if (!code.equalsIgnoreCase(captcha)) { return R.fail(HttpStatus.ERROR_STATUS, "验证码错误"); } @@ -530,6 +537,9 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU return R.fail(HttpStatus.NOT_NULL, "手机号不能为空"); } String captcha = redisService.getCacheObject("pvToken:" + phone); + if(null ==captcha || "".equals(captcha)){ + return R.fail(HttpStatus.ERROR_STATUS, "验证码错误"); + } if (!code.equalsIgnoreCase(captcha)) { return R.fail(HttpStatus.ERROR_STATUS, "验证码错误"); }