Merge branch 'main' of https://github.com/FongMi/CatVodSpider

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

@@ -135,7 +135,7 @@ public class Bili extends Spider {
     public String categoryContent(String tid, String pg, boolean filter, HashMap<String, String> extend) throws Exception {
         String order = extend.containsKey("order") ? extend.get("order") : "totalrank";
         String duration = extend.containsKey("duration") ? extend.get("duration") : "0";
-        tid = extend.containsKey("tid") ? extend.get("tid") : tid;
+        if (extend.containsKey("tid")) tid = tid + " " + extend.get("tid");
         String api = "https://api.bilibili.com/x/web-interface/search/type?search_type=video&keyword=" + URLEncoder.encode(tid) + "&order=" + order + "&duration=" + duration + "&page=" + pg;
         String json = OkHttp.string(api, getGuest());
         Resp resp = Resp.objectFrom(json);

jar/custom_spider.jar.md5

@@ -1 +1 @@
-6634431a04b488e0984e752918316382
+3e353d2564e6293da3520b21fb2867d9

json/adult.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;6634431a04b488e0984e752918316382",
+  "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;3e353d2564e6293da3520b21fb2867d9",
   "wallpaper": "https://gao.chuqiuyu.tk",
   "sites": [
     {

json/bili.json

@@ -5,12 +5,12 @@
       "type_id": "帕梅拉"
     },
     {
-      "type_name": "太极拳",
+      "type_name": "太極拳",
-      "type_id": "太极拳"
+      "type_id": "太極拳"
     },
     {
-      "type_name": "广场舞",
+      "type_name": "廣場舞",
-      "type_id": "广场舞"
+      "type_id": "廣場舞"
     },
     {
       "type_name": "健身",
@@ -21,20 +21,20 @@
       "type_id": "舞蹈"
     },
     {
-      "type_name": "电影",
+      "type_name": "電影",
-      "type_id": "电影"
+      "type_id": "電影"
     },
     {
-      "type_name": "电视剧",
+      "type_name": "電視劇",
-      "type_id": "电视剧"
+      "type_id": "電視劇"
     },
     {
-      "type_name": "演唱会",
+      "type_name": "演唱會",
-      "type_id": "演唱会"
+      "type_id": "演唱會"
     },
     {
-      "type_name": "动物世界",
+      "type_name": "動物世界",
-      "type_id": "动物世界"
+      "type_id": "動物世界"
     }
   ],
   "filters": {
@@ -44,19 +44,19 @@
         "name": "排序",
         "value": [
           {
-            "n": "综合排序",
+            "n": "綜合排序",
-            "v": "0"
+            "v": "totalrank"
           },
           {
-            "n": "最多点击",
+            "n": "最多點擊",
             "v": "click"
           },
           {
-            "n": "最新发布",
+            "n": "最新發布",
             "v": "pubdate"
           },
           {
-            "n": "最多弹幕",
+            "n": "最多彈幕",
             "v": "dm"
           },
           {
@@ -67,41 +67,41 @@
       },
       {
         "key": "duration",
-        "name": "时长",
+        "name": "時長",
         "value": [
           {
             "n": "全部",
             "v": "0"
           },
           {
-            "n": "60分钟以上",
+            "n": "60分鐘以上",
             "v": "4"
           },
           {
-            "n": "30~60分钟",
+            "n": "30~60分鐘",
             "v": "3"
           },
           {
-            "n": "10~30分钟",
+            "n": "10~30分鐘",
             "v": "2"
           },
           {
-            "n": "10分钟以下",
+            "n": "10分鐘以下",
             "v": "1"
           }
         ]
       },
       {
         "key": "tid",
-        "name": "分类",
+        "name": "分類",
         "value": [
           {
             "n": "全部",
-            "v": "帕梅拉"
+            "v": ""
           },
           {
-            "n": "帕梅拉合集",
+            "n": "合集",
-            "v": "帕梅拉合集"
+            "v": "合集"
           },
           {
             "n": "Pamela Reif",
@@ -110,25 +110,25 @@
         ]
       }
     ],
-    "太极拳": [
+    "太極拳": [
       {
         "key": "order",
         "name": "排序",
         "value": [
           {
-            "n": "综合排序",
+            "n": "綜合排序",
-            "v": "0"
+            "v": "totalrank"
           },
           {
-            "n": "最多点击",
+            "n": "最多點擊",
             "v": "click"
           },
           {
-            "n": "最新发布",
+            "n": "最新發布",
             "v": "pubdate"
           },
           {
-            "n": "最多弹幕",
+            "n": "最多彈幕",
             "v": "dm"
           },
           {
@@ -139,45 +139,45 @@
       },
       {
         "key": "duration",
-        "name": "时长",
+        "name": "時長",
         "value": [
           {
             "n": "全部",
             "v": "0"
           },
           {
-            "n": "60分钟以上",
+            "n": "60分鐘以上",
             "v": "4"
           },
           {
-            "n": "30~60分钟",
+            "n": "30~60分鐘",
             "v": "3"
           },
           {
-            "n": "10~30分钟",
+            "n": "10~30分鐘",
             "v": "2"
           },
           {
-            "n": "10分钟以下",
+            "n": "10分鐘以下",
             "v": "1"
           }
         ]
       },
       {
         "key": "tid",
-        "name": "分类",
+        "name": "分類",
         "value": [
           {
             "n": "全部",
-            "v": "太极拳"
+            "v": ""
           },
           {
-            "n": "太极拳合集",
+            "n": "合集",
-            "v": "太极拳合集"
+            "v": "合集"
           },
           {
-            "n": "太极拳五连鞭",
+            "n": "五連鞭",
-            "v": "太极拳五连鞭"
+            "v": "五連鞭"
           }
         ]
       }

json/config.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;6634431a04b488e0984e752918316382",
+  "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;3e353d2564e6293da3520b21fb2867d9",
   "wallpaper": "http://饭太硬.top/深色壁纸/api.php",
   "sites": [
     {