From d4538e6e88aa1a93935e16ee37b6d82b276d32fa Mon Sep 17 00:00:00 2001 From: haotianmingyue <2421912570@qq.com> Date: Mon, 21 Oct 2024 11:16:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=5F=E5=8F=91=E9=80=81?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=EF=BC=8C=E6=B3=A8=E5=86=8C=E6=96=B0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=EF=BC=8C=E8=B4=A6=E5=8F=B7=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E7=99=BB=E5=BD=95=EF=BC=8C=E7=9F=AD=E4=BF=A1=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=A0=81=E7=99=BB=E5=BD=95=20=E6=B5=8B=E8=AF=95=E5=AE=8C?= =?UTF-8?q?=E6=AF=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/AppSystemController.java | 2 +- .../controller/common/CaptchaController.java | 13 +++++++----- .../com/ruoyi/common/constant/Constants.java | 2 +- .../web/service/SysRegisterService.java | 21 +++++++++++++------ 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java index 4d792865..9ac83e1a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java @@ -242,7 +242,7 @@ public class AppSystemController { String expiryDate = baiduCardBack.getWords_result().get("失效日期").getWords(); if(!pRealName.equals(qRealName) || !pIdCard.equals(qIdCard)){ - return error("姓名或身份证号不一致"); + return error("实名认证信息不一致"); } else{ Long userId = sysUserService.selectUserByUserName(userName).getUserId(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java index fd686bd8..f1fdf967 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java @@ -108,11 +108,13 @@ public class CaptchaController { @GetMapping("/appRegisterCaptchaCode/{phone}") public AjaxResult getAppRegisterCode(@PathVariable String phone) throws IOException { AjaxResult ajax = AjaxResult.success(); - //先验证手机号是否已经注册 - int i = sysUserService.checkUserPhone(phone); - if (i > 0) { - return AjaxResult.error("该手机号已经注册"); - } + + // 注册时可能出现多次获取验证码的情况，不应该在这里判断手机号是否注册。 +// //先验证手机号是否已经注册 +// int i = sysUserService.checkUserPhone(phone); +// if (i > 0) { +// return AjaxResult.error("该手机号已经注册"); +// } // 保存验证码信息 // String uuid = IdUtils.simpleUUID(); sendCacheCode(phone); @@ -145,6 +147,7 @@ public class CaptchaController { String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + phone; // 生成短信验证码 String testCode = "1234"; + // Constants.CAPTCHA_EXPIRATION 为验证码过期时间，这里是5 redisCache.setCacheObject(verifyKey, testCode, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES); } catch (Exception e) { log.info("发送短信验证码异常:" + e.getMessage()); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java index f4ba2934..9d43a9b7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java @@ -67,7 +67,7 @@ public class Constants /** * 验证码有效期（分钟） */ - public static final Integer CAPTCHA_EXPIRATION = 2; + public static final Integer CAPTCHA_EXPIRATION = 5; /** * 令牌 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java index 364f7237..cd036149 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java @@ -1,6 +1,8 @@ package com.ruoyi.framework.web.service; import java.util.Date; + +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.model.AppRegisterUser; import com.ruoyi.system.domain.UserInfo; import com.ruoyi.system.service.IUserInfoService; @@ -122,18 +124,25 @@ public class SysRegisterService public String AppRegister(AppRegisterUser registerBody) { String msg = "", username = registerBody.getUsername(), password = registerBody.getPassword(); + + //先验证手机号是否已经注册 + int i = userService.checkUserPhone(username); + if (i > 0) { + return "该手机号已经注册"; + } + SysUser sysUser = new SysUser(); sysUser.setUserName(username); UserInfo userInfo = new UserInfo(); -// //------------------------ 验证码开关 开发环境先关闭---------------------------------- -// boolean captchaEnabled = configService.selectCaptchaEnabled(); -// if (captchaEnabled) -// { -// appRegistervalidateCaptcha(username, registerBody.getCode()); -// } + //------------------------ 验证码开关 开发环境先关闭---------------------------------- + boolean captchaEnabled = configService.selectCaptchaEnabled(); + if (captchaEnabled) + { + appRegistervalidateCaptcha(username, registerBody.getCode()); + } // //----------------------end 验证码开关------------------------------------------- if (StringUtils.isEmpty(username))