@@ -18,7 +18,13 @@ public class UserAuthLoginManage { | |||||
private final IUserAuthService iUserAuthService; | private final IUserAuthService iUserAuthService; | ||||
private final IUserInfoService iUserInfoService; | private final IUserInfoService iUserInfoService; | ||||
public UserFullInfoDTO queryUserInfoInPasswordAuth(String username){ | |||||
return null; | |||||
public UserFullInfoDTO queryUserInfoInPasswordAuth(String username) { | |||||
UserFullInfoDTO userFullInfoDTO = new UserFullInfoDTO(); | |||||
userFullInfoDTO.setCompanyId(1L); | |||||
userFullInfoDTO.setUserId(1L); | |||||
userFullInfoDTO.setIdentifier("123456"); | |||||
userFullInfoDTO.setRealName("测试账号"); | |||||
userFullInfoDTO.setUsername("测试账号"); | |||||
return userFullInfoDTO; | |||||
} | } | ||||
} | } |
@@ -4,10 +4,12 @@ import cn.hutool.core.collection.CollectionUtil; | |||||
import com.ningdatech.basic.auth.AbstractLoginUser; | import com.ningdatech.basic.auth.AbstractLoginUser; | ||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import org.apache.commons.lang3.StringUtils; | |||||
import org.springframework.security.core.GrantedAuthority; | import org.springframework.security.core.GrantedAuthority; | ||||
import org.springframework.security.core.authority.SimpleGrantedAuthority; | import org.springframework.security.core.authority.SimpleGrantedAuthority; | ||||
import org.springframework.security.core.userdetails.UserDetails; | import org.springframework.security.core.userdetails.UserDetails; | ||||
import java.util.ArrayList; | |||||
import java.util.Collection; | import java.util.Collection; | ||||
import java.util.List; | import java.util.List; | ||||
@@ -41,8 +43,11 @@ public class UserInfoDetails extends AbstractLoginUser implements UserDetails { | |||||
*/ | */ | ||||
@Override | @Override | ||||
public Collection<? extends GrantedAuthority> getAuthorities() { | public Collection<? extends GrantedAuthority> getAuthorities() { | ||||
SimpleGrantedAuthority simpleGrantedAuthority = new SimpleGrantedAuthority(this.role); | |||||
return CollectionUtil.toList(simpleGrantedAuthority); | |||||
if (StringUtils.isNotBlank(role)) { | |||||
SimpleGrantedAuthority simpleGrantedAuthority = new SimpleGrantedAuthority(this.role); | |||||
return CollectionUtil.toList(simpleGrantedAuthority); | |||||
} | |||||
return new ArrayList<>(); | |||||
} | } | ||||
@Override | @Override | ||||
@@ -31,7 +31,8 @@ public class UsernamePasswordAuthProvider implements AuthenticationProvider { | |||||
if (user == null) { | if (user == null) { | ||||
throw new InternalAuthenticationServiceException("can not get user info!"); | throw new InternalAuthenticationServiceException("can not get user info!"); | ||||
} | } | ||||
additionalAuthenticationChecks(user, authenticationToken); | |||||
// TODO 开发使用暂时关闭账号密码验证 | |||||
// additionalAuthenticationChecks(user, authenticationToken); | |||||
// 校验用户是否有当前端的登陆权限 | // 校验用户是否有当前端的登陆权限 | ||||
// 将用户定义的user放入token中,这样可以在session中查询到所有自定义的用户信息 | // 将用户定义的user放入token中,这样可以在session中查询到所有自定义的用户信息 | ||||
return new UsernamePasswordAuthToken(user, user.getPassword(), user.getAuthorities()); | return new UsernamePasswordAuthToken(user, user.getPassword(), user.getAuthorities()); | ||||