|
@@ -1,7 +1,7 @@
|
|
|
package com.zanxiang.sdk.service.Impl;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
-import com.zanxiang.common.domain.ResultVo;
|
|
|
+import com.zanxiang.common.domain.ResultVO;
|
|
|
import com.zanxiang.common.enums.AccountStatusEnum;
|
|
|
import com.zanxiang.common.enums.HttpStatusEnum;
|
|
|
import com.zanxiang.common.exception.BaseException;
|
|
@@ -113,7 +113,7 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
|
|
|
* @return : 返回登录token
|
|
|
*/
|
|
|
@Override
|
|
|
- public ResultVo<UserLoginVO> qqLoginCallback(QqLoginCallbackParam qqLoginCallbackParam, HttpServletRequest request, UserData userData) {
|
|
|
+ public ResultVO<UserLoginVO> qqLoginCallback(QqLoginCallbackParam qqLoginCallbackParam, HttpServletRequest request, UserData userData) {
|
|
|
String code = qqLoginCallbackParam.getCode();
|
|
|
String state = qqLoginCallbackParam.getState();
|
|
|
Integer deviceType = userData.getDeviceType();
|
|
@@ -134,7 +134,7 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
|
|
|
//移出state
|
|
|
redisUtil.removeOfSet(RedisKeyConstant.AUTH_STATE_KEY, state);
|
|
|
//构造返回
|
|
|
- return new ResultVo<>(new UserLoginVO(userToken));
|
|
|
+ return new ResultVO<>(new UserLoginVO(userToken));
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -172,7 +172,7 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
|
|
|
* @return : 返回登录token
|
|
|
*/
|
|
|
@Override
|
|
|
- public ResultVo<UserLoginVO> vxLoginCallback(QqLoginCallbackParam qqLoginCallbackParam, HttpServletRequest request, UserData userData) {
|
|
|
+ public ResultVO<UserLoginVO> vxLoginCallback(QqLoginCallbackParam qqLoginCallbackParam, HttpServletRequest request, UserData userData) {
|
|
|
Integer deviceType = userData.getDeviceType();
|
|
|
String code = qqLoginCallbackParam.getCode();
|
|
|
String state = qqLoginCallbackParam.getState();
|
|
@@ -193,7 +193,7 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
|
|
|
//移出state
|
|
|
redisUtil.removeOfSet(RedisKeyConstant.AUTH_STATE_KEY, state);
|
|
|
//构造返回
|
|
|
- return new ResultVo<>(new UserLoginVO(userToken));
|
|
|
+ return new ResultVO<>(new UserLoginVO(userToken));
|
|
|
}
|
|
|
|
|
|
|
|
@@ -207,13 +207,13 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
|
|
|
*/
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public ResultVo<UserLoginVO> registerPassword(RegisterPasswordParam registerPasswordParam, HttpServletRequest request, UserData userData) {
|
|
|
+ public ResultVO<UserLoginVO> registerPassword(RegisterPasswordParam registerPasswordParam, HttpServletRequest request, UserData userData) {
|
|
|
String username = registerPasswordParam.getUsername();
|
|
|
String password = registerPasswordParam.getPassword();
|
|
|
//用户名密码校验
|
|
|
HttpStatusEnum checkRegisterEnum = this.checkRegister(username, password);
|
|
|
if (!Objects.equals(checkRegisterEnum, HttpStatusEnum.SUCCESS)) {
|
|
|
- return new ResultVo<>(checkRegisterEnum);
|
|
|
+ return new ResultVO<>(checkRegisterEnum);
|
|
|
}
|
|
|
//创建用户信息
|
|
|
User user = User.builder()
|
|
@@ -238,7 +238,7 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
|
|
|
|
|
|
}
|
|
|
//返回用户token
|
|
|
- return new ResultVo<>(new UserLoginVO(userToken));
|
|
|
+ return new ResultVO<>(new UserLoginVO(userToken));
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -251,7 +251,7 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
|
|
|
*/
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public ResultVo<UserLoginVO> registerMobile(RegisterMobileParam registerMobileParam, HttpServletRequest request, UserData userData) {
|
|
|
+ public ResultVO<UserLoginVO> registerMobile(RegisterMobileParam registerMobileParam, HttpServletRequest request, UserData userData) {
|
|
|
Integer type = registerMobileParam.getType();
|
|
|
String mobile = registerMobileParam.getMobile();
|
|
|
String code = registerMobileParam.getCode();
|
|
@@ -259,16 +259,16 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
|
|
|
//校验手机验证码
|
|
|
HttpStatusEnum codeCheckEnum = smsService.smsCheck(type, mobile, code);
|
|
|
if (!Objects.equals(codeCheckEnum, HttpStatusEnum.SUCCESS)) {
|
|
|
- return new ResultVo<>(codeCheckEnum);
|
|
|
+ return new ResultVO<>(codeCheckEnum);
|
|
|
}
|
|
|
//判断手机号是否已经注册
|
|
|
if (userService.count(new LambdaQueryWrapper<User>().eq(User::getMobile, mobile)) > 0) {
|
|
|
- return new ResultVo<>(HttpStatusEnum.PHONE_IS_REG);
|
|
|
+ return new ResultVO<>(HttpStatusEnum.PHONE_IS_REG);
|
|
|
}
|
|
|
//验证密码是否合规
|
|
|
HttpStatusEnum passwordCheckEnum = RegisterUtil.checkPassword(password);
|
|
|
if (!Objects.equals(passwordCheckEnum, HttpStatusEnum.SUCCESS)) {
|
|
|
- return new ResultVo<>(passwordCheckEnum);
|
|
|
+ return new ResultVO<>(passwordCheckEnum);
|
|
|
}
|
|
|
//创建用户信息
|
|
|
User user = User.builder()
|
|
@@ -289,7 +289,7 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
|
|
|
//插入用户登录记录
|
|
|
userLoginLogService.addUserLoginLog(realIp, user, registerMobileParam.getGameId());
|
|
|
//返回用户token
|
|
|
- return new ResultVo<>(new UserLoginVO(userToken));
|
|
|
+ return new ResultVO<>(new UserLoginVO(userToken));
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -301,7 +301,7 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
|
|
|
* @return : 返回登录token
|
|
|
*/
|
|
|
@Override
|
|
|
- public ResultVo<UserLoginVO> loginPassword(LoginPasswordParam userLoginParam, HttpServletRequest request, UserData userData) {
|
|
|
+ public ResultVO<UserLoginVO> loginPassword(LoginPasswordParam userLoginParam, HttpServletRequest request, UserData userData) {
|
|
|
//用户名
|
|
|
String username = userLoginParam.getUsername();
|
|
|
//密码
|
|
@@ -317,15 +317,15 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
|
|
|
}
|
|
|
//用户信息不存在
|
|
|
if (user == null) {
|
|
|
- return new ResultVo<>(HttpStatusEnum.USERNAME_OR_PASSWORD_ERR);
|
|
|
+ return new ResultVO<>(HttpStatusEnum.USERNAME_OR_PASSWORD_ERR);
|
|
|
}
|
|
|
//判断账号是否停用
|
|
|
if (Objects.equals(AccountStatusEnum.FROZEN_STATUS.getStatus(), user.getStatus())) {
|
|
|
- return new ResultVo<>(HttpStatusEnum.ACCOUNT_HALT);
|
|
|
+ return new ResultVO<>(HttpStatusEnum.ACCOUNT_HALT);
|
|
|
}
|
|
|
//验证密码
|
|
|
if (!Objects.equals(RegisterUtil.cmfPassword(password), user.getPassword())) {
|
|
|
- return new ResultVo<>(HttpStatusEnum.USERNAME_OR_PASSWORD_ERR);
|
|
|
+ return new ResultVO<>(HttpStatusEnum.USERNAME_OR_PASSWORD_ERR);
|
|
|
}
|
|
|
//验证通过, 获取token
|
|
|
String userToken = userTokenService.getUserToken(user.getId(), userData.getDeviceType());
|
|
@@ -334,7 +334,7 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
|
|
|
//插入用户登录记录
|
|
|
userLoginLogService.addUserLoginLog(realIp, user, userLoginParam.getGameId());
|
|
|
//构造返回
|
|
|
- return new ResultVo<>(new UserLoginVO(userToken));
|
|
|
+ return new ResultVO<>(new UserLoginVO(userToken));
|
|
|
}
|
|
|
|
|
|
|
|
@@ -347,7 +347,7 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
|
|
|
* @return : 返回登录信息
|
|
|
*/
|
|
|
@Override
|
|
|
- public ResultVo<UserLoginVO> loginMobile(LoginMobileParam loginMobileParam, HttpServletRequest request, UserData userData) {
|
|
|
+ public ResultVO<UserLoginVO> loginMobile(LoginMobileParam loginMobileParam, HttpServletRequest request, UserData userData) {
|
|
|
Integer type = loginMobileParam.getType();
|
|
|
String mobile = loginMobileParam.getMobile();
|
|
|
String code = loginMobileParam.getCode();
|
|
@@ -355,17 +355,17 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
|
|
|
HttpStatusEnum httpStatusEnum = smsService.smsCheck(type, mobile, code);
|
|
|
//验证不通过, 返回
|
|
|
if (!Objects.equals(httpStatusEnum, HttpStatusEnum.SUCCESS)) {
|
|
|
- return new ResultVo<>(httpStatusEnum);
|
|
|
+ return new ResultVO<>(httpStatusEnum);
|
|
|
}
|
|
|
//获取用户信息
|
|
|
User user = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getMobile, mobile));
|
|
|
//用户信息不存在
|
|
|
if (user == null) {
|
|
|
- return new ResultVo<>(HttpStatusEnum.PHONE_NOT_REG);
|
|
|
+ return new ResultVO<>(HttpStatusEnum.PHONE_NOT_REG);
|
|
|
}
|
|
|
//判断账号是否停用
|
|
|
if (Objects.equals(AccountStatusEnum.FROZEN_STATUS.getStatus(), user.getStatus())) {
|
|
|
- return new ResultVo<>(HttpStatusEnum.ACCOUNT_HALT);
|
|
|
+ return new ResultVO<>(HttpStatusEnum.ACCOUNT_HALT);
|
|
|
}
|
|
|
//验证通过, 获取token
|
|
|
String userToken = userTokenService.getUserToken(user.getId(), userData.getDeviceType());
|
|
@@ -374,7 +374,7 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
|
|
|
//插入用户登录记录
|
|
|
userLoginLogService.addUserLoginLog(realIp, user, loginMobileParam.getGameId());
|
|
|
//构造返回
|
|
|
- return new ResultVo<>(new UserLoginVO(userToken));
|
|
|
+ return new ResultVO<>(new UserLoginVO(userToken));
|
|
|
}
|
|
|
|
|
|
/**
|