diff --git a/app/src/main/java/com/github/catvod/bean/jianpian/Data.java b/app/src/main/java/com/github/catvod/bean/jianpian/Data.java index 311ca270..0e0880ce 100644 --- a/app/src/main/java/com/github/catvod/bean/jianpian/Data.java +++ b/app/src/main/java/com/github/catvod/bean/jianpian/Data.java @@ -49,8 +49,8 @@ public class Data { return TextUtils.isEmpty(id) ? "" : id; } - public String getThumbnail() { - return TextUtils.isEmpty(thumbnail) ? "" : "http://img1.vbwus.com" + thumbnail; + public String getThumbnail(String imgDomain) { + return TextUtils.isEmpty(thumbnail) ? "" : "http://" + imgDomain + thumbnail; } public String getTitle() { @@ -97,12 +97,12 @@ public class Data { return dataList == null ? Collections.emptyList() : dataList; } - public Vod homeVod() { - return new Vod(getJumpId(), getTitle(), getThumbnail()); + public Vod homeVod(String imgDomain) { + return new Vod(getJumpId(), getTitle(), getThumbnail(imgDomain)); } - public Vod vod() { - return new Vod(getId(), getTitle(), getThumbnail(), getMask()); + public Vod vod(String imgDomain) { + return new Vod(getId(), getTitle(), getThumbnail(imgDomain), getMask()); } public String getValues(List items, boolean link) { 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 753f523e..c0376f59 100644 --- a/app/src/main/java/com/github/catvod/spider/Jianpian.java +++ b/app/src/main/java/com/github/catvod/spider/Jianpian.java @@ -11,6 +11,8 @@ import com.github.catvod.bean.jianpian.Resp; import com.github.catvod.bean.jianpian.Search; import com.github.catvod.crawler.Spider; import com.github.catvod.net.OkHttp; +import com.google.gson.Gson; +import com.google.gson.JsonObject; import com.google.gson.JsonParser; import java.net.URLEncoder; @@ -25,20 +27,23 @@ import java.util.Map; */ public class Jianpian extends Spider { - private final String siteUrl = "http://api.ubj83.com"; + private final String siteUrl = "https://ij1men.slsw6.com"; + private String imgDomain; private String extend; private Map getHeader() { Map headers = new HashMap<>(); - headers.put("user-agent", "Mozilla/5.0 (Linux; Android 11; Redmi K30 Pro Zoom Edition Build/RKQ1.200826.002; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/90.0.4430.210 Mobile Safari/537.36;webank/h5face;webank/1.0;netType:NETWORK_WIFI;appVersion:416;packageName:com.jp3.xg3"); - headers.put("accept", "application/json, text/plain, */*"); - headers.put("x-requested-with", "com.jp3.xg3"); + headers.put("User-Agent", "Mozilla/5.0 (Linux; Android 9; V2196A Build/PQ3A.190705.08211809; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/91.0.4472.114 Mobile Safari/537.36;webank/h5face;webank/1.0;netType:NETWORK_WIFI;appVersion:416;packageName:com.jp3.xg3"); + headers.put("Referer", siteUrl); return headers; } @Override public void init(Context context, String extend) throws Exception { this.extend = extend; + String json = OkHttp.string(siteUrl + "/api/appAuthConfig"); + JsonObject root = new Gson().fromJson(json, JsonObject.class); + imgDomain = root.getAsJsonObject("data").get("imgDomain").getAsString(); } @Override @@ -55,7 +60,7 @@ public class Jianpian extends Spider { List list = new ArrayList<>(); String url = siteUrl + "/api/slide/list?pos_id=88"; Resp resp = Resp.objectFrom(OkHttp.string(url, getHeader())); - for (Data data : resp.getData()) list.add(data.homeVod()); + for (Data data : resp.getData()) list.add(data.homeVod(imgDomain)); return Result.string(list); } @@ -66,7 +71,7 @@ public class Jianpian extends Spider { List list = new ArrayList<>(); String url = siteUrl + String.format("/api/dyTag/list?category_id=%s&page=%s", tid, pg); Resp resp = Resp.objectFrom(OkHttp.string(url, getHeader())); - for (Data data : resp.getData()) for (Data dataList : data.getDataList()) list.add(dataList.vod()); + for (Data data : resp.getData()) for (Data dataList : data.getDataList()) list.add(dataList.vod(imgDomain)); return Result.get().page().vod(list).string(); } else { List list = new ArrayList<>(); @@ -77,7 +82,7 @@ public class Jianpian extends Spider { String by = ext.get("by") == null ? "updata" : ext.get("by"); String url = siteUrl + String.format("/api/crumb/list?fcate_pid=%s&area=%s&year=%s&type=0&sort=%s&page=%s&category_id=", tid, area, year, by, pg); Resp resp = Resp.objectFrom(OkHttp.string(url, getHeader())); - for (Data data : resp.getData()) list.add(data.vod()); + for (Data data : resp.getData()) list.add(data.vod(imgDomain)); return Result.string(list); } } @@ -86,7 +91,7 @@ public class Jianpian extends Spider { public String detailContent(List ids) throws Exception { String url = siteUrl + "/api/video/detailv2?id=" + ids.get(0); Data data = Detail.objectFrom(OkHttp.string(url, getHeader())).getData(); - Vod vod = data.vod(); + Vod vod = data.vod(imgDomain); vod.setVodPlayFrom(data.getVodFrom()); vod.setVodYear(data.getYear()); vod.setVodArea(data.getArea()); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 68104336..b8c0ae3f 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 4aa9f5df..fdc50919 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -9e7a987849b03ef100fbda194930949a +07e6df236f80317ba92f601c9715fc40