From 41b9950b03bafeb5fa90770794faf9baeacade6b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 11 十一月 2024 16:15:43 +0800
Subject: [PATCH] 代码提交
---
xinquan-auth/src/main/java/com/xinquan/auth/service/SysLoginService.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 fc9388b..6975618 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
@@ -232,6 +232,7 @@
appLoginUser.setCellPhone(cellPhone);
appLoginUser.setAppUserId(appUserInfo.getId());
appLoginUser.setSysUser(sysUser);
+
return appLoginUser;
}
@@ -295,7 +296,7 @@
TimeUnit.MINUTES);
log.info("发送验证码成功，手机号：{} 验证码：{}", cellPhone, code);
// TODO 修改sender参数及templateId
- HuaWeiSMSUtil.sendSms("[\"" + code + "\"]", cellPhone, "8823121426646",
+ HuaWeiSMSUtil.sendSms("[\"" + code + "\"]", cellPhone, "8824110423893",
"767ad27dce184a32a4b4863517fbd301\n");
} catch (Exception e) {
log.error("发送短信失败", e);
@@ -321,7 +322,7 @@
}
// 查询用户信息
AppUser appUser = remoteAppUserService.getUserByCondition(
- AppUserDTO.builder().cellPhone(body.getCellPhone()).build(),
+ AppUserDTO.builder().cellPhone(body.getCellPhone()).device(body.getDevice()).build(),
SecurityConstants.INNER).getData();
if (StringUtils.isNull(appUser)) {
recordLogService.recordLogininfor(body.getCellPhone(), Constants.LOGIN_FAIL,
@@ -402,8 +403,8 @@
* @param appleId 苹果id
* @return
*/
- public AppLoginUser appleLogin(String appleId) {
- R<AppLoginUser> userResult = remoteAppUserService.appleLogin(appleId,
+ public AppLoginUser appleLogin(String appleId,String device) {
+ R<AppLoginUser> userResult = remoteAppUserService.appleLogin(appleId,device,
SecurityConstants.INNER);
if (R.FAIL == userResult.getCode()) {
throw new ServiceException(userResult.getMsg());
@@ -473,7 +474,7 @@
throw new ServiceException("用户不存在或已注销");
}
// 修改密码
- sysUser.setPassword(body.getPassword());
+ sysUser.setPassword(SecurityUtils.encryptPassword(body.getPassword()));
sysUserClient.updateUser(sysUser);
redisService.deleteObject(CacheConstants.APP_PASSWORD_SECRET_PREFIX + body.getCellPhone());
}
--
Gitblit v1.7.1