github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

update JwtTokenUtil and JwtPermissionService

pull/41/head
zhengjie 2019-04-15 10:06:16 +08:00
parent d6af3c15f9
commit 5787aa15ad
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eladmin-system/src/main/java/me/zhengjie/modules/security/service/JwtPermissionService.java
View File

@ -34,11 +34,8 @@ public class JwtPermissionService {
Set<Role> roles = roleRepository.findByUsers_Id(user.getId()); Set<Role> roles = roleRepository.findByUsers_Id(user.getId());
Set<Permission> permissions = new HashSet<>(); Set<Permission> permissions = new HashSet<>();
for (Role role : roles) {
Set<Role> roleSet = new HashSet<>(); permissions.addAll(permissionRepository.findByRoles(roles));
roleSet.add(role);
permissions.addAll(permissionRepository.findByRoles_Id(role.getId()));
}
return permissions.stream() return permissions.stream()
.map(permission -> new SimpleGrantedAuthority(permission.getName())) .map(permission -> new SimpleGrantedAuthority(permission.getName()))

2
eladmin-system/src/main/java/me/zhengjie/modules/security/utils/JwtTokenUtil.java
View File

@ -108,7 +108,7 @@ public class JwtTokenUtil implements Serializable {
final Date created = getIssuedAtDateFromToken(token); final Date created = getIssuedAtDateFromToken(token);
// final Date expiration = getExpirationDateFromToken(token); // final Date expiration = getExpirationDateFromToken(token);
// 如果token存在，且token创建日期 > 最后修改密码的日期 则代表token有效 // 如果token存在，且token创建日期 > 最后修改密码的日期 则代表token有效
return (isTokenExpired(token) return (!isTokenExpired(token)
&& !isCreatedBeforeLastPasswordReset(created, user.getLastPasswordResetDate()) && !isCreatedBeforeLastPasswordReset(created, user.getLastPasswordResetDate())
); );
} }

2
eladmin-system/src/main/java/me/zhengjie/modules/system/repository/PermissionRepository.java
View File

@ -30,4 +30,6 @@ public interface PermissionRepository extends JpaRepository<Permission, Long>, J
List<Permission> findByPid(long pid); List<Permission> findByPid(long pid);
Set<Permission> findByRoles_Id(Long id); Set<Permission> findByRoles_Id(Long id);
Set<Permission> findByRoles(Set<Role> roles);
} }