diff --git a/app/src/main/java/com/github/catvod/spider/Ali.java b/app/src/main/java/com/github/catvod/spider/Ali.java index 5d954339..f3fbd889 100644 --- a/app/src/main/java/com/github/catvod/spider/Ali.java +++ b/app/src/main/java/com/github/catvod/spider/Ali.java @@ -40,7 +40,7 @@ import java.util.regex.Pattern; */ public class Ali { - private final Pattern pattern = Pattern.compile("www.aliyundrive.com/s/([^/]+)(/folder/([^/]+))?"); + public static final Pattern pattern = Pattern.compile("www.aliyundrive.com/s/([^/]+)(/folder/([^/]+))?"); private ScheduledExecutorService service; private final Auth auth; diff --git a/app/src/main/java/com/github/catvod/spider/PanSou.java b/app/src/main/java/com/github/catvod/spider/PanSou.java index 6a811a81..834ab110 100644 --- a/app/src/main/java/com/github/catvod/spider/PanSou.java +++ b/app/src/main/java/com/github/catvod/spider/PanSou.java @@ -41,6 +41,7 @@ public class PanSou extends Spider { @Override public String detailContent(List ids) throws Exception { + if (Ali.pattern.matcher(ids.get(0)).find()) return Ali.get().detailContent(ids); String url = siteUrl + ids.get(0).replace("/s/", "/cv/"); Map> respHeaders = new HashMap<>(); OkHttp.stringNoRedirect(url, getHeaders(ids.get(0)), respHeaders); diff --git a/app/src/main/java/com/github/catvod/spider/Zhaozy.java b/app/src/main/java/com/github/catvod/spider/Zhaozy.java index 9aabca9a..163023e8 100644 --- a/app/src/main/java/com/github/catvod/spider/Zhaozy.java +++ b/app/src/main/java/com/github/catvod/spider/Zhaozy.java @@ -14,6 +14,7 @@ import org.jsoup.nodes.Element; import java.net.URLEncoder; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -25,6 +26,8 @@ public class Zhaozy extends Spider { private final Pattern regexAli = Pattern.compile("(https://www.aliyundrive.com/s/[^\"]+)"); private final Pattern regexVid = Pattern.compile("(\\S+)"); private final String siteUrl = "https://zhaoziyuan.la/"; + private String username = "nikalo8893@bitvoo.com"; + private String password = "P@ssw0rd"; private Map getHeader() { Map headers = new HashMap<>(); @@ -36,8 +39,8 @@ public class Zhaozy extends Spider { private String getCookie() { Map params = new HashMap<>(); - params.put("username", "nikalo8893@bitvoo.com"); - params.put("password", "P@ssw0rd"); + params.put("username", username); + params.put("password", password); Map headers = new HashMap<>(); headers.put("User-Agent", Misc.CHROME); headers.put("Referer", siteUrl + "login.html"); @@ -51,15 +54,20 @@ public class Zhaozy extends Spider { @Override public void init(Context context, String extend) { - Ali.get().init(extend); + String[] split = extend.split("\\$\\$\\$"); + Ali.get().init(split[0]); + if (split.length > 2) { + username = split[1]; + password = split[2]; + } } @Override public String detailContent(List ids) throws Exception { + if (Ali.pattern.matcher(ids.get(0)).find()) return Ali.get().detailContent(ids); Matcher matcher = regexAli.matcher(OkHttp.string(siteUrl + ids.get(0), getHeader())); - if (!matcher.find()) return ""; - ids.set(0, matcher.group(1)); - return Ali.get().detailContent(ids); + if (matcher.find()) return Ali.get().detailContent(Arrays.asList(matcher.group(1))); + return ""; } @Override diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 109c2ad0..7892eeaa 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 dd7c88d3..345ca8c0 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -a84fef826cb82da525469e8acf1e7d9a +d5d77424e72a6ade93621611b1114875 diff --git a/json/adult.json b/json/adult.json index 7b671c41..f781a0c7 100644 --- a/json/adult.json +++ b/json/adult.json @@ -1,5 +1,5 @@ { - "spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;a84fef826cb82da525469e8acf1e7d9a", + "spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;35197828e17d4bdf2e5ad4b91e5f2071", "wallpaper": "https://gao.chuqiuyu.tk", "lives": [ { diff --git a/json/config.json b/json/config.json index b7395283..444f0bf3 100644 --- a/json/config.json +++ b/json/config.json @@ -1,5 +1,5 @@ { - "spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;a84fef826cb82da525469e8acf1e7d9a", + "spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;35197828e17d4bdf2e5ad4b91e5f2071", "wallpaper": "http://www.kf666888.cn/api/tvbox/img", "lives": [ {