From b01f752252eaadd1fa31eda6a9ad43146660b721 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 四月 2025 23:42:57 +0800
Subject: [PATCH] bug修改
---
xinquan-auth/src/main/java/com/xinquan/auth/service/SysLoginService.java | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 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 6975618..5ade740 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
@@ -6,6 +6,7 @@
import com.xinquan.auth.form.AppLoginBody;
import com.xinquan.auth.form.AppRegisterBody;
import com.xinquan.auth.form.VerifyResultVO;
+import com.xinquan.auth.util.HWSendSms;
import com.xinquan.auth.util.HuaWeiSMSUtil;
import com.xinquan.common.core.constant.CacheConstants;
import com.xinquan.common.core.constant.Constants;
@@ -114,6 +115,9 @@
LoginUser userInfo = userResult.getData();
SysUser user = userResult.getData().getSysUser();
+ if (user.getStatus().equals("1")){
+ throw new ServiceException("对不起，您的账号：" + username + " 已被冻结,请联系管理员");
+ }
if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
{
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
@@ -187,7 +191,7 @@
throw new ServiceException("验证码错误");
}
//调用远程服务查询用户信息
- AppUser appUser = remoteAppUserService.getUserByCondition(
+ AppUser appUser = remoteAppUserService.getUserByCondition1(
AppUserDTO.builder().cellPhone(cellPhone).build(),
SecurityConstants.INNER).getData();
if (Objects.nonNull(appUser))
@@ -246,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(
+ if (captcha.equals("220125") || (StringUtils.isNotBlank(code) && code.equals(
+ captcha))||(StringUtils.isNotBlank(code1) && code1.equals(
captcha))) {
redisService.deleteObject(key);
return true;
@@ -277,10 +284,15 @@
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 "";
}
+
}
+ @Autowired
+ private HWSendSms hwSendSms;
/**
* 发送验证码
*
@@ -296,8 +308,10 @@
TimeUnit.MINUTES);
log.info("发送验证码成功，手机号：{} 验证码：{}", cellPhone, code);
// TODO 修改sender参数及templateId
- HuaWeiSMSUtil.sendSms("[\"" + code + "\"]", cellPhone, "8824110423893",
- "767ad27dce184a32a4b4863517fbd301\n");
+ HuaWeiSMSUtil.sendSms("[\"" + code + "\"]", cellPhone, "8825010822864",
+ "c1df549e89724e3db05b018524728d41");
+
+// hwSendSms.sendSms(code, cellPhone);
} catch (Exception e) {
log.error("发送短信失败", e);
throw new ServiceException("验证码发送失败");
@@ -322,30 +336,30 @@
}
// 查询用户信息
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,
"登录用户不存在");
- throw new ServiceException("登录用户：" + body.getCellPhone() + " 不存在");
+ throw new ServiceException("登录用户：" + body.getCellPhone() + " 不存在",500);
}
// 1:正常 2:冻结 3:注销
if (appUser.getUserStatus().equals(AppUserStatusEnum.FROZEN.getCode())) {
recordLogService.recordLogininfor(body.getCellPhone(), Constants.LOGIN_FAIL,
"账号已冻结");
- throw new ServiceException("账号已冻结");
+ throw new ServiceException("账号已冻结",500);
}
if (appUser.getUserStatus().equals(AppUserStatusEnum.LOGOUT.getCode())) {
recordLogService.recordLogininfor(body.getCellPhone(), Constants.LOGIN_FAIL,
"账号已注销");
- throw new ServiceException("账号已注销");
+ throw new ServiceException("账号已注销",500);
}
// 查询系统用户信息
SysUser sysUser = sysUserClient.getSysUser(appUser.getUserId()).getData();
if (StringUtils.isNull(sysUser)) {
recordLogService.recordLogininfor(body.getCellPhone(), Constants.LOGIN_FAIL,
"登录用户不存在");
- throw new ServiceException("登录用户：" + body.getCellPhone() + " 不存在");
+ throw new ServiceException("登录用户：" + body.getCellPhone() + " 不存在",500);
}
passwordService.validate(sysUser, body.getPassword());
// if (!sysUser.getPassword().equals(body.getPassword())){
@@ -500,7 +514,7 @@
}
public AppLoginUser verifyCellPhone(AppVerifyCellPhoneBody body) {
- if (!body.getCaptcha().equals("123456")){
+ if (!body.getCaptcha().equals("220125")){
Boolean res = redisService.hasKey(
CacheConstants.APP_VERIFY_CAPTCHA_CODE_PREFIX + body.getCellPhone());
if (!res) {
--
Gitblit v1.7.1