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 d7925b15..82407f4a 100644 --- a/app/src/main/java/com/github/catvod/api/UCApi.java +++ b/app/src/main/java/com/github/catvod/api/UCApi.java @@ -87,7 +87,7 @@ public class UCApi { cache = Cache.objectFrom(Path.read(getCache())); tokenCache = Cache.objectFrom(Path.read(qrCodeHandler.getCache())); - this.cookieToken = tokenCache.getUser().getToken(); + this.cookieToken = tokenCache.getUser().getCookie(); SpiderDebug.log("UC初始化获取到的cookieToken: " + cookieToken); } diff --git a/app/src/main/java/com/github/catvod/bean/uc/Cache.java b/app/src/main/java/com/github/catvod/bean/uc/Cache.java index 59c880c9..60476b63 100644 --- a/app/src/main/java/com/github/catvod/bean/uc/Cache.java +++ b/app/src/main/java/com/github/catvod/bean/uc/Cache.java @@ -2,6 +2,7 @@ package com.github.catvod.bean.uc; import com.github.catvod.api.UCApi; import com.github.catvod.api.UCTokenHandler; +import com.github.catvod.crawler.SpiderDebug; import com.github.catvod.spider.Init; import com.github.catvod.utils.Path; import com.google.gson.Gson; @@ -14,6 +15,7 @@ public class Cache { public static Cache objectFrom(String str) { + SpiderDebug.log("Cache.objectFrom: " + str); Cache item = new Gson().fromJson(str, Cache.class); return item == null ? new Cache() : item; } diff --git a/app/src/main/java/com/github/catvod/bean/uc/User.java b/app/src/main/java/com/github/catvod/bean/uc/User.java index 0fdb0781..01078bc5 100644 --- a/app/src/main/java/com/github/catvod/bean/uc/User.java +++ b/app/src/main/java/com/github/catvod/bean/uc/User.java @@ -9,16 +9,9 @@ public class User { @SerializedName("cookie") private String cookie; - @SerializedName("token") - private String token; - public String getToken() { - return token; - } - public void setToken(String token) { - this.token = token; - } + public String getCookie() { return cookie; diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 89031308..b96d8f01 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 05107c28..3a654d95 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -74ead8dd5a2d9e0c86d838ea7a99fd86 +c43b84fbcffcaa6a1b0bea6134088001 diff --git a/json/index.json b/json/index.json index d4bd2018..5c09fc9f 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;74ead8dd5a2d9e0c86d838ea7a99fd86", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;c43b84fbcffcaa6a1b0bea6134088001", "lives": [ { diff --git a/json/index1.json b/json/index1.json index 24fabc99..0f8c2c66 100644 --- a/json/index1.json +++ b/json/index1.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;74ead8dd5a2d9e0c86d838ea7a99fd86", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;c43b84fbcffcaa6a1b0bea6134088001", "lives": [ { "name": "直播ipv6", diff --git a/json/index2.json b/json/index2.json index f807e412..a5930625 100644 --- a/json/index2.json +++ b/json/index2.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;74ead8dd5a2d9e0c86d838ea7a99fd86", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;c43b84fbcffcaa6a1b0bea6134088001", "lives": [ { "name": "直播ipv6", diff --git a/json/test.json b/json/test.json index b12a224d..7f606c38 100644 --- a/json/test.json +++ b/json/test.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;74ead8dd5a2d9e0c86d838ea7a99fd86", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;c43b84fbcffcaa6a1b0bea6134088001", "lives": [ { "name": "直播",