diff --git a/app/src/main/java/com/github/catvod/ali/API.java b/app/src/main/java/com/github/catvod/ali/API.java index b8bb6cec..806981d7 100644 --- a/app/src/main/java/com/github/catvod/ali/API.java +++ b/app/src/main/java/com/github/catvod/ali/API.java @@ -61,7 +61,7 @@ public class API { private API() { this.auth = new Auth(); - this.lock = new ReentrantLock(); + this.lock = new ReentrantLock(true); } public void setRefreshToken(String token) { diff --git a/app/src/main/java/com/github/catvod/spider/Push.java b/app/src/main/java/com/github/catvod/spider/Push.java index d978a4a5..f0d60f0b 100644 --- a/app/src/main/java/com/github/catvod/spider/Push.java +++ b/app/src/main/java/com/github/catvod/spider/Push.java @@ -14,12 +14,7 @@ public class Push extends Ali { public String detailContent(List ids) throws Exception { String url = ids.get(0).trim(); if (url.contains("aliyundrive")) return super.detailContent(ids); - List playFrom = Arrays.asList("直連", "嗅探", "解析"); - List playUrl = Arrays.asList("播放$" + url, "播放$" + url, "播放$" + url); - Vod vod = create(url); - vod.setVodPlayFrom(TextUtils.join("$$$", playFrom)); - vod.setVodPlayUrl(TextUtils.join("$$$", playUrl)); - return Result.string(vod); + return Result.string(vod(url)); } @Override @@ -30,12 +25,14 @@ public class Push extends Ali { return Result.get().url(id).string(); } - private Vod create(String url) { + private Vod vod(String url) { Vod vod = new Vod(); - vod.setTypeName("FongMi"); vod.setVodId(url); vod.setVodName(url); + vod.setTypeName("FongMi"); vod.setVodPic("https://pic.rmb.bdstatic.com/bjh/1d0b02d0f57f0a42201f92caba5107ed.jpeg"); + vod.setVodPlayFrom(TextUtils.join("$$$", Arrays.asList("直連", "嗅探", "解析"))); + vod.setVodPlayUrl(TextUtils.join("$$$", Arrays.asList("播放$" + url, "播放$" + url, "播放$" + url))); return vod; } } \ No newline at end of file diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index b8c7e9e0..56500298 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 ff15637a..313df122 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -dfb5901a5b7325e193395db4ae6541b4 +a8254c66a7166602df254825bfe78429 diff --git a/json/adult.json b/json/adult.json index 075c1d7d..c97f2073 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;dfb5901a5b7325e193395db4ae6541b4", + "spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;a8254c66a7166602df254825bfe78429", "wallpaper": "https://gao.chuqiuyu.tk", "lives": [ { diff --git a/json/config.json b/json/config.json index 0f42c7c7..01286647 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;dfb5901a5b7325e193395db4ae6541b4", + "spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;a8254c66a7166602df254825bfe78429", "wallpaper": "http://www.kf666888.cn/api/tvbox/img", "lives": [ {