diff --git a/app/src/main/java/com/github/catvod/ali/API.java b/app/src/main/java/com/github/catvod/ali/API.java index acedfaab..7acb3d6b 100644 --- a/app/src/main/java/com/github/catvod/ali/API.java +++ b/app/src/main/java/com/github/catvod/ali/API.java @@ -134,13 +134,14 @@ public class API { url = url.startsWith("https") ? url : "https://api.aliyundrive.com/" + url; String result = OkHttp.postJson(url, json, getHeaderSign()); Log.e("sign", result); - if (retry && checkSign(result)) return sign(url, json, false); + if (retry && checkAuth(result)) return sign(url, json, false); return result; } private boolean checkAuth(String result) { if (result.contains("AccessTokenInvalid")) return refreshAccessToken(); if (result.contains("ShareLinkTokenInvalid") || result.contains("InvalidParameterNotMatch")) return refreshShareToken(); + if (result.contains("UserDeviceOffline") || result.contains("UserDeviceIllegality") || result.contains("DeviceSessionSignatureInvalid")) return refreshSignature(); return false; } @@ -149,11 +150,6 @@ public class API { return false; } - private boolean checkSign(String result) { - if (result.contains("UserDeviceOffline") || result.contains("UserDeviceIllegality") || result.contains("DeviceSessionSignatureInvalid")) return refreshSignature(); - return false; - } - public void checkAccessToken() { if (auth.getAccessToken().isEmpty()) refreshAccessToken(); } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 2cdcac3f..bf29ec71 100644 Binary files a/jar/custom_spider.jar and b/jar/custom_spider.jar differ diff --git a/jar/custom_spider.jar.md5 b/jar/custom_spider.jar.md5 index 023b7d05..485d79b3 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -cd0e21fc175ab24e9f754ec27ee15f27 +ed850893fd0c94513677e7b98cc741a8 diff --git a/json/adult.json b/json/adult.json index a13a55ee..e8e3f54c 100644 --- a/json/adult.json +++ b/json/adult.json @@ -1,5 +1,5 @@ { - "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;cd0e21fc175ab24e9f754ec27ee15f27", + "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;ed850893fd0c94513677e7b98cc741a8", "wallpaper": "https://gao.chuqiuyu.tk", "lives": [ { diff --git a/json/config.json b/json/config.json index ef739794..be87fdc5 100644 --- a/json/config.json +++ b/json/config.json @@ -1,5 +1,5 @@ { - "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;cd0e21fc175ab24e9f754ec27ee15f27", + "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;ed850893fd0c94513677e7b98cc741a8", "wallpaper": "http://饭太硬.ga/深色壁纸/api.php", "lives": [ {