diff --git a/app/src/main/java/com/github/catvod/demo/MainActivity.java b/app/src/main/java/com/github/catvod/demo/MainActivity.java index 61a98f45..2a3de8c1 100644 --- a/app/src/main/java/com/github/catvod/demo/MainActivity.java +++ b/app/src/main/java/com/github/catvod/demo/MainActivity.java @@ -12,7 +12,6 @@ public class MainActivity extends Activity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); new Thread(() -> { - }).start(); } } \ No newline at end of file diff --git a/app/src/main/java/com/github/catvod/spider/Dm84.java b/app/src/main/java/com/github/catvod/spider/Dm84.java index 47278a97..9f5eee11 100644 --- a/app/src/main/java/com/github/catvod/spider/Dm84.java +++ b/app/src/main/java/com/github/catvod/spider/Dm84.java @@ -16,6 +16,7 @@ import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; +import java.net.URLEncoder; import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; @@ -90,7 +91,7 @@ public class Dm84 extends Spider { if (extend.get("year") == null) extend.put("year", ""); if (extend.get("by") == null) extend.put("by", "time"); String by = extend.get("by"); - String type = Misc.encode(extend.get("type")); + String type = URLEncoder.encode(extend.get("type")); String year = extend.get("year"); String target = siteUrl + String.format("/show-%s--%s-%s--%s-%s.html", tid, by, type, year, pg); Document doc = Jsoup.parse(OkHttpUtil.string(target, getHeaders())); 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 59b3cb1a..31dac7c1 100644 --- a/app/src/main/java/com/github/catvod/spider/Paper.java +++ b/app/src/main/java/com/github/catvod/spider/Paper.java @@ -7,7 +7,6 @@ import com.github.catvod.bean.Filter; import com.github.catvod.bean.Result; import com.github.catvod.bean.Vod; import com.github.catvod.bean.paper.Data; -import com.github.catvod.bean.paper.Item; import com.github.catvod.crawler.Spider; import com.github.catvod.net.OkHttpUtil; import com.github.catvod.utils.Misc; @@ -23,14 +22,15 @@ import java.util.Arrays; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; /** * @author ColaMint & FongMi */ public class Paper extends Spider { + private final String URL = "https://gitcafe.net/alipaper/"; private List types; - private List all; private Ali ali; private HashMap getHeaders() { @@ -39,10 +39,6 @@ public class Paper extends Spider { return headers; } - private List getAll() { - return all = all != null ? all : Item.objectFrom(OkHttpUtil.string("https://gitcafe.net/alipaper/all.json", getHeaders())).getData(); - } - @Override public void init(Context context, String extend) { types = Arrays.asList("hyds", "rhds", "omds", "qtds", "hydy", "rhdy", "omdy", "qtdy", "hydm", "rhdm", "omdm", "jlp", "zyp", "jypx", "qtsp"); @@ -51,7 +47,7 @@ public class Paper extends Spider { @Override public String homeContent(boolean filter) { - Document doc = Jsoup.parse(OkHttpUtil.string("https://u.gitcafe.net/", 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<>(); @@ -75,7 +71,7 @@ public class Paper extends Spider { @Override public String homeVideoContent() throws Exception { List list = new ArrayList<>(); - JSONObject homeData = new JSONObject(OkHttpUtil.string("https://gitcafe.net/alipaper/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 +81,7 @@ public class Paper extends Spider { public String categoryContent(String tid, String pg, boolean filter, HashMap extend) { List list = new ArrayList<>(); String type = extend.containsKey("type") ? extend.get("type") : tid; - List items = Data.arrayFrom(OkHttpUtil.string("https://gitcafe.net/alipaper/data/" + type + ".json", getHeaders())); + List items = Data.arrayFrom(OkHttpUtil.string(URL + "data/" + type + ".json", getHeaders())); for (Data item : items) list.add(item.getVod()); return Result.string(list); } @@ -98,7 +94,11 @@ public class Paper extends Spider { @Override public String searchContent(String key, boolean quick) { List list = new ArrayList<>(); - for (Data item : getAll()) if (types.contains(item.getCat()) && item.getTitle().contains(key)) list.add(item.getVod()); + Map params = new HashMap<>(); + params.put("action", "search"); + params.put("keyword", key); + String result = OkHttpUtil.post("https://gitcafe.net/tool/alipaper/", 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/app/src/main/java/com/github/catvod/utils/Misc.java b/app/src/main/java/com/github/catvod/utils/Misc.java index 397ac2ad..1c00d33e 100644 --- a/app/src/main/java/com/github/catvod/utils/Misc.java +++ b/app/src/main/java/com/github/catvod/utils/Misc.java @@ -12,7 +12,6 @@ import org.json.JSONException; import org.json.JSONObject; import java.math.BigInteger; -import java.net.URLEncoder; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; @@ -129,14 +128,6 @@ public class Misc { return taskResult; } - public static String encode(String s) { - try { - return URLEncoder.encode(s, "UTF-8"); - } catch (Exception e) { - return ""; - } - } - public static String substring(String text) { return substring(text, 1); } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index e4a3a065..9bcdf607 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 c2029fbd..dc5f2866 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -dc15e22025ea87f5fdfad864e3b99529 +5c71cb0dd237522712e08afea49d8cf1