diff --git a/app/src/main/java/com/github/catvod/api/TianyiApi.java b/app/src/main/java/com/github/catvod/api/TianyiApi.java index d301e97d..2b3628f7 100644 --- a/app/src/main/java/com/github/catvod/api/TianyiApi.java +++ b/app/src/main/java/com/github/catvod/api/TianyiApi.java @@ -9,15 +9,14 @@ import com.github.catvod.crawler.SpiderDebug; import com.github.catvod.net.OkHttpWithCookie; import com.github.catvod.net.OkResult; import com.github.catvod.spider.Init; -import com.github.catvod.spider.Proxy; import com.github.catvod.utils.*; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import okhttp3.Cookie; import org.apache.commons.lang3.StringUtils; import java.io.File; -import java.nio.charset.Charset; import java.util.*; import java.util.concurrent.ScheduledExecutorService; import java.util.regex.Matcher; @@ -140,14 +139,17 @@ public class TianyiApi { Map header = getHeaders(); header.remove("Host"); header.remove("Content-Type"); + List cookies = new ArrayList<>(); + for (String s : tianYiHandler.getCookieJar().getCookieStore().keySet()) { + for (Cookie cookie : tianYiHandler.getCookieJar().getCookieStore().get(s)) { + cookies.add(cookie.name() + "=" + cookie.value()); + } + } + header.put("Cookie", TextUtils.join(";", cookies)); return Result.get().url(ProxyVideo.buildCommonProxyUrl(playUrl, header)).octet().header(header).string(); } - private String proxyVideoUrl(String url, Map header) { - return String.format(Proxy.getUrl() + "?do=quark&type=video&url=%s&header=%s", Util.base64Encode(url.getBytes(Charset.defaultCharset())), Util.base64Encode(Json.toJson(header).getBytes(Charset.defaultCharset()))); - } - /** * @param url * @param params get 参数 diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index db637ee3..ff54bb82 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 19d5928c..64717c53 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -5da083c7c4fc601b94e45e6f9e0a2172 +65b5c5c84143ee6a6b8a46d75b0d132f diff --git a/json/index.json b/json/index.json index 7f26d7f1..5e25e91a 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://raw.kkgithub.com/lushunming/AndroidCatVodSpider/tyCookieJar/jar/custom_spider.jar;md5;5da083c7c4fc601b94e45e6f9e0a2172", + "spider": "https://raw.kkgithub.com/lushunming/AndroidCatVodSpider/tyCookieJar/jar/custom_spider.jar;md5;65b5c5c84143ee6a6b8a46d75b0d132f", "lives": [ { "name": "电视直播",