diff --git a/app/src/main/java/com/github/catvod/debug/MainActivity.java b/app/src/main/java/com/github/catvod/debug/MainActivity.java index 457130c..ee69f6d 100644 --- a/app/src/main/java/com/github/catvod/debug/MainActivity.java +++ b/app/src/main/java/com/github/catvod/debug/MainActivity.java @@ -118,7 +118,7 @@ public class MainActivity extends Activity { public void playerContent() { try { - Logger.t("playerContent").d(spider.playerContent("轉存原畫", "121974-1-2.html", new ArrayList<>())); + Logger.t("playerContent").d(spider.playerContent("轉存原畫", "122512-1-0.html", new ArrayList<>())); } catch (Throwable e) { e.printStackTrace(); } diff --git a/app/src/main/java/com/github/catvod/spider/TvDy.java b/app/src/main/java/com/github/catvod/spider/TvDy.java index e067292..0549121 100644 --- a/app/src/main/java/com/github/catvod/spider/TvDy.java +++ b/app/src/main/java/com/github/catvod/spider/TvDy.java @@ -18,6 +18,7 @@ import java.util.HashMap; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import android.util.Base64; public class TvDy extends Spider { @@ -154,15 +155,18 @@ public class TvDy extends Spider { @Override public String playerContent(String flag, String id, List vipFlags) throws Exception { Document doc = Jsoup.parse(OkHttp.string(playUrl.concat(id), getHeaders())); - String regex = "now=base64decode(\"(.*?)\");"; + String regex = "var now=base64decode(.*?);var"; Pattern pattern = Pattern.compile(regex); Matcher matcher = pattern.matcher(doc.html()); - String url = ""; + String url = doc.html(); if (matcher.find()) { - url = matcher.group(1); - url = url; + url = decodeBase64(matcher.group(1).replace("(\\\"","").replace("\\\")","")); } return Result.get().url(url).header(getHeaders()).string(); } + + public static String decodeBase64(String encodedString) { + return new String(Base64.decode(encodedString, Base64.DEFAULT)); + } } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 9758663..2eec2fe 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 2457497..0aa8c86 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -a2e67333ec2a448a0ec16f708ede4f03 +4b13c299ed9dfca65bc775507a7d0118 diff --git a/json/index.json b/json/index.json index db8d449..2ea9681 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://mirror.ghproxy.com/https://github.com/bizhangjie/CatVodSpider/blob/main/jar/custom_spider.jar;md5;a2e67333ec2a448a0ec16f708ede4f03", + "spider": "https://mirror.ghproxy.com/https://github.com/bizhangjie/CatVodSpider/blob/main/jar/custom_spider.jar;md5;4b13c299ed9dfca65bc775507a7d0118", "lives": [ { "name": "直播ipv6",