diff --git a/app/src/main/java/com/github/catvod/api/TianYiHandler.java b/app/src/main/java/com/github/catvod/api/TianYiHandler.java index 65eff4e3..4b165d3a 100644 --- a/app/src/main/java/com/github/catvod/api/TianYiHandler.java +++ b/app/src/main/java/com/github/catvod/api/TianYiHandler.java @@ -92,7 +92,7 @@ public class TianYiHandler { reqId = httpParams.queryParameter("reqId"); lt = httpParams.queryParameter("lt"); - Result result = appConf( this.cookie ); + Result result = appConf(this.cookie); // Step 1: Get UUID JsonObject uuidInfo = getUUID(); @@ -304,9 +304,12 @@ public class TianYiHandler { Map> okResult = OkHttp.getLocationHeader(redirectUrl, headers); SpiderDebug.log("扫码返回数据:" + Json.toJson(okResult)); if (okResult.containsKey("set-cookie")) { - List cookieList = getCookieList(okResult.get("set-cookie")); - cache.setTianyiUser(User.objectFrom(StringUtils.join(cookieList, ";"))); - SpiderDebug.log("获取cookie成功:" + StringUtils.join(cookieList, ";")); + getCookieMap(okResult.get("Set-Cookie")); + this.cookie = mapToCookie(cookieMap); + SpiderDebug.log("cookie: " + this.cookie); + + cache.setTianyiUser(User.objectFrom(cookie)); + SpiderDebug.log("获取cookie成功:" + cookie); //停止检验线程,关闭弹窗 stopService(); } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 44b864f8..21a8cdba 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 fac7ff59..de9944d1 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -d715e5e826c2486acbaa6a33ad974d9e +c528cb0f706f525c47bacc4b99265068 diff --git a/json/index.json b/json/index.json index e484da36..fcb07bce 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;d715e5e826c2486acbaa6a33ad974d9e", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;c528cb0f706f525c47bacc4b99265068", "lives": [ { "name": "电视直播", diff --git a/json/index1.json b/json/index1.json index 241050aa..aff2b97f 100644 --- a/json/index1.json +++ b/json/index1.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;d715e5e826c2486acbaa6a33ad974d9e", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;c528cb0f706f525c47bacc4b99265068", "lives": [ { "name": "直播ipv6", diff --git a/json/index2.json b/json/index2.json index 5111f67b..3e485806 100644 --- a/json/index2.json +++ b/json/index2.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;d715e5e826c2486acbaa6a33ad974d9e", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;c528cb0f706f525c47bacc4b99265068", "lives": [ { "name": "直播ipv6", diff --git a/json/test.json b/json/test.json index 70cb81d6..d047e97d 100644 --- a/json/test.json +++ b/json/test.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;d715e5e826c2486acbaa6a33ad974d9e", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;c528cb0f706f525c47bacc4b99265068", "lives": [ { "name": "直播",