|
@@ -139,14 +139,17 @@ public class LoginServiceImpl implements IRegisterLoginService {
|
|
|
String password = param.getPassword();
|
|
|
//用户信息
|
|
|
User user;
|
|
|
+ log.error("登录参数 param : {}, userData : {}", JsonUtil.toString(param), JsonUtil.toString(userData));
|
|
|
//登录, 进行登录检测
|
|
|
if (Objects.equals(param.getType(), LoginPasswordParam.LOGIN)) {
|
|
|
//判断是否手机号
|
|
|
if (RegexUtil.checkPhone(username)) {
|
|
|
+ log.error("手机登录, username : {}", username);
|
|
|
user = userService.getOne(new LambdaQueryWrapper<User>()
|
|
|
.eq(User::getGameId, userData.getGameId()).eq(User::getMobile, username));
|
|
|
} else {
|
|
|
//根据用户名查询
|
|
|
+ log.error("账号登录, username : {}", username);
|
|
|
user = userService.getOne(new LambdaQueryWrapper<User>()
|
|
|
.eq(User::getGameId, userData.getGameId()).eq(User::getUsername, username));
|
|
|
}
|
|
@@ -173,7 +176,8 @@ public class LoginServiceImpl implements IRegisterLoginService {
|
|
|
return ResultVO.fail(checkRegisterEnum.getMsg());
|
|
|
}
|
|
|
//用户注册
|
|
|
- user = userCreateSave(userData, username, password, null, null, null, null);
|
|
|
+ user = userCreateSave(userData, username, RegisterUtil.cmfPassword(password), null, null,
|
|
|
+ null, null);
|
|
|
//返回登录信息
|
|
|
return ResultVO.ok(this.createUserLoginVO(user, userData));
|
|
|
}
|