diff --git a/app/src/main/java/com/github/catvod/api/UCApi.java b/app/src/main/java/com/github/catvod/api/UCApi.java index 2286faa7..28927dfc 100644 --- a/app/src/main/java/com/github/catvod/api/UCApi.java +++ b/app/src/main/java/com/github/catvod/api/UCApi.java @@ -89,10 +89,10 @@ public class UCApi { java.lang.String tokenCacheJson = tokenCache.getUser().getCookie(); if (StringUtils.isNoneBlank(tokenCacheJson)) { - this.cookieToken = Json.safeObject(tokenCacheJson).getAsJsonObject().get("access_token").getAsString(); - //刷新token - qrCodeHandler.refreshToken(Json.safeObject(tokenCacheJson).getAsJsonObject().get("refresh_token").getAsString()); + + //刷新token,并返回 + this.cookieToken = qrCodeHandler.refreshToken(Json.safeObject(tokenCacheJson).getAsJsonObject().get("refresh_token").getAsString()); SpiderDebug.log("UC初始化获取到的cookieToken: " + cookieToken); } diff --git a/app/src/main/java/com/github/catvod/api/UCTokenHandler.java b/app/src/main/java/com/github/catvod/api/UCTokenHandler.java index da11958c..ba22602e 100644 --- a/app/src/main/java/com/github/catvod/api/UCTokenHandler.java +++ b/app/src/main/java/com/github/catvod/api/UCTokenHandler.java @@ -261,8 +261,9 @@ public class UCTokenHandler { * 刷新refresh token * * @param refreshToken 刷新token + * @return 防火新的accesstoken */ - public void refreshToken(String refreshToken) { + public String refreshToken(String refreshToken) { OkResult okResult1 = this.getAccessToken(refreshToken, true); if (okResult1.getCode() == 200) { @@ -270,7 +271,9 @@ public class UCTokenHandler { SpiderDebug.log("uc Token刷新成功:" + tokenResData.get("data").getAsJsonObject().get("access_token").getAsString()); //保存到本地 cache.setTokenUser(User.objectFrom(Json.toJson(tokenResData.get("data").getAsJsonObject()))); + return tokenResData.get("data").getAsJsonObject().get("access_token").getAsString(); } + return ""; } public String download(String token, String saveFileId) throws Exception {