WFC/be.wfc
2
0
Fork 0
Code Activity

feat: 登录认证的类型分为sys/u，对应系统和用户平台

Browse Source
This commit is contained in:
TsMask
2024-11-27 15:23:49 +08:00
parent b7e8da2091
commit 5b8c1b1e94
25 changed files with 262 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wfc-auth/pom.xml
View File

@@ -56,7 +56,12 @@
<groupId>org.wfc</groupId>
<artifactId>wfc-common-swagger</artifactId>
</dependency>
<!-- WFC Api User -->
<dependency>
<groupId>org.wfc</groupId>
<artifactId>wfc-api-user</artifactId>
</dependency>
</dependencies>
<build>

32
wfc-auth/src/main/java/org/wfc/auth/controller/TokenController.java
View File

@@ -1,21 +1,25 @@
package org.wfc.auth.controller;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import org.wfc.auth.form.LoginBody;
import org.wfc.auth.form.RegisterBody;
import org.wfc.common.core.web.form.LoginBody;
import org.wfc.common.core.web.form.RegisterBody;
import org.wfc.auth.service.SysLoginService;
import org.wfc.auth.service.ULoginService;
import org.wfc.common.core.domain.R;
import org.wfc.common.core.utils.JwtUtils;
import org.wfc.common.core.utils.StringUtils;
import org.wfc.common.security.auth.AuthUtil;
import org.wfc.common.security.service.TokenService;
import org.wfc.common.security.utils.SecurityUtils;
import org.wfc.system.api.model.LoginUser;
import org.wfc.common.core.domain.LoginUser;
import org.wfc.system.api.domain.SysUser;
import org.wfc.user.api.domain.UUser;
import javax.servlet.http.HttpServletRequest;
/**
* token 控制
@@ -31,13 +35,25 @@ public class TokenController
@Autowired
private SysLoginService sysLoginService;
@Autowired
private ULoginService uLoginService;
@PostMapping("login")
public R<?> login(@RequestBody LoginBody form)
{
// 用户登录
LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
// 获取登录token
return R.ok(tokenService.createToken(userInfo));
if ("u".equals(form.getAuthType())){
// 用户登录
LoginUser<UUser> userInfo = uLoginService.login(form.getUsername(), form.getPassword());
// 获取登录token
return R.ok(tokenService.createToken(userInfo));
} if ("sys".equals(form.getAuthType())){
// 用户登录
LoginUser<SysUser> sysInfo = sysLoginService.login(form.getUsername(), form.getPassword());
// 获取登录token
return R.ok(tokenService.createToken(sysInfo));
}
return R.fail("authentication type not supported");
}
@DeleteMapping("logout")

52
wfc-auth/src/main/java/org/wfc/auth/form/LoginBody.java
View File

@@ -1,52 +0,0 @@
package org.wfc.auth.form;
/**
* 用户登录对象
*
* @author wfc
*/
public class LoginBody
{
/**
* 用户名
*/
private String username;
/**
* 用户密码
*/
private String password;
/**
* 认证类型 用户u/客户sys
*/
private String authType;
public String getUsername()
{
return username;
}
public void setUsername(String username)
{
this.username = username;
}
public String getPassword()
{
return password;
}
public void setPassword(String password)
{
this.password = password;
}
public String getAuthType() {
return authType;
}
public void setAuthType(String authType) {
this.authType = authType;
}
}

11
wfc-auth/src/main/java/org/wfc/auth/form/RegisterBody.java
View File

@@ -1,11 +0,0 @@
package org.wfc.auth.form;
/**
* 用户注册对象
*
* @author wfc
*/
public class RegisterBody extends LoginBody
{
}

11
wfc-auth/src/main/java/org/wfc/auth/service/SysLoginService.java
View File

