diff --git a/app/src/main/java/com/github/catvod/bean/paper/Item.java b/app/src/main/java/com/github/catvod/bean/paper/Item.java deleted file mode 100644 index 3b3ee31..0000000 --- a/app/src/main/java/com/github/catvod/bean/paper/Item.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.github.catvod.bean.paper; - -import com.google.gson.Gson; -import com.google.gson.annotations.SerializedName; - -import java.util.List; - -public class Item { - - @SerializedName("data") - private List data; - - public static Item objectFrom(String str) { - return new Gson().fromJson(str, Item.class); - } - - public List getData() { - return data; - } -} diff --git a/app/src/main/java/com/github/catvod/spider/Paper.java b/app/src/main/java/com/github/catvod/spider/Paper.java index 73d3c5a..6035f94 100644 --- a/app/src/main/java/com/github/catvod/spider/Paper.java +++ b/app/src/main/java/com/github/catvod/spider/Paper.java @@ -29,7 +29,8 @@ import java.util.Map; */ public class Paper extends Spider { - private final String URL = "https://gitcafe.net/alipaper/"; + private final String url = "https://gitcafe.net/alipaper/"; + private final String api = "https://gitcafe.net/tool/alipaper/"; private List types; private Ali ali; @@ -47,7 +48,7 @@ public class Paper extends Spider { @Override public String homeContent(boolean filter) { - Document doc = Jsoup.parse(OkHttpUtil.string(URL, getHeaders())); + Document doc = Jsoup.parse(OkHttpUtil.string(url, getHeaders())); Elements trs = doc.select("table.tableizer-table > tbody > tr"); LinkedHashMap> filters = new LinkedHashMap<>(); List classes = new ArrayList<>(); @@ -71,7 +72,7 @@ public class Paper extends Spider { @Override public String homeVideoContent() throws Exception { List list = new ArrayList<>(); - JSONObject homeData = new JSONObject(OkHttpUtil.string(URL + "home.json", getHeaders())); + JSONObject homeData = new JSONObject(OkHttpUtil.string(url + "home.json", getHeaders())); List items = Data.arrayFrom(homeData.getJSONObject("info").getJSONArray("new").toString()); for (Data item : items) if (types.contains(item.getCat())) list.add(item.getVod()); return Result.string(list); @@ -85,7 +86,7 @@ public class Paper extends Spider { params.put("action", "viewcat"); params.put("cat", type); params.put("num", pg); - String result = OkHttpUtil.post("https://gitcafe.net/tool/alipaper/", params, getHeaders()); + String result = OkHttpUtil.post(api, params, getHeaders()); for (Data item : Data.arrayFrom(result)) list.add(item.getVod()); return Result.string(list); } @@ -101,7 +102,7 @@ public class Paper extends Spider { Map params = new HashMap<>(); params.put("action", "search"); params.put("keyword", key); - String result = OkHttpUtil.post("https://gitcafe.net/tool/alipaper/", params, getHeaders()); + String result = OkHttpUtil.post(api, params, getHeaders()); for (Data item : Data.arrayFrom(result)) if (types.contains(item.getCat()) && item.getTitle().contains(key)) list.add(item.getVod()); return Result.string(list); } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 6169801..4a6a211 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 26f3c70..16d281f 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -0e62ab2bdd71349180449eb724065dc9 +460ee32a20c159a8c25a0755d3a1fc19