|
@@ -116,13 +116,6 @@ public class LoginServiceImpl implements RegisterLoginService {
|
|
|
@Value("${auth.vx-appId}")
|
|
|
private String vxAppId;
|
|
|
|
|
|
- /**
|
|
|
- * 微信小游戏code授权登录
|
|
|
- *
|
|
|
- * @param param : 授权参数
|
|
|
- * @param userData : 用户信息
|
|
|
- * @return : 返回用户登录信息
|
|
|
- */
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public ResultVO<UserLoginVO> loginWxCode(LoginVxCodeParam param, UserData userData) {
|
|
@@ -191,13 +184,6 @@ public class LoginServiceImpl implements RegisterLoginService {
|
|
|
return new ResultVO<>(this.createUserLoginVO(user, userData));
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 用户名注册或者登录
|
|
|
- *
|
|
|
- * @param param : 注册登录参数
|
|
|
- * @param userData : 用户信息
|
|
|
- * @return : 返回用户登录信息
|
|
|
- */
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public ResultVO<UserLoginVO> loginPassword(LoginPasswordParam param, UserData userData) {
|
|
@@ -264,13 +250,6 @@ public class LoginServiceImpl implements RegisterLoginService {
|
|
|
return new ResultVO<>(this.createUserLoginVO(user, userData));
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 手机号登录
|
|
|
- *
|
|
|
- * @param param : 手机号登录参数
|
|
|
- * @param userData : 用户信息
|
|
|
- * @return : 返回登录信息
|
|
|
- */
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public ResultVO<UserLoginVO> loginMobile(LoginMobileParam param, UserData userData) {
|
|
@@ -320,13 +299,6 @@ public class LoginServiceImpl implements RegisterLoginService {
|
|
|
return new ResultVO<>(this.createUserLoginVO(user, userData));
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 构造用户登录信息
|
|
|
- *
|
|
|
- * @param user : 用户
|
|
|
- * @param userData : 信息
|
|
|
- * @return : 返回结果
|
|
|
- */
|
|
|
private UserLoginVO createUserLoginVO(User user, UserData userData) {
|
|
|
//获取token
|
|
|
String userToken = userTokenService.getUserToken(user.getId(), userData.getDeviceType());
|
|
@@ -353,12 +325,6 @@ public class LoginServiceImpl implements RegisterLoginService {
|
|
|
return userLoginVO;
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 登录退出
|
|
|
- *
|
|
|
- * @param userData : 返回用户信息
|
|
|
- * @return : 返回结果
|
|
|
- */
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public Boolean loginOut(UserData userData) {
|
|
@@ -367,12 +333,6 @@ public class LoginServiceImpl implements RegisterLoginService {
|
|
|
return userLoginLogService.createUserLoginLog(user, LoginTypeEnum.LOGIN_OUT.getLoginType());
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 登录注销/切换账号
|
|
|
- *
|
|
|
- * @param userData : 返回用户信息
|
|
|
- * @return : 返回结果
|
|
|
- */
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public Boolean writeOff(UserData userData) {
|
|
@@ -381,13 +341,6 @@ public class LoginServiceImpl implements RegisterLoginService {
|
|
|
return Boolean.TRUE;
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 登录用户名密码合规检测
|
|
|
- *
|
|
|
- * @param username : 用户名验证
|
|
|
- * @param password : 密码验证
|
|
|
- * @return : 返回验证结果
|
|
|
- */
|
|
|
private HttpStatusEnum checkRegister(String username, String password) {
|
|
|
//判断用户名是否存在敏感词
|
|
|
if (wordCheckService.hasWord(username)) {
|
|
@@ -408,11 +361,6 @@ public class LoginServiceImpl implements RegisterLoginService {
|
|
|
|
|
|
//-------------------------------- 微信和QQ授权登录(暂时没有用到) --------------------------------
|
|
|
|
|
|
- /**
|
|
|
- * QQ授权注册登录
|
|
|
- *
|
|
|
- * @param response : 返回体
|
|
|
- */
|
|
|
@Override
|
|
|
public void qqLoginAuth(HttpServletResponse response) {
|
|
|
//获取state
|
|
@@ -432,14 +380,6 @@ public class LoginServiceImpl implements RegisterLoginService {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * QQ授权注册登录回调
|
|
|
- *
|
|
|
- * @param param : 回调参数
|
|
|
- * @param request : request
|
|
|
- * @param userData : userData
|
|
|
- * @return : 返回登录token
|
|
|
- */
|
|
|
@Override
|
|
|
public ResultVO<UserLoginVO> qqLoginCallback(QqLoginCallbackParam param, HttpServletRequest request, UserData userData) {
|
|
|
String code = param.getCode();
|
|
@@ -463,11 +403,6 @@ public class LoginServiceImpl implements RegisterLoginService {
|
|
|
return new ResultVO<>(new UserLoginVO());
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 微信授权注册登录
|
|
|
- *
|
|
|
- * @param response : 返回体
|
|
|
- */
|
|
|
@Override
|
|
|
public void vxLoginAuth(HttpServletResponse response) {
|
|
|
//获取state
|
|
@@ -489,14 +424,6 @@ public class LoginServiceImpl implements RegisterLoginService {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 微信授权注册登录回调
|
|
|
- *
|
|
|
- * @param param : 回调参数
|
|
|
- * @param request : request
|
|
|
- * @param userData : userData
|
|
|
- * @return : 返回登录token
|
|
|
- */
|
|
|
@Override
|
|
|
public ResultVO<UserLoginVO> vxLoginCallback(QqLoginCallbackParam param, HttpServletRequest request, UserData userData) {
|
|
|
Integer deviceType = userData.getDeviceType();
|
|
@@ -520,14 +447,6 @@ public class LoginServiceImpl implements RegisterLoginService {
|
|
|
return new ResultVO<>(new UserLoginVO());
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 根据用户授权信息获取用户
|
|
|
- *
|
|
|
- * @param deviceType : 设备类型
|
|
|
- * @param userInfoMap : 第三方用户信息
|
|
|
- * @param userOauthDTO : 用户授权信息
|
|
|
- * @return : 返回应用用户信息
|
|
|
- */
|
|
|
private User getUserByUserOauth(Integer deviceType, Map<String, String> userInfoMap, UserOauthDTO userOauthDTO) {
|
|
|
if (userOauthDTO != null) {
|
|
|
return userService.getById(userOauthDTO.getUserId());
|
|
@@ -548,22 +467,12 @@ public class LoginServiceImpl implements RegisterLoginService {
|
|
|
return user;
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * state参数检测
|
|
|
- *
|
|
|
- * @param state : 随机密钥
|
|
|
- */
|
|
|
private void checkState(String state) {
|
|
|
if (!redisUtil.isMemberInSet(RedisKeyConstant.AUTH_STATE_KEY, state)) {
|
|
|
throw new BaseException("State验证失败");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 生成随机密钥并添加到redis中
|
|
|
- *
|
|
|
- * @return : 返回随机密钥
|
|
|
- */
|
|
|
private String getState() {
|
|
|
String state = UUID.randomUUID().toString();
|
|
|
redisUtil.addToSet(RedisKeyConstant.AUTH_STATE_KEY, state);
|