Bili use wbi

app/src/main/java/com/github/catvod/bean/bili/Wbi.java

@@ -33,15 +33,15 @@ public class Wbi {
         return key.toString();
     }
 
-    public String getParam(LinkedHashMap<String, Object> params) {
+    public String getQuery(LinkedHashMap<String, Object> params) {
         String imgKey = Uri.parse(getImgUrl()).getLastPathSegment().split("\\.")[0];
         String subKey = Uri.parse(getSubUrl()).getLastPathSegment().split("\\.")[0];
         String mixinKey = getMixinKey(imgKey, subKey);
         StringBuilder sb = new StringBuilder();
         params.put("wts", System.currentTimeMillis() / 1000);
         for (String key : params.keySet()) sb.append(key).append("=").append(URLEncoder.encode(params.get(key).toString())).append("&");
-        String param = Util.substring(sb.toString());
-        String wbiSign = Util.MD5(param + mixinKey);
-        return param + "&w_rid=" + wbiSign;
+        String query = Util.substring(sb.toString());
+        String w_rid = Util.MD5(query + mixinKey);
+        return query + "&w_rid=" + w_rid;
     }
 }

app/src/main/java/com/github/catvod/spider/Bili.java

@@ -13,6 +13,7 @@ import com.github.catvod.bean.bili.Data;
 import com.github.catvod.bean.bili.Media;
 import com.github.catvod.bean.bili.Page;
 import com.github.catvod.bean.bili.Resp;
+import com.github.catvod.bean.bili.Wbi;
 import com.github.catvod.crawler.Spider;
 import com.github.catvod.net.OkHttp;
 import com.github.catvod.utils.Json;
@@ -47,6 +48,7 @@ public class Bili extends Spider {
     private JsonObject extend;
     private boolean login;
     private boolean isVip;
+    private Wbi wbi;
 
     private static Map<String, String> getHeader() {
         Map<String, String> headers = new HashMap<>();
@@ -114,9 +116,11 @@ public class Bili extends Spider {
     @Override
     public String categoryContent(String tid, String pg, boolean filter, HashMap<String, String> extend) throws Exception {
         if (tid.endsWith("/{pg}")) {
-            String mid = tid.split("/")[0];
+            LinkedHashMap<String, Object> params = new LinkedHashMap<>();
+            params.put("mid", tid.split("/")[0]);
+            params.put("pn", pg);
             List<Vod> list = new ArrayList<>();
-            String json = OkHttp.string("https://api.bilibili.com/x/space/wbi/arc/search?mid=" + mid + "&pn=" + pg, getHeader());
+            String json = OkHttp.string("https://api.bilibili.com/x/space/wbi/arc/search?" + wbi.getQuery(params), getHeader());
             for (Resp.Result item : Resp.Result.arrayFrom(Resp.objectFrom(json).getData().getList().getAsJsonObject().get("vlist"))) list.add(item.getVod());
             return Result.string(list);
         } else {
@@ -275,6 +279,7 @@ public class Bili extends Spider {
         Data data = Resp.objectFrom(json).getData();
         login = data.isLogin();
         isVip = data.isVip();
+        wbi = data.getWbi();
         //getQRCode();
     }
 

jar/custom_spider.jar.md5

@@ -1 +1 @@
-eb74b4e7f4228fa6b063bc9e04ecc751
+349a7accbf77c311dc3b82150a9f29ea