feat: alist

Greatwallcorner · Jul 7, 2024 · c27acda · c27acda
1 parent 1d42e49
commit c27acda
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 10 deletions.
diff --git a/jar/spider.jar b/jar/spider.jar
diff --git a/json/alist.json b/json/alist.json
@@ -0,0 +1,49 @@
+{
+  "vodPic": "https://x.imgs.ovh/x/2023/09/05/64f680bb030b4.png",
+  "drives": [
+    {
+      "name": "小雅",
+      "server": "http://alist.xiaoya.pro"
+    },
+    {
+      "name": "觸光",
+      "server": "https://pan.ichuguang.com"
+    },
+    {
+      "name": "一只魚",
+      "server": "https://vtok.pp.ua/"
+    },
+    {
+      "name": "七米藍",
+      "server": "https://al.chirmyram.com"
+    },
+    {
+      "name": "神族九帝",
+      "server": "https://alist.shenzjd.com"
+    },
+    {
+      "name": "梓澪",
+      "server": "https://zi0.cc"
+    },
+    {
+      "name": "梓澪",
+      "server": "https://zi0.cc"
+    },
+    {
+      "name": "範本",
+      "server": "https://one.fongmi.com",
+      "search": true,
+      "hidden": false,
+      "login": {
+        "username": "fongmi",
+        "password": "fongmi"
+      },
+      "params": [
+        {
+          "path": "/安齋拉拉",
+          "pass": "18181818"
+        }
+      ]
+    }
+  ]
+}
diff --git a/json/config.json b/json/config.json
@@ -145,7 +145,7 @@
       "searchable": "0",
       "filterable": "1",
       "changeable": 0,
-      "ext": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/json/alist.json"
+      "ext": "./alist.json"
     },
     {
       "key": "PanSou",

diff --git a/src/main/java/com/github/catvod/net/OkHttp.java b/src/main/java/com/github/catvod/net/OkHttp.java
@@ -4,8 +4,6 @@
 import okhttp3.*;
 
 import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
 import java.time.Duration;
 import java.util.List;
 import java.util.Map;
@@ -112,9 +110,9 @@ public static String getLocation(Map<String, List<String>> headers) {
     public static OkHttpClient.Builder getBuilder() {
         return new OkHttpClient.Builder()
 //                .proxy(new java.net.Proxy(Proxy.Type.HTTP, new InetSocketAddress("localhost",8080)))
-                .addInterceptor(new OkhttpInterceptor()).dns(dns()).connectTimeout(30, TimeUnit.SECONDS)
-                .readTimeout(30, TimeUnit.SECONDS)
-                .writeTimeout(30, TimeUnit.SECONDS)
+                .addInterceptor(new OkhttpInterceptor()).dns(dns()).connectTimeout(3, TimeUnit.SECONDS)
+                .readTimeout(5, TimeUnit.SECONDS)
+                .writeTimeout(5, TimeUnit.SECONDS)
                 .sslSocketFactory(SSLSocketClient.getSSLSocketFactory(), SSLSocketClient.getX509TrustManager())
                 .hostnameVerifier((SSLSocketClient.getHostnameVerifier()));
     }

diff --git a/src/main/java/com/github/catvod/spider/AList.java b/src/main/java/com/github/catvod/spider/AList.java
@@ -32,14 +32,10 @@ private List<Filter> getFilter() {
     }
 
     private void fetchRule() {
-        SpiderDebug.log("fetch rule start");
         if (drives != null && !drives.isEmpty()) return;
         if (ext.startsWith("http")) {
-            SpiderDebug.log("request rule:" + ext);
             ext = OkHttp.string(ext);
-            SpiderDebug.log("content: " + ext);
         }
-        SpiderDebug.log("fetch rule resp:" + ext);
         Drive drive = Drive.objectFrom(ext);
         drives = drive.getDrives();
         vodPic = drive.getVodPic();