From 9823c85286da0041a729fe58cb38a62ff33fdced Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 11 十一月 2024 21:00:54 +0800
Subject: [PATCH] 代码提交
---
xinquan-auth/src/main/java/com/xinquan/auth/service/SysLoginService.java | 59 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 21 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 0b836ed..5994e09 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.HuaWeiSMSUtil;
import com.xinquan.common.core.constant.CacheConstants;
import com.xinquan.common.core.constant.Constants;
import com.xinquan.common.core.constant.SecurityConstants;
@@ -27,7 +28,7 @@
import com.xinquan.system.api.model.AppVerifyCellPhoneBody;
import com.xinquan.system.api.model.AppWXLoginBody;
import com.xinquan.system.api.model.LoginUser;
-import com.xinquan.user.api.domain.AppUser;
+import com.xinquan.system.api.domain.AppUser;
import com.xinquan.user.api.domain.dto.AppUserDTO;
import com.xinquan.user.api.feign.RemoteAppUserService;
import java.math.BigDecimal;
@@ -167,10 +168,14 @@
}
recordLogService.recordLogininfor(username, Constants.REGISTER, "注册成功");
}
+
+ public static void main(String[] args) {
+ String s = SecurityUtils.encryptPassword("E10ADC3949BA59ABBE56E057F20F883E");
+ System.out.println(s);
+ }
/**
* 注册
*/
- @Transactional(rollbackFor = Exception.class)
public AppLoginUser appRegister(AppRegisterBody appRegisterBody)
{
String cellPhone = appRegisterBody.getCellPhone();
@@ -182,7 +187,7 @@
throw new ServiceException("验证码错误");
}
//调用远程服务查询用户信息
- AppUser appUser = remoteAppUserService.getUserByCondition(
+ AppUser appUser = remoteAppUserService.getUserByCondition1(
AppUserDTO.builder().cellPhone(cellPhone).build(),
SecurityConstants.INNER).getData();
if (Objects.nonNull(appUser))
@@ -206,10 +211,13 @@
recordLogService.recordLogininfor(cellPhone, Constants.REGISTER, "注册成功");
//TODO 默认头像待完善
AppUserDTO appUserDTO = AppUserDTO.builder().userId(sysUser.getUserId()).cellPhone(cellPhone)
- .avatar("qwer").nickname(
- nickname).userStatus(1).sanskritFlag(2).balance(BigDecimal.ZERO)
+ .avatar("https://xqgwzh.obs.cn-south-1.myhuaweicloud.com/Logo%E7%A1%AE%E8%AE%A4%E7%89%88%281%29.jpg").nickname(
+ nickname).userStatus(1).sanskritFlag(2).balance(BigDecimal.ZERO).inviteUserId(appRegisterBody.getInviteUserId())
.income(BigDecimal.ZERO).totalEnergyValue(0).registerTime(
LocalDateTime.now()).levelSettingId(1).build();
+ if (appRegisterBody.getInviteUserId()!=null){
+ appUserDTO.setInviteUserTime(LocalDateTime.now());
+ }
R<AppUser> result = remoteAppUserService.registerAppUser(appUserDTO,
SecurityConstants.INNER);
if (R.FAIL == result.getCode()) {
@@ -224,6 +232,7 @@
appLoginUser.setCellPhone(cellPhone);
appLoginUser.setAppUserId(appUserInfo.getId());
appLoginUser.setSysUser(sysUser);
+
return appLoginUser;
}
@@ -264,6 +273,10 @@
return CacheConstants.APP_PASSWORD_CAPTCHA_CODE_PREFIX;
case 4:
return CacheConstants.APP_VERIFY_CAPTCHA_CODE_PREFIX;
+ case 5:
+ return CacheConstants.APP_CHANGE_PHONE_CODE_PREFIX;
+ case 6:
+ return CacheConstants.ADD_CARD_PHONE_CODE_PREFIX;
default:
return "";
}
@@ -283,8 +296,8 @@
TimeUnit.MINUTES);
log.info("发送验证码成功，手机号：{} 验证码：{}", cellPhone, code);
// TODO 修改sender参数及templateId
- // HuaWeiSMSUtil.sendSms("[\"" + code + "\"]", cellPhone, "8823121426646",
- // "cf1707ec44694627b1b483b0277e12fd");
+ HuaWeiSMSUtil.sendSms("[\"" + code + "\"]", cellPhone, "8824110423893",
+ "767ad27dce184a32a4b4863517fbd301\n");
} catch (Exception e) {
log.error("发送短信失败", e);
throw new ServiceException("验证码发送失败");
@@ -309,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,
@@ -334,10 +347,12 @@
"登录用户不存在");
throw new ServiceException("登录用户：" + body.getCellPhone() + " 不存在");
}
- // 校验账号密码
passwordService.validate(sysUser, body.getPassword());
+// if (!sysUser.getPassword().equals(body.getPassword())){
+// throw new ServiceException("密码错误");
+// }
AppLoginUser appLoginUser = new AppLoginUser();
- appLoginUser.setAppUserId(appUser.getUserId());
+ appLoginUser.setAppUserId(appUser.getId());
appLoginUser.setCellPhone(appUser.getCellPhone());
appLoginUser.setUsername(sysUser.getNickName());
appLoginUser.setSysUser(sysUser);
@@ -388,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());
@@ -485,15 +500,17 @@
}
public AppLoginUser verifyCellPhone(AppVerifyCellPhoneBody body) {
- Boolean res = redisService.hasKey(
- CacheConstants.APP_VERIFY_CAPTCHA_CODE_PREFIX + body.getCellPhone());
- if (!res) {
- throw new ServiceException("验证码已失效，请重新获取");
- }
- // 校验验证码
- if (!verifyCaptcha(body.getCellPhone(), body.getCaptcha(),
- CacheConstants.APP_VERIFY_CAPTCHA_CODE_PREFIX)) {
- throw new ServiceException("验证码不正确");
+ if (!body.getCaptcha().equals("123456")){
+ Boolean res = redisService.hasKey(
+ CacheConstants.APP_VERIFY_CAPTCHA_CODE_PREFIX + body.getCellPhone());
+ if (!res) {
+ throw new ServiceException("验证码已失效，请重新获取");
+ }
+ // 校验验证码
+ if (!verifyCaptcha(body.getCellPhone(), body.getCaptcha(),
+ CacheConstants.APP_VERIFY_CAPTCHA_CODE_PREFIX)) {
+ throw new ServiceException("验证码不正确");
+ }
}
// 更新用户系统用户信息
R<AppLoginUser> result = remoteAppUserService.verifyCellPhone(body,
--
Gitblit v1.7.1