From afff23e17c0bdf74162e46f7e128c2a33e103081 Mon Sep 17 00:00:00 2001 From: lihongbiao <964708803@qq.com> Date: Fri, 25 Jul 2025 17:40:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aircraft/modules/security/service/AUserDetailsService.java | 2 +- .../aircraft/modules/security/service/BUserDetailsService.java | 2 +- .../modules/security/service/UserDetailsServiceImpl.java | 2 +- .../com/aircraft/modules/security/service/dto/JwtUserDto.java | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/aircraft-system/src/main/java/com/aircraft/modules/security/service/AUserDetailsService.java b/aircraft-system/src/main/java/com/aircraft/modules/security/service/AUserDetailsService.java index 6551bc0..d7ed335 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/security/service/AUserDetailsService.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/security/service/AUserDetailsService.java @@ -46,7 +46,7 @@ public class AUserDetailsService implements UserDetailsService { userDto.setEnabled(true); userDto.setIsAdmin(false); // 创建一个 JwtCustomerDto 对象 - employeeDto = new JwtUserDto(userDto, UserTypeEnum.EMPLOYEES, new ArrayList<>()); + employeeDto = new JwtUserDto(userDto, UserTypeEnum.EMPLOYEES, new ArrayList<>(),null); // 添加缓存数据 userCacheManager.addEmployeeCache(username, employeeDto); } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/security/service/BUserDetailsService.java b/aircraft-system/src/main/java/com/aircraft/modules/security/service/BUserDetailsService.java index 14b3175..1da68ec 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/security/service/BUserDetailsService.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/security/service/BUserDetailsService.java @@ -45,7 +45,7 @@ public class BUserDetailsService implements UserDetailsService { userDto.setEnabled(true); userDto.setIsAdmin(false); // 创建一个 JwtCustomerDto 对象 - customerDto = new JwtUserDto(userDto, UserTypeEnum.CUSTOMER, new ArrayList<>()); + customerDto = new JwtUserDto(userDto, UserTypeEnum.CUSTOMER, new ArrayList<>(), customerDto.getCustomerType()); // 添加缓存数据 userCacheManager.addCustomerCache(username, customerDto); } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/security/service/UserDetailsServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/security/service/UserDetailsServiceImpl.java index 11005db..65f3d63 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/security/service/UserDetailsServiceImpl.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/security/service/UserDetailsServiceImpl.java @@ -60,7 +60,7 @@ public class UserDetailsServiceImpl implements UserDetailsService { // 获取用户的权限 List authorities = roleService.buildPermissions(user); // 初始化JwtUserDto - jwtUserDto = new JwtUserDto(BeanUtil.copyProperties(user, LoginUserDto.class), UserTypeEnum.getByValue(user.getUserType()), authorities); + jwtUserDto = new JwtUserDto(BeanUtil.copyProperties(user, LoginUserDto.class), UserTypeEnum.getByValue(user.getUserType()), authorities,null); // 添加缓存数据 userCacheManager.addUserCache(username, jwtUserDto); } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/security/service/dto/JwtUserDto.java b/aircraft-system/src/main/java/com/aircraft/modules/security/service/dto/JwtUserDto.java index 6b1e981..8a654e5 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/security/service/dto/JwtUserDto.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/security/service/dto/JwtUserDto.java @@ -50,6 +50,9 @@ public class JwtUserDto implements UserDetails { @ApiModelProperty(value = "角色") private final List authorities; + @ApiModelProperty("客户类型") + private final String customerType; + public Set getRoles() { return authorities.stream().map(AuthorityDto::getAuthority).collect(Collectors.toSet()); }