diff --git a/app/src/main/java/com/github/catvod/api/SimpleCookieJar.java b/app/src/main/java/com/github/catvod/api/SimpleCookieJar.java index 8552fc51..19086432 100644 --- a/app/src/main/java/com/github/catvod/api/SimpleCookieJar.java +++ b/app/src/main/java/com/github/catvod/api/SimpleCookieJar.java @@ -9,9 +9,7 @@ import com.github.catvod.utils.Path; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import okhttp3.Cookie; -import okhttp3.CookieJar; -import okhttp3.HttpUrl; + import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; @@ -21,6 +19,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import okhttp3.Cookie; +import okhttp3.CookieJar; +import okhttp3.HttpUrl; + public class SimpleCookieJar implements CookieJar { private Map> cookieStore = new HashMap<>(); private final Cache cache; @@ -49,7 +51,8 @@ public class SimpleCookieJar implements CookieJar { @Override public void saveFromResponse(HttpUrl url, @NotNull List cookies) { - SpiderDebug.log("SimpleCookieJar saveFromResponse: " + url.host() + ": " + Json.toJson(cookies)); + SpiderDebug.log(" ====saveFromResponse url: " + url.host() + ": " + Json.toJson(cookies)); + SpiderDebug.log(" ====saveFromResponse cookie: " + Json.toJson(cookies)); // 创建可修改的 Cookie 列表副本 List oldCookies = cookieStore.get(url.host()) != null ? cookieStore.get(url.host()) : new ArrayList<>(); List newCookies = new ArrayList<>(oldCookies); @@ -67,7 +70,7 @@ public class SimpleCookieJar implements CookieJar { cookieStore.put(url.host(), oldCookies); cache.setTianyiUser(User.objectFrom(Json.toJson(cookieStore))); - SpiderDebug.log("SimpleCookieJar cookieStore: " + Json.toJson(cookieStore)); + SpiderDebug.log(" cookieStore now : " + Json.toJson(cookieStore)); } @@ -76,7 +79,8 @@ public class SimpleCookieJar implements CookieJar { var cookies = cookieStore.get(url.host()); - SpiderDebug.log(" SimpleCookieJar loadForRequest: " + url.host() + ": " + Json.toJson(cookies)); + SpiderDebug.log(" ===loadForRequest url : " + url); + SpiderDebug.log(" ===loadForRequest cookie: " + Json.toJson(cookies)); return cookies != null ? cookies : new ArrayList<>(); } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index f32d4e75..7af698f9 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 2a70dfcd..2a6caf51 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -3b36586b88952e9599f43fe755b4480f +f222d31f7e8fe5d6790793d3b19a2f6c diff --git a/json/index.json b/json/index.json index 2c1f55de..e069bf90 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;3b36586b88952e9599f43fe755b4480f", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;f222d31f7e8fe5d6790793d3b19a2f6c", "lives": [ { "name": "电视直播",