From 9f79dd626f3a5096acedcae8d7a919c8910ac240 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 14 Oct 2019 10:08:16 +0800
Subject: [PATCH] 修改单位
---
src/main/java/com/moral/security/auth/login/LoginAuthenticationProvider.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/security/auth/login/LoginAuthenticationProvider.java b/src/main/java/com/moral/security/auth/login/LoginAuthenticationProvider.java
index 46dc354..4047ded 100644
--- a/src/main/java/com/moral/security/auth/login/LoginAuthenticationProvider.java
+++ b/src/main/java/com/moral/security/auth/login/LoginAuthenticationProvider.java
@@ -54,7 +54,7 @@
String password = (String) authentication.getCredentials();
LoginMode mode = (LoginMode) authentication.getDetails();
Account account = accountService.queryAccountByName(accountName).orElseThrow(() -> new UsernameNotFoundException("User not found: " + accountName));
- Date expireTime = Optional.of(account.getExpireTime())
+ Date expireTime = Optional.ofNullable(account.getExpireTime())
.orElseThrow(
()-> new AccountExpiredBadCredentialsException("Authentication Failed. Account has expired.")
);
@@ -70,7 +70,7 @@
throw new InsufficientAuthenticationException("User has no roles assigned");
}
List<GrantedAuthority> authorities = account.getRoles().stream()
- .map(authority -> new SimpleGrantedAuthority(authority.getName()))
+ .map(authority -> new SimpleGrantedAuthority(authority.getRoleName()))
.collect(Collectors.toList());
UserContext userContext = UserContext.create(account.getAccountName(),mode,account.getOrganizationId(),authorities);
--
Gitblit v1.8.0