|
@@ -1,5 +1,6 @@
|
|
package com.boman.auth.service;
|
|
package com.boman.auth.service;
|
|
|
|
|
|
|
|
+import com.boman.domain.dto.AjaxResult;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
import com.boman.domain.constant.Constants;
|
|
import com.boman.domain.constant.Constants;
|
|
@@ -16,12 +17,11 @@ import com.boman.system.api.model.LoginUser;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 登录校验方法
|
|
* 登录校验方法
|
|
- *
|
|
|
|
|
|
+ *
|
|
* @author ruoyi
|
|
* @author ruoyi
|
|
*/
|
|
*/
|
|
@Component
|
|
@Component
|
|
-public class SysLoginService
|
|
|
|
-{
|
|
|
|
|
|
+public class SysLoginService {
|
|
@Autowired
|
|
@Autowired
|
|
private RemoteLogService remoteLogService;
|
|
private RemoteLogService remoteLogService;
|
|
|
|
|
|
@@ -31,56 +31,47 @@ public class SysLoginService
|
|
/**
|
|
/**
|
|
* 登录
|
|
* 登录
|
|
*/
|
|
*/
|
|
- public LoginUser login(String username, String password)
|
|
|
|
- {
|
|
|
|
|
|
+ public LoginUser login(String username, String password) {
|
|
// 用户名或密码为空 错误
|
|
// 用户名或密码为空 错误
|
|
- if (StringUtils.isAnyBlank(username, password))
|
|
|
|
- {
|
|
|
|
|
|
+ if (StringUtils.isAnyBlank(username, password)) {
|
|
remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
|
|
remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
|
|
throw new BaseException("用户/密码必须填写");
|
|
throw new BaseException("用户/密码必须填写");
|
|
}
|
|
}
|
|
// 密码如果不在指定范围内 错误
|
|
// 密码如果不在指定范围内 错误
|
|
if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
|
|
if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
|
|
- || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
|
|
|
|
- {
|
|
|
|
|
|
+ || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
|
|
remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "用户密码不在指定范围");
|
|
remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "用户密码不在指定范围");
|
|
throw new BaseException("用户密码不在指定范围");
|
|
throw new BaseException("用户密码不在指定范围");
|
|
}
|
|
}
|
|
// 用户名不在指定范围内 错误
|
|
// 用户名不在指定范围内 错误
|
|
if (username.length() < UserConstants.USERNAME_MIN_LENGTH
|
|
if (username.length() < UserConstants.USERNAME_MIN_LENGTH
|
|
- || username.length() > UserConstants.USERNAME_MAX_LENGTH)
|
|
|
|
- {
|
|
|
|
|
|
+ || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
|
|
remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "用户名不在指定范围");
|
|
remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "用户名不在指定范围");
|
|
throw new BaseException("用户名不在指定范围");
|
|
throw new BaseException("用户名不在指定范围");
|
|
}
|
|
}
|
|
// 查询用户信息
|
|
// 查询用户信息
|
|
R<LoginUser> userResult = remoteUserService.getUserInfo(username);
|
|
R<LoginUser> userResult = remoteUserService.getUserInfo(username);
|
|
|
|
|
|
- if (R.FAIL == userResult.getCode())
|
|
|
|
- {
|
|
|
|
|
|
+ if (R.FAIL == userResult.getCode()) {
|
|
throw new BaseException(userResult.getMsg());
|
|
throw new BaseException(userResult.getMsg());
|
|
}
|
|
}
|
|
|
|
|
|
- if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData()))
|
|
|
|
- {
|
|
|
|
|
|
+ if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) {
|
|
remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
|
|
remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
|
|
throw new BaseException("登录用户:" + username + " 不存在");
|
|
throw new BaseException("登录用户:" + username + " 不存在");
|
|
}
|
|
}
|
|
LoginUser userInfo = userResult.getData();
|
|
LoginUser userInfo = userResult.getData();
|
|
SysUser user = userResult.getData().getSysUser();
|
|
SysUser user = userResult.getData().getSysUser();
|
|
- if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
|
|
|
|
- {
|
|
|
|
|
|
+ if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
|
|
remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "对不起,您的账号已被删除");
|
|
remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "对不起,您的账号已被删除");
|
|
|
|
|
|
throw new BaseException("对不起,您的账号:" + username + " 已被删除");
|
|
throw new BaseException("对不起,您的账号:" + username + " 已被删除");
|
|
}
|
|
}
|
|
- if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
|
|
|
|
- {
|
|
|
|
|
|
+ if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
|
|
remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "用户已停用,请联系管理员");
|
|
remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "用户已停用,请联系管理员");
|
|
throw new BaseException("对不起,您的账号:" + username + " 已停用");
|
|
throw new BaseException("对不起,您的账号:" + username + " 已停用");
|
|
}
|
|
}
|
|
- if (!SecurityUtils.matchesPassword(password, user.getPassword()))
|
|
|
|
- {
|
|
|
|
|
|
+ if (!SecurityUtils.matchesPassword(password, user.getPassword())) {
|
|
remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "用户密码错误");
|
|
remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "用户密码错误");
|
|
throw new BaseException("用户不存在/密码错误");
|
|
throw new BaseException("用户不存在/密码错误");
|
|
}
|
|
}
|
|
@@ -88,8 +79,11 @@ public class SysLoginService
|
|
return userInfo;
|
|
return userInfo;
|
|
}
|
|
}
|
|
|
|
|
|
- public void logout(String loginName)
|
|
|
|
- {
|
|
|
|
|
|
+ public AjaxResult updateUnionId(SysUser sysUser) {
|
|
|
|
+ return remoteUserService.updateUnionId(sysUser);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void logout(String loginName) {
|
|
remoteLogService.saveLogininfor(loginName, Constants.LOGOUT, "退出成功");
|
|
remoteLogService.saveLogininfor(loginName, Constants.LOGOUT, "退出成功");
|
|
}
|
|
}
|
|
}
|
|
}
|