From dbed3099ea0dd2a517b739f29943d4ee529760e6 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 17 Jun 2019 15:23:45 +0800
Subject: [PATCH] Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/screen_api_v2.git
---
src/main/java/com/moral/security/auth/login/LoginAuthenticationProvider.java | 2 +-
1 files changed, 1 insertions(+), 1 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..12ba56f 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.")
);
--
Gitblit v1.8.0