This commit is contained in:
dute7liang
2023-12-31 00:00:30 +08:00
parent 6c856eebfb
commit d89b912d64
261 changed files with 911 additions and 929 deletions

View File

@@ -2,8 +2,8 @@ package com.ruoyi.cai.auth;
import cn.dev33.satoken.exception.NotLoginException;
import cn.dev33.satoken.stp.StpUtil;
import com.ruoyi.cai.domain.CaiUser;
import com.ruoyi.cai.domain.CaiUserInfo;
import com.ruoyi.cai.domain.User;
import com.ruoyi.cai.domain.UserInfo;
import com.ruoyi.cai.executor.ExecutorConstant;
import com.ruoyi.cai.service.CaiUserInfoService;
import com.ruoyi.cai.service.CaiUserService;
@@ -34,11 +34,11 @@ public class CaiLoginManager {
public String login(String username,String password){
CaiUser caiUser = caiUserService.getByUsername(username);
if(caiUser == null){
User user = caiUserService.getByUsername(username);
if(user == null){
throw new ServiceException("用户不存在或密码错误");
}
if(caiUser.getStatus() != 0){
if(user.getStatus() != 0){
throw new ServiceException("用户已封禁,请联系客服");
}
/*if(!BCrypt.checkpw(password, caiUser.getPassword())){
@@ -56,28 +56,28 @@ public class CaiLoginManager {
// loginUser.setOs();
loginUser.setMenuPermission(Collections.emptySet());
loginUser.setRolePermission(Collections.emptySet());
loginUser.setUsername(caiUser.getMobile());
loginUser.setUsername(user.getMobile());
loginUser.setRoles(Collections.emptyList());
loginUser.setRoleId(null);
loginUser.setUserId(caiUser.getId());
loginUser.setUserId(user.getId());
loginUser.setUserType(UserType.APP_USER.getUserType());
LoginHelper.login(loginUser);
sysLoginService.recordLogininfor(loginUser.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
String clientIP = ServletUtils.getClientIP();
ExecutorConstant.COMMON_EXECUTOR.execute(() -> recordLoginInfo(caiUser,clientIP));
ExecutorConstant.COMMON_EXECUTOR.execute(() -> recordLoginInfo(user,clientIP));
return StpUtil.getTokenValue();
}
@Autowired
private CaiUserInfoService caiUserInfoService;
public void recordLoginInfo(CaiUser caiUser,String ip) {
public void recordLoginInfo(User user, String ip) {
String address = AddressUtils.getRealAddressByIP(ip);
CaiUserInfo caiUserInfo = caiUserInfoService.getById(caiUser.getId());
CaiUserInfo update = new CaiUserInfo();
update.setUserId(caiUser.getId());
update.setLoginCount(caiUserInfo.getLoginCount()+1);
update.setPrevLoginTime(caiUserInfo.getLastLoginTime());
UserInfo userInfo = caiUserInfoService.getById(user.getId());
UserInfo update = new UserInfo();
update.setUserId(user.getId());
update.setLoginCount(userInfo.getLoginCount()+1);
update.setPrevLoginTime(userInfo.getLastLoginTime());
update.setLastLoginIp(ip);
update.setLastLoginTime(LocalDateTime.now());
update.setLastLocation(address);