diff --git a/app/src/main/java/com/github/catvod/api/QuarkApi.java b/app/src/main/java/com/github/catvod/api/QuarkApi.java index 6266cb64..5812927c 100644 --- a/app/src/main/java/com/github/catvod/api/QuarkApi.java +++ b/app/src/main/java/com/github/catvod/api/QuarkApi.java @@ -63,7 +63,7 @@ public class QuarkApi { headers.put("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) quark-cloud-drive/2.5.20 Chrome/100.0.4896.160 Electron/18.3.5.4-b478491100 Safari/537.36 Channel/pckk_other_ch"); headers.put("Referer", "https://pan.quark.cn/"); headers.put("Content-Type", "application/json"); - headers.put("Cookie", this.cookie); + headers.put("Cookie", cache.getUser().getCookie()); headers.put("Host", "drive-pc.quark.cn"); return headers; } @@ -72,7 +72,7 @@ public class QuarkApi { Map headers = new HashMap<>(); headers.put("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) quark-cloud-drive/2.5.20 Chrome/100.0.4896.160 Electron/18.3.5.4-b478491100 Safari/537.36 Channel/pckk_other_ch"); headers.put("Referer", "https://pan.quark.cn/"); - headers.put("Cookie", this.cookie); + headers.put("Cookie", cache.getUser().getCookie()); return headers; } @@ -180,6 +180,7 @@ public class QuarkApi { private boolean refreshAccessToken() { try { SpiderDebug.log("refreshCookie..."); + cookie=cache.getUser().getCookie(); if (cookie.isEmpty()) { SpiderDebug.log("cookie为空"); throw new RuntimeException("cookie为空"); @@ -553,12 +554,14 @@ public class QuarkApi { } private void startService(Map params) { + SpiderDebug.log("----startservice"); params.put("client_id", "532"); params.put("v", "1.2"); params.put("request_id", UUID.randomUUID().toString()); service = Executors.newScheduledThreadPool(1); service.scheduleWithFixedDelay(() -> { - String result = OkHttp.string("https://uop.quark.cn/cas/ajax/getServiceTicketByQrcodeToken", params, getHeaders()); + SpiderDebug.log("----scheduleAtFixedRate"+new Date().toString()); + String result = OkHttp.string("https://uop.quark.cn/cas/ajax/getServiceTicketByQrcodeToken", params, getWebHeaders()); Map>> json = new HashMap<>(); json = Json.parseSafe(result, json.getClass()); if (json.get("status").equals(2000000)) { @@ -566,7 +569,7 @@ public class QuarkApi { setToken(json.get("data").get("members").get("service_ticket")); } - }, 1, 1, TimeUnit.SECONDS); + }, 1, 1000, TimeUnit.MICROSECONDS); } private void setToken(String value) { diff --git a/app/src/main/java/com/github/catvod/debug/MainActivity.java b/app/src/main/java/com/github/catvod/debug/MainActivity.java index 0088d98d..95583f86 100644 --- a/app/src/main/java/com/github/catvod/debug/MainActivity.java +++ b/app/src/main/java/com/github/catvod/debug/MainActivity.java @@ -96,6 +96,7 @@ public class MainActivity extends Activity { public void detailContent() { try { Logger.t("detailContent").d(spider.detailContent(Arrays.asList("/voddetail/86346.html"))); + // Logger.t("detailContent").d(spider.detailContent(Arrays.asList("/voddetail/81612.html"))); } catch (Throwable e) { e.printStackTrace(); } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index a753dcd9..fc9406b9 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 21b36762..5026615a 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -e3c1389b4a5ec1a517e6da7f09c77c65 +9a30d3211410cfdfe473b3c76a77cf71 diff --git a/json/index.json b/json/index.json index edb3fbaf..042e9227 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;28aa6e38d4ab4f6cafec8b7c3c33b454", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;9a30d3211410cfdfe473b3c76a77cf71", "lives": [ { "name": "直播ipv6", diff --git a/json/index1.json b/json/index1.json index 7adb5e87..5f5b31ab 100644 --- a/json/index1.json +++ b/json/index1.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;28aa6e38d4ab4f6cafec8b7c3c33b454", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;9a30d3211410cfdfe473b3c76a77cf71", "lives": [ { "name": "直播ipv6", diff --git a/json/index2.json b/json/index2.json index e6f426a6..0364a959 100644 --- a/json/index2.json +++ b/json/index2.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;28aa6e38d4ab4f6cafec8b7c3c33b454", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;9a30d3211410cfdfe473b3c76a77cf71", "lives": [ { "name": "直播ipv6",