|
@@ -90,13 +90,14 @@ 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();
|
|
|
|
|
|
|
+ //如果token过期则注销旧token重新生产
|
|
|
if(accessToken.isExpired()){
|
|
if(accessToken.isExpired()){
|
|
|
|
|
+ // 注销token
|
|
|
|
|
+ logout(accessToken.getValue());
|
|
|
// 重新生成token
|
|
// 重新生成token
|
|
|
accessToken = tokenEndpoint.postAccessToken(principal, parameters).getBody();
|
|
accessToken = tokenEndpoint.postAccessToken(principal, parameters).getBody();
|
|
|
}
|
|
}
|
|
|
- // 注销token
|
|
|
|
|
-// 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);
|
|
|
}
|
|
}
|