Merge remote-tracking branch 'origin/main'

# Conflicts:
#	jar/custom_spider.jar
#	jar/custom_spider.jar.md5
This commit is contained in:
dukun 2023-02-05 13:51:49 +08:00
commit ed6c5fdeb0
5 changed files with 801 additions and 685 deletions

View File

@ -25,7 +25,7 @@ import java.util.Map;
public class Ying extends Spider { public class Ying extends Spider {
private static final String siteUrl = "https://www.yhdmp.cc"; private static final String siteUrl = "https://www.yhpdm.com";
private static final String listUrl = siteUrl + "/list/"; private static final String listUrl = siteUrl + "/list/";
private static final String showUrl = siteUrl + "/showp/"; private static final String showUrl = siteUrl + "/showp/";
private static final String filterUrl = "https://www.xmfans.me/yxsf/js/yx_catalog.js"; private static final String filterUrl = "https://www.xmfans.me/yxsf/js/yx_catalog.js";

View File

@ -1,5 +1,5 @@
{ {
"spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;4971e3aee0e802323001771e44bb1a87", "spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;e5b681f675bb3bde7f94196f60235829",
"wallpaper": "https://gao.chuqiuyu.tk", "wallpaper": "https://gao.chuqiuyu.tk",
"lives": [ "lives": [
{ {

View File

@ -1,5 +1,5 @@
{ {
"spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;4971e3aee0e802323001771e44bb1a87", "spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;e5b681f675bb3bde7f94196f60235829",
"wallpaper": "http://www.kf666888.cn/api/tvbox/img", "wallpaper": "http://www.kf666888.cn/api/tvbox/img",
"lives": [ "lives": [
{ {

File diff suppressed because it is too large Load Diff

View File

@ -44,6 +44,7 @@ public class Run {
Group group = groups.get(groups.size() - 1); Group group = groups.get(groups.size() - 1);
String name = split[0]; String name = split[0];
String url = split[1].trim(); String url = split[1].trim();
if (url.startsWith("http://txtest")) url = url.replace("http://txtest", "http://121.51.249.6/txtest");
group.find(Channel.create().name(name).epg(name)).addUrls(url.split("#")); group.find(Channel.create().name(name).epg(name)).addUrls(url.split("#"));
} }
} }