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 565f6346..65eff4e3 100644 --- a/app/src/main/java/com/github/catvod/api/TianYiHandler.java +++ b/app/src/main/java/com/github/catvod/api/TianYiHandler.java @@ -73,9 +73,9 @@ public class TianYiHandler { public byte[] startScan() throws Exception { OkResult okResult1 = OkHttp.get("https://ux.21cn.com/api/htmlReportRest/getJs.js?pid=25577E0DEEDF48ADBD4459911F5825E4", new HashMap<>(), new HashMap<>()); - List cookie = okResult1.getResp().get("Set-Cookie"); - List cookieList = getCookieList(cookie); - //String firstCookie = StringUtils.join(cookieList, ";"); + + getCookieMap(okResult1.getResp().get("Set-Cookie")); + this.cookie = mapToCookie(cookieMap); SpiderDebug.log("index ori: " + "https://cloud.189.cn/api/portal/loginUrl.action?redirectURL=https%3A%2F%2Fcloud.189.cn%2Fweb%2Fredirect.html&defaultSaveName=3&defaultSaveNameCheck=uncheck&browserId=dff95dced0b03d9d972d920f03ddd05e"); String index = OkHttp.getLocation("https://cloud.189.cn/api/portal/loginUrl.action?redirectURL=https://cloud.189.cn/web/redirect.html&defaultSaveName=3&defaultSaveNameCheck=uncheck&browserId=8d38da4344fba4699d13d6e6854319d7", Map.of("Cookie", "")); SpiderDebug.log("index red: " + index); @@ -83,17 +83,16 @@ public class TianYiHandler { indexUrl = resHeaderMap.get("Location").get(0); SpiderDebug.log("indexUrl red: " + indexUrl); - cookieList.clear(); - cookieList = getCookieList(resHeaderMap.get("Set-Cookie")); - String secondCookie = StringUtils.join(cookieList, ";"); - SpiderDebug.log("secondCookie: " + secondCookie); + getCookieMap(resHeaderMap.get("Set-Cookie")); + this.cookie = mapToCookie(cookieMap); + SpiderDebug.log("secondCookie: " + cookie); HttpUrl httpParams = HttpUrl.parse(indexUrl); reqId = httpParams.queryParameter("reqId"); lt = httpParams.queryParameter("lt"); - Result result = appConf(secondCookie); + Result result = appConf( this.cookie ); // Step 1: Get UUID JsonObject uuidInfo = getUUID(); @@ -102,12 +101,12 @@ public class TianYiHandler { String encodeuuid = uuidInfo.get("encodeuuid").getAsString(); // Step 2: Get QR Code - byte[] byteStr = downloadQRCode(encodeuuid, reqId, secondCookie); + byte[] byteStr = downloadQRCode(encodeuuid, reqId, cookie); Init.run(() -> showQRCode(byteStr)); // Step 3: Check login status // return - Init.execute(() -> startService(uuid, encryuuid, reqId, lt, result.paramId, result.returnUrl, secondCookie)); + Init.execute(() -> startService(uuid, encryuuid, reqId, lt, result.paramId, result.returnUrl, cookie)); /*Map result = new HashMap<>(); result.put("qrcode", "data:image/png;base64," + qrCode); result.put("status", "NEW");*/ diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 751328d7..44b864f8 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 38f46e16..fac7ff59 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -562a866240c79b822b73f1673e4c27a4 +d715e5e826c2486acbaa6a33ad974d9e diff --git a/json/index.json b/json/index.json index e3c9cd92..e484da36 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;562a866240c79b822b73f1673e4c27a4", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;d715e5e826c2486acbaa6a33ad974d9e", "lives": [ { "name": "电视直播", diff --git a/json/index1.json b/json/index1.json index 745e509f..241050aa 100644 --- a/json/index1.json +++ b/json/index1.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;562a866240c79b822b73f1673e4c27a4", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;d715e5e826c2486acbaa6a33ad974d9e", "lives": [ { "name": "直播ipv6", diff --git a/json/index2.json b/json/index2.json index 9c65ac06..5111f67b 100644 --- a/json/index2.json +++ b/json/index2.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;562a866240c79b822b73f1673e4c27a4", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;d715e5e826c2486acbaa6a33ad974d9e", "lives": [ { "name": "直播ipv6", diff --git a/json/test.json b/json/test.json index 454097b9..70cb81d6 100644 --- a/json/test.json +++ b/json/test.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;562a866240c79b822b73f1673e4c27a4", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;d715e5e826c2486acbaa6a33ad974d9e", "lives": [ { "name": "直播",