diff --git a/app/src/main/java/com/github/catvod/spider/Wogg.java b/app/src/main/java/com/github/catvod/spider/Wogg.java index a948960e..babdff8d 100644 --- a/app/src/main/java/com/github/catvod/spider/Wogg.java +++ b/app/src/main/java/com/github/catvod/spider/Wogg.java @@ -7,6 +7,7 @@ import com.github.catvod.bean.Result; import com.github.catvod.bean.Vod; import com.github.catvod.net.OkHttp; import com.github.catvod.utils.Utils; +import com.google.gson.JsonObject; import com.google.gson.JsonParser; import org.jsoup.Jsoup; @@ -31,7 +32,7 @@ public class Wogg extends Ali { private final Pattern regexCategory = Pattern.compile("/vodtype/(\\w+).html"); private final Pattern regexPageTotal = Pattern.compile("\\$\\(\"\\.mac_total\"\\)\\.text\\('(\\d+)'\\);"); - private String extend; + private JsonObject extend; private Map getHeader() { Map header = new HashMap<>(); @@ -41,7 +42,8 @@ public class Wogg extends Ali { @Override public void init(Context context, String extend) { - this.extend = extend; + this.extend = JsonParser.parseString(extend).getAsJsonObject(); + super.init(context, this.extend.get("token").getAsString()); } @Override @@ -55,7 +57,7 @@ public class Wogg extends Ali { classes.add(new Class(mather.group(1), e.text().trim())); } } - return Result.string(classes, this.parseVodListFromDoc(doc), filter ? JsonParser.parseString(OkHttp.string(extend)) : null); + return Result.string(classes, this.parseVodListFromDoc(doc), filter ? JsonParser.parseString(OkHttp.string(extend.get("filter").getAsString())) : null); } @Override diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 30242d23..0ef0a672 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 1306f0a9..7769a806 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -c26c95caec7c651a9e6695d5ce87779d +9e8936dde999e4d940b8a4db7aca0561 diff --git a/json/adult.json b/json/adult.json index 5129cb02..bdf46e4c 100644 --- a/json/adult.json +++ b/json/adult.json @@ -1,5 +1,5 @@ { - "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;c26c95caec7c651a9e6695d5ce87779d", + "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;9e8936dde999e4d940b8a4db7aca0561", "wallpaper": "https://gao.chuqiuyu.tk", "sites": [ { diff --git a/json/config.json b/json/config.json index c04eb3c2..01214891 100644 --- a/json/config.json +++ b/json/config.json @@ -1,5 +1,5 @@ { - "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;c26c95caec7c651a9e6695d5ce87779d", + "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;9e8936dde999e4d940b8a4db7aca0561", "wallpaper": "http://饭太硬.top/深色壁纸/api.php", "sites": [ { @@ -72,7 +72,10 @@ "api": "csp_Wogg", "searchable": 1, "changeable": 0, - "ext": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/json/wogg.json" + "ext": { + "token": "影視天下第一", + "filter": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/json/wogg.json" + } }, { "key": "星星",