修正了错误。
This commit is contained in:
parent
f80156459b
commit
0a2da51feb
@ -11,6 +11,7 @@ import org.springframework.security.core.userdetails.UserDetails;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@ -19,9 +20,9 @@ public class LoginUser implements UserDetails {
|
|||||||
|
|
||||||
private User user;
|
private User user;
|
||||||
|
|
||||||
private List<Map> permissions;
|
private Set<Map> permissions;
|
||||||
|
|
||||||
public LoginUser(User user, List<Map> permissions) {
|
public LoginUser(User user, Set<Map> permissions) {
|
||||||
this.user = user;
|
this.user = user;
|
||||||
this.permissions = permissions;
|
this.permissions = permissions;
|
||||||
}
|
}
|
||||||
@ -29,7 +30,7 @@ public class LoginUser implements UserDetails {
|
|||||||
@JSONField(serialize = false)
|
@JSONField(serialize = false)
|
||||||
private List<SimpleGrantedAuthority> authorities;
|
private List<SimpleGrantedAuthority> authorities;
|
||||||
|
|
||||||
public List<Map> getPermissions() {
|
public Set<Map> getPermissions() {
|
||||||
return permissions;
|
return permissions;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -48,7 +48,7 @@ public class CustomUserDetailsService implements UserDetailsService {
|
|||||||
if (appUser == null) {
|
if (appUser == null) {
|
||||||
throw new UsernameNotFoundException("用户不存在: " + username);
|
throw new UsernameNotFoundException("用户不存在: " + username);
|
||||||
}
|
}
|
||||||
List<Map> permissions = buildUserAuthorities(appUser);
|
Set<Map> permissions = buildUserAuthorities(appUser);
|
||||||
LoginUser loginUser = new LoginUser(appUser,permissions);
|
LoginUser loginUser = new LoginUser(appUser,permissions);
|
||||||
return loginUser;
|
return loginUser;
|
||||||
|
|
||||||
@ -60,8 +60,8 @@ public class CustomUserDetailsService implements UserDetailsService {
|
|||||||
* @param appUser 用户信息
|
* @param appUser 用户信息
|
||||||
* @return 权限集合
|
* @return 权限集合
|
||||||
*/
|
*/
|
||||||
private List<Map> buildUserAuthorities(User appUser) {
|
private Set<Map> buildUserAuthorities(User appUser) {
|
||||||
List<Map> permissions = new ArrayList<>();
|
Set<Map> permissions = new HashSet<>();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// 使用RoleMapper直接查询用户的角色信息
|
// 使用RoleMapper直接查询用户的角色信息
|
||||||
|
Loading…
Reference in New Issue
Block a user