Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-12 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41

 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.")
                );