From c4469d269bab585a02e02e7f28abd18064067fbd Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 22 一月 2025 15:11:02 +0800
Subject: [PATCH] 1
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 7 ++++---
ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/UserController.java | 2 +-
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 2 +-
ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java | 7 -------
4 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index f8dd206..91495f4 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -134,13 +134,14 @@
{
// 验证码生成
String code = String.valueOf(Math.random()).substring(2, 6);
+ // 发送验证码
+ String result = SmsUtils.sendSms(registerUser.getPhone(), code);
code += ":"+System.currentTimeMillis();
// 缓存验证码
String verifyKey = CacheConstants.PHONE_CODE_KEY + registerUser.getPhone();
redisService.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
- // 发送验证码
- String result = SmsUtils.sendSms(registerUser.getPhone(), code);
+
if (!"OK".equals(result))
{
return R.fail("验证码发送失败");
@@ -202,7 +203,7 @@
throw new CaptchaException("验证码错误");
}
String[] split = captcha.split(":");
- long l = Long.parseLong(split[2]);
+ long l = Long.parseLong(split[1]);
long l1 = System.currentTimeMillis();
// 判断是否大于两分钟
if (l1 - l > 2 * 60 * 1000) {
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
index e83b91a..934c52b 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -164,7 +164,7 @@
throw new ServiceException("验证码错误");
}
String[] split = captcha.split(":");
- long l = Long.parseLong(split[2]);
+ long l = Long.parseLong(split[1]);
long l1 = System.currentTimeMillis();
// 判断是否大于两分钟
if (l1 - l > 2 * 60 * 1000) {
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
index 4578a40..55a0671 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
@@ -109,13 +109,6 @@
{
throw new CaptchaException("验证码错误");
}
- String[] split = captcha.split(":");
- long l = Long.parseLong(split[2]);
- long l1 = System.currentTimeMillis();
- // 判断是否大于两分钟
- if (l1 - l > 2 * 60 * 1000) {
- throw new CaptchaException("验证码已失效");
- }
redisService.deleteObject(verifyKey);
if (!code.equalsIgnoreCase(captcha))
{
diff --git a/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/UserController.java b/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/UserController.java
index 3925aef..0d66acd 100644
--- a/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/UserController.java
+++ b/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/UserController.java
@@ -106,7 +106,7 @@
String verifyKey = CacheConstants.PHONE_CODE_KEY + StringUtils.nvl(updatePhone.getNewPhone(), "");
String captcha = redisService.getCacheObject(verifyKey);
String[] split = captcha.split(":");
- long l = Long.parseLong(split[2]);
+ long l = Long.parseLong(split[1]);
long l1 = System.currentTimeMillis();
// 判断是否大于两分钟
if (l1 - l > 2 * 60 * 1000) {
--
Gitblit v1.7.1