去除 Spring Security 的 Member 的 loadUsername,使用自己定义的 login0 实现

This commit is contained in:
YunaiV
2022-05-08 02:33:34 +08:00
parent 3bd7e8e682
commit 5e8648508e
17 changed files with 63 additions and 383 deletions

View File

@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.system.convert.auth;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.security.core.LoginUser;
import cn.iocoder.yudao.framework.security.core.authentication.SpringSecurityUser;
import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeSendReqDTO;
import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeUseReqDTO;
import cn.iocoder.yudao.module.system.api.social.dto.SocialUserBindReqDTO;
@ -24,8 +23,6 @@ public interface AuthConvert {
LoginUser convert(AdminUserDO bean);
SpringSecurityUser convert2(AdminUserDO user);
default AuthPermissionInfoRespVO convert(AdminUserDO user, List<RoleDO> roleList, List<MenuDO> menuList) {
return AuthPermissionInfoRespVO.builder()
.user(AuthPermissionInfoRespVO.UserVO.builder().id(user.getId()).nickname(user.getNickname()).avatar(user.getAvatar()).build())

View File

@ -12,7 +12,7 @@ import javax.validation.Valid;
*
* @author 芋道源码
*/
public interface AdminAuthService extends SecurityAuthFrameworkService {
public interface AdminAuthService {
/**
* 账号登录

View File

@ -21,8 +21,6 @@ import cn.iocoder.yudao.module.system.service.social.SocialUserService;
import cn.iocoder.yudao.module.system.service.user.AdminUserService;
import com.google.common.annotations.VisibleForTesting;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -226,11 +224,6 @@ public class AdminAuthServiceImpl implements AdminAuthService {
createLogoutLog(loginUser.getId());
}
@Override
public UserTypeEnum getUserType() {
return UserTypeEnum.ADMIN;
}
private void createLogoutLog(Long userId) {
LoginLogCreateReqDTO reqDTO = new LoginLogCreateReqDTO();
reqDTO.setLogType(LoginLogTypeEnum.LOGOUT_SELF.getType());
@ -244,11 +237,6 @@ public class AdminAuthServiceImpl implements AdminAuthService {
loginLogService.createLoginLog(reqDTO);
}
@Override
public LoginUser verifyTokenAndRefresh(String token) {
return userSessionService.getLoginUser(token);
}
private LoginUser buildLoginUser(AdminUserDO user) {
return AuthConvert.INSTANCE.convert(user).setUserType(getUserType().getValue());
}
@ -261,8 +249,8 @@ public class AdminAuthServiceImpl implements AdminAuthService {
return user != null ? user.getUsername() : null;
}
@Override
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
return null;
private UserTypeEnum getUserType() {
return UserTypeEnum.ADMIN;
}
}