From 0c51a577db337520452022d9d6a22b720ef858d4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 31 十二月 2024 14:13:01 +0800
Subject: [PATCH] 全部代码、数据库提交

---
 xinquan-auth/src/main/java/com/xinquan/auth/service/SysLoginService.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/xinquan-auth/src/main/java/com/xinquan/auth/service/SysLoginService.java b/xinquan-auth/src/main/java/com/xinquan/auth/service/SysLoginService.java
index 1d299f5..b0899c0 100644
--- a/xinquan-auth/src/main/java/com/xinquan/auth/service/SysLoginService.java
+++ b/xinquan-auth/src/main/java/com/xinquan/auth/service/SysLoginService.java
@@ -250,9 +250,12 @@
 
         if (StringUtils.isNotBlank(cellPhone) && StringUtils.isNotBlank(captcha)) {
             String key = keyPrefix + cellPhone;
+            String key1 = CacheConstants.APP_PASSWORD_CAPTCHA_CODE_PREFIX + cellPhone;
             String code = redisService.getCacheObject(key);
+            String code1 = redisService.getCacheObject(key1);
             // 万能验证码
             if (captcha.equals("123456") || (StringUtils.isNotBlank(code) && code.equals(
+                    captcha))||(StringUtils.isNotBlank(code1) && code1.equals(
                     captcha))) {
                 redisService.deleteObject(key);
                 return true;
@@ -281,6 +284,8 @@
                 return CacheConstants.APP_CHANGE_PHONE_CODE_PREFIX;
             case 6:
                 return CacheConstants.ADD_CARD_PHONE_CODE_PREFIX;
+            case 7:
+                return CacheConstants.MANAGEMENT_PASSWORD_SECRET_PREFIX;
             default:
                 return "";
         }
@@ -303,10 +308,10 @@
                     TimeUnit.MINUTES);
             log.info("发送验证码成功,手机号:{} 验证码:{}", cellPhone, code);
             // TODO 修改sender参数及templateId
-//             HuaWeiSMSUtil.sendSms("[\"" + code + "\"]", cellPhone, "8824110423893",
-//                     "767ad27dce184a32a4b4863517fbd301");
+             HuaWeiSMSUtil.sendSms("[\"" + code + "\"]", cellPhone, "8824110423893",
+                     "767ad27dce184a32a4b4863517fbd301");
 
-            hwSendSms.sendSms(code, cellPhone);
+//            hwSendSms.sendSms(code, cellPhone);
         } catch (Exception e) {
             log.error("发送短信失败", e);
             throw new ServiceException("验证码发送失败");
@@ -331,7 +336,7 @@
         }
         // 查询用户信息
         AppUser appUser = remoteAppUserService.getUserByCondition(
-                AppUserDTO.builder().cellPhone(body.getCellPhone()).device(body.getDevice()).build(),
+                AppUserDTO.builder().cellPhone(body.getCellPhone()).build(),
                 SecurityConstants.INNER).getData();
         if (StringUtils.isNull(appUser)) {
             recordLogService.recordLogininfor(body.getCellPhone(), Constants.LOGIN_FAIL,

--
Gitblit v1.7.1