|
@@ -90,11 +90,13 @@ public class AuthServiceImpl implements AuthService {
|
|
|
if (Objects.isNull(accessToken)) {
|
|
if (Objects.isNull(accessToken)) {
|
|
|
return new Result<>(StatusCode.PWD_ERROR, RepMessage.USERNAME_OR_PASSWORD_ERROR);
|
|
return new Result<>(StatusCode.PWD_ERROR, RepMessage.USERNAME_OR_PASSWORD_ERROR);
|
|
|
}
|
|
}
|
|
|
- String discardToken = accessToken.getValue();
|
|
|
|
|
|
|
+// String discardToken = accessToken.getValue();
|
|
|
|
|
+ if(accessToken.isExpired()){
|
|
|
|
|
+ // 重新生成token
|
|
|
|
|
+ accessToken = tokenEndpoint.postAccessToken(principal, parameters).getBody();
|
|
|
|
|
+ }
|
|
|
// 注销token
|
|
// 注销token
|
|
|
- logout(discardToken);
|
|
|
|
|
- // 重新生成token
|
|
|
|
|
- accessToken = tokenEndpoint.postAccessToken(principal, parameters).getBody();
|
|
|
|
|
|
|
+// logout(discardToken);
|
|
|
if (Objects.isNull(accessToken)) {
|
|
if (Objects.isNull(accessToken)) {
|
|
|
return new Result<>(StatusCode.MANAGE_NOT_LOGIN, RepMessage.TOKEN_INVALID);
|
|
return new Result<>(StatusCode.MANAGE_NOT_LOGIN, RepMessage.TOKEN_INVALID);
|
|
|
}
|
|
}
|