@@ -17,7 +17,8 @@ import org.wfc.common.redis.service.RedisService;
import org.wfc.common.security.utils.SecurityUtils;
import org.wfc.system.api.RemoteUserService;
import org.wfc.system.api.domain.SysUser;
import org.wfc.system.api.model.LoginUser;
import org.wfc.common.core.domain.LoginUser;
import org.wfc.user.api.domain.UUser;
/**
* 登录校验方法
@@ -42,7 +43,7 @@ public class SysLoginService
/**
* 登录
*/
public LoginUser login(String username, String password)
public LoginUser<SysUser> login(String username, String password)
{
// 用户名或密码为空 错误
if (StringUtils.isAnyBlank(username, password))
@@ -72,7 +73,7 @@ public class SysLoginService
throw new ServiceException("很遗憾，访问IP已被列入系统黑名单");
}
// 查询用户信息
R<LoginUser> userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER);
R<LoginUser<SysUser>> userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER);
if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData()))
{
@@ -85,8 +86,8 @@ public class SysLoginService
throw new ServiceException(userResult.getMsg());
}
LoginUser userInfo = userResult.getData();
SysUser user = userResult.getData().getSysUser();
LoginUser<SysUser> userInfo = userResult.getData();
SysUser user = userInfo.getUser();
if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
{
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");

24
wfc-auth/src/main/java/org/wfc/auth/service/ULoginService.java
View File

@@ -15,9 +15,9 @@ import org.wfc.common.core.utils.StringUtils;
import org.wfc.common.core.utils.ip.IpUtils;
import org.wfc.common.redis.service.RedisService;
import org.wfc.common.security.utils.SecurityUtils;
import org.wfc.system.api.RemoteUserService;
import org.wfc.system.api.domain.SysUser;
import org.wfc.system.api.model.LoginUser;
import org.wfc.common.core.domain.LoginUser;
import org.wfc.user.api.RemoteUUserService;
import org.wfc.user.api.domain.UUser;
/**
* 用户平台-登录校验方法
@@ -28,13 +28,13 @@ import org.wfc.system.api.model.LoginUser;
public class ULoginService
{
@Autowired
private RemoteUserService remoteUserService;
private RemoteUUserService remoteUserService;
@Autowired
private SysPasswordService passwordService;
private UPasswordService passwordService;
@Autowired
private SysRecordLogService recordLogService;
private URecordLogService recordLogService;
@Autowired
private RedisService redisService;
@@ -42,7 +42,7 @@ public class ULoginService
/**
* 登录
*/
public LoginUser login(String username, String password)
public LoginUser<UUser> login(String username, String password)
{
// 用户名或密码为空 错误
if (StringUtils.isAnyBlank(username, password))
@@ -72,7 +72,7 @@ public class ULoginService
throw new ServiceException("很遗憾，访问IP已被列入系统黑名单");
}
// 查询用户信息
R<LoginUser> userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER);
R<LoginUser<UUser>> userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER);
if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData()))
{
@@ -85,8 +85,8 @@ public class ULoginService
throw new ServiceException(userResult.getMsg());
}
LoginUser userInfo = userResult.getData();
SysUser user = userResult.getData().getSysUser();
LoginUser<UUser> userInfo = userResult.getData();
UUser user = userInfo.getUser();
if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
{
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
@@ -110,7 +110,7 @@ public class ULoginService
*/
public void recordLoginInfo(Long userId)
{
SysUser sysUser = new SysUser();
UUser sysUser = new UUser();
sysUser.setUserId(userId);
// 更新用户登录IP
sysUser.setLoginIp(IpUtils.getIpAddr());
@@ -146,7 +146,7 @@ public class ULoginService
}
// 注册用户信息
SysUser sysUser = new SysUser();
UUser sysUser = new UUser();
sysUser.setUserName(username);
sysUser.setNickName(username);
sysUser.setPassword(SecurityUtils.encryptPassword(password));

87
wfc-auth/src/main/java/org/wfc/auth/service/UPasswordService.java Normal file
View File

@@ -0,0 +1,87 @@
package org.wfc.auth.service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.wfc.common.core.constant.CacheConstants;
import org.wfc.common.core.constant.Constants;
import org.wfc.common.core.exception.ServiceException;
import org.wfc.common.core.exception.user.UserPasswordNotMatchException;
import org.wfc.common.redis.service.RedisService;
import org.wfc.common.security.utils.SecurityUtils;
import org.wfc.user.api.domain.UUser;
import java.util.concurrent.TimeUnit;
/**
* 登录密码方法
*
* @author wfc
*/
@Component
public class UPasswordService
{
@Autowired
private RedisService redisService;
private int maxRetryCount = CacheConstants.PASSWORD_MAX_RETRY_COUNT;
private Long lockTime = CacheConstants.PASSWORD_LOCK_TIME;
@Autowired
private SysRecordLogService recordLogService;
/**
* 登录账户密码错误次数缓存键名
*
* @param username 用户名
* @return 缓存键key
*/
private String getCacheKey(String username)
{
return CacheConstants.PWD_ERR_CNT_KEY + username;
}
public void validate(UUser user, String password)
{
String username = user.getUserName();
Integer retryCount = redisService.getCacheObject(getCacheKey(username));
if (retryCount == null)
{
retryCount = 0;
}
if (retryCount >= Integer.valueOf(maxRetryCount).intValue())
{
String errMsg = String.format("密码输入错误%s次，帐户锁定%s分钟", maxRetryCount, lockTime);
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL,errMsg);
throw new ServiceException(errMsg);
}
if (!matches(user, password))
{
retryCount = retryCount + 1;
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, String.format("密码输入错误%s次", retryCount));
redisService.setCacheObject(getCacheKey(username), retryCount, lockTime, TimeUnit.MINUTES);
throw new UserPasswordNotMatchException();
}
else
{
clearLoginRecordCache(username);
}
}
public boolean matches(UUser user, String rawPassword)
{
return SecurityUtils.matchesPassword(rawPassword, user.getPassword());
}
public void clearLoginRecordCache(String loginName)
{
if (redisService.hasKey(getCacheKey(loginName)))
{
redisService.deleteObject(getCacheKey(loginName));
}
}
}

48
wfc-auth/src/main/java/org/wfc/auth/service/URecordLogService.java Normal file
View File

@@ -0,0 +1,48 @@
package org.wfc.auth.service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.wfc.common.core.constant.Constants;
import org.wfc.common.core.constant.SecurityConstants;
import org.wfc.common.core.utils.StringUtils;
import org.wfc.common.core.utils.ip.IpUtils;
import org.wfc.user.api.RemoteULogService;
import org.wfc.user.api.domain.ULogininfor;
/**
* 记录日志方法
*
* @author wfc
*/
@Component
public class URecordLogService
{
@Autowired
private RemoteULogService remoteLogService;
/**
* 记录登录信息
*
* @param username 用户名
* @param status 状态
* @param message 消息内容
* @return
*/
public void recordLogininfor(String username, String status, String message)
{
ULogininfor logininfor = new ULogininfor();
logininfor.setUserName(username);
logininfor.setIpaddr(IpUtils.getIpAddr());
logininfor.setMsg(message);
// 日志状态
if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER))
{
logininfor.setStatus(Constants.LOGIN_SUCCESS_STATUS);
}
else if (Constants.LOGIN_FAIL.equals(status))
{
logininfor.setStatus(Constants.LOGIN_FAIL_STATUS);
}
remoteLogService.saveLogininfor(logininfor, SecurityConstants.INNER);
}
}