diff --git a/app/src/main/java/com/github/catvod/spider/Jianpian.java b/app/src/main/java/com/github/catvod/spider/Jianpian.java index c98d3ec7..13cb2878 100644 --- a/app/src/main/java/com/github/catvod/spider/Jianpian.java +++ b/app/src/main/java/com/github/catvod/spider/Jianpian.java @@ -59,22 +59,18 @@ public class Jianpian extends Spider { @Override public String categoryContent(String tid, String pg, boolean filter, HashMap extend) throws Exception { - if (tid.endsWith("/{pg}")) { - String[] splits = tid.split("/"); - return searchContent(splits[0], pg); - } else { - List list = new ArrayList<>(); - HashMap ext = new HashMap<>(); - if (extend != null && extend.size() > 0) ext.putAll(extend); - String cateId = ext.get("cateId") == null ? tid : ext.get("cateId"); - String area = ext.get("area") == null ? "0" : ext.get("area"); - String year = ext.get("year") == null ? "0" : ext.get("year"); - String by = ext.get("by") == null ? "hot" : ext.get("by"); - String url = siteUrl + String.format("/api/crumb/list?area=%s&category_id=%s&page=%s&type=0&limit=24&sort=%s&year=%s", area, cateId, pg, by, year); - Resp resp = Resp.objectFrom(OkHttp.string(url, getHeader())); - for (Data data : resp.getData()) list.add(data.vod()); - return Result.string(list); - } + if (tid.endsWith("/{pg}")) return searchContent(tid.split("/")[0], pg); + List list = new ArrayList<>(); + HashMap ext = new HashMap<>(); + if (extend != null && extend.size() > 0) ext.putAll(extend); + String cateId = ext.get("cateId") == null ? tid : ext.get("cateId"); + String area = ext.get("area") == null ? "0" : ext.get("area"); + String year = ext.get("year") == null ? "0" : ext.get("year"); + String by = ext.get("by") == null ? "hot" : ext.get("by"); + String url = siteUrl + String.format("/api/crumb/list?area=%s&category_id=%s&page=%s&type=0&limit=24&sort=%s&year=%s", area, cateId, pg, by, year); + Resp resp = Resp.objectFrom(OkHttp.string(url, getHeader())); + for (Data data : resp.getData()) list.add(data.vod()); + return Result.string(list); } @Override diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 84ebd9cc..96c87894 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 cf8de862..21cc40db 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -440a3457a41af7c5800d6b5c7e8ef350 +f4bb4cabaaac07b29a5b1a705a76ce33