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 ee69f6d..469b7ee 100644 --- a/app/src/main/java/com/github/catvod/debug/MainActivity.java +++ b/app/src/main/java/com/github/catvod/debug/MainActivity.java @@ -76,7 +76,7 @@ public class MainActivity extends Activity { private void initSpider() { try { Init.init(getApplicationContext()); - spider = new TvDy(); + spider = new MiMei(); spider.init(this, ""); } catch (Throwable e) { e.printStackTrace(); @@ -102,7 +102,7 @@ public class MainActivity extends Activity { public void categoryContent(){ try { - Logger.t("categoryContent").d(spider.categoryContent("4", "2", true, new HashMap<>())); + Logger.t("categoryContent").d(spider.categoryContent("/", "2", true, new HashMap<>())); } catch (Throwable e) { e.printStackTrace(); } @@ -110,7 +110,7 @@ public class MainActivity extends Activity { public void detailContent() { try { - Logger.t("detailContent").d(spider.detailContent(Arrays.asList("index122512.html"))); + Logger.t("detailContent").d(spider.detailContent(Arrays.asList("702641.html"))); } catch (Throwable e) { e.printStackTrace(); } diff --git a/app/src/main/java/com/github/catvod/spider/MiMei.java b/app/src/main/java/com/github/catvod/spider/MiMei.java index 1833ff0..03d4c09 100644 --- a/app/src/main/java/com/github/catvod/spider/MiMei.java +++ b/app/src/main/java/com/github/catvod/spider/MiMei.java @@ -26,7 +26,7 @@ import java.util.regex.Pattern; public class MiMei extends Spider { - private static final String siteUrl = "https://uwvrajs.info"; + private static final String siteUrl = "https://tbvioih.info"; private static final String cateUrl = siteUrl; private static final String detailUrl = siteUrl; private static final String searchUrl = "https://api.3bmmjla.life/Api/getSearch"; diff --git a/app/src/main/java/com/github/catvod/spider/WWRR.java b/app/src/main/java/com/github/catvod/spider/WWRR.java index 3da2bd4..95f82b8 100644 --- a/app/src/main/java/com/github/catvod/spider/WWRR.java +++ b/app/src/main/java/com/github/catvod/spider/WWRR.java @@ -26,9 +26,9 @@ import java.util.zip.Inflater; public class WWRR extends Spider { private static final String siteUrl = "https://hd.6nu2.com"; - private static final String cateUrl = siteUrl + "/index.php/home/index/"; - private static final String detailUrl = siteUrl + "/index.php/play/"; - private static final String searchUrl = siteUrl + "/index.php/search/video/"; + private static final String cateUrl = siteUrl + "/home/"; + private static final String detailUrl = siteUrl + "/play/"; + private static final String searchUrl = siteUrl + "/search/video/"; private HashMap getHeaders() { HashMap headers = new HashMap<>(); @@ -41,17 +41,16 @@ public class WWRR extends Spider { List list = new ArrayList<>(); List classes = new ArrayList<>(); Document doc = Jsoup.parse(OkHttp.string(siteUrl, getHeaders())); - for (Element element : doc.select("div.div_ad_a a")) { - String typeId = element.attr("href").replace("/index.php/home/index/","").replace(".html",""); - String typeName = element.text(); - classes.add(new Class(typeId, typeName)); + String[] typeIdList = {"/"}; + String[] typeNameList = {"全部"}; + for (int i = 0; i < typeNameList.length; i++) { + classes.add(new Class(typeIdList[i], typeNameList[i])); } - doc = Jsoup.parse(OkHttp.string(siteUrl, getHeaders())); for (Element element : doc.select("div.listA a")) { String pic = element.select("img").attr("src"); String url = element.attr("href"); - String name = element.select("div.name").text().replace("2048.cc-",""); - String id = url.split("/")[3]; + String name = element.select("div.name").text(); + String id = url.split("/")[2]; list.add(new Vod(id, name, pic)); } return Result.string(classes, list); @@ -66,8 +65,8 @@ public class WWRR extends Spider { for (Element element : doc.select("div.listA a")) { String pic = element.select("img").attr("src"); String url = element.attr("href"); - String name = element.select("div.name").text().replace("2048.cc-",""); - String id = url.split("/")[3]; + String name = element.select("div.name").text(); + String id = url.split("/")[2]; list.add(new Vod(id, name, pic)); } Integer total = (Integer.parseInt(pg)+1)*20; @@ -80,7 +79,7 @@ public class WWRR extends Spider { String name = doc.select("div.name.WF").text().replace("2048.cc-",""); String pic = doc.select("div.vjs-poster img").attr("src"); - Pattern pattern = Pattern.compile("abcd = '(.*?)';"); + Pattern pattern = Pattern.compile("vodurl = '(.*?)';"); Matcher matcher = pattern.matcher(doc.html()); String PlayUrl = ""; // 提取匹配到的内容 @@ -113,8 +112,8 @@ public class WWRR extends Spider { for (Element element : doc.select("div.listA a")) { String pic = element.select("img").attr("src"); String url = element.attr("href"); - String name = element.select("div.name").text().replace("2048.cc-",""); - String id = url.split("/")[3]; + String name = element.select("div.name").text(); + String id = url.split("/")[2]; list.add(new Vod(id, name, pic)); } return Result.string(list); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 2eec2fe..d91bc24 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 0aa8c86..a356d5d 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -4b13c299ed9dfca65bc775507a7d0118 +0e330f0d417a43f2b29bb7c24fadc161 diff --git a/json/index.json b/json/index.json index 2ea9681..26fbaa3 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;4b13c299ed9dfca65bc775507a7d0118", + "spider": "https://mirror.ghproxy.com/https://github.com/bizhangjie/CatVodSpider/blob/main/jar/custom_spider.jar;md5;0e330f0d417a43f2b29bb7c24fadc161", "lives": [ { "name": "直播ipv6", diff --git a/json/index18.json b/json/index18.json index 083fbd0..1512985 100644 --- a/json/index18.json +++ b/json/index18.json @@ -1,5 +1,5 @@ { - "spider": "https://mirror.ghproxy.com/https://github.com/bizhangjie/CatVodSpider/blob/main/jar/custom_spider.jar;md5;4b13c299ed9dfca65bc775507a7d0118", + "spider": "https://mirror.ghproxy.com/https://github.com/bizhangjie/CatVodSpider/blob/main/jar/custom_spider.jar;md5;0e330f0d417a43f2b29bb7c24fadc161", "lives": [ { "name": "直播ipv6", @@ -27,14 +27,6 @@ "searchable": 1, "filterable": 1 }, - { - "key": "Jable", - "name": "\uD83D\uDD1E Jable | 科学", - "type": 3, - "api": "csp_Jable", - "searchable": 1, - "filterable": 1 - }, { "key": "J91", "name": "\uD83D\uDD1E 91 | 珍惜", @@ -67,14 +59,6 @@ "searchable": 1, "filterable": 1 }, - { - "key": "RouVideo", - "name": "\uD83D\uDD1E 肉视频 | 科学", - "type": 3, - "api": "csp_RouVideo", - "searchable": 1, - "filterable": 1 - }, { "key": "ROU223", "name": "\uD83D\uDD1E 223ROU | 视频", @@ -99,6 +83,22 @@ "searchable": 1, "filterable": 1 }, + { + "key": "RouVideo", + "name": "\uD83D\uDD1E 肉视频 | 科学", + "type": 3, + "api": "csp_RouVideo", + "searchable": 1, + "filterable": 1 + }, + { + "key": "Jable", + "name": "\uD83D\uDD1E Jable | 科学", + "type": 3, + "api": "csp_Jable", + "searchable": 1, + "filterable": 1 + }, { "key": "*博天堂", "name": "🔞博天堂",