diff --git a/app/src/main/java/com/github/catvod/bean/mqitv/Config.java b/app/src/main/java/com/github/catvod/bean/mqitv/Config.java index b84e546c..29ef9e38 100644 --- a/app/src/main/java/com/github/catvod/bean/mqitv/Config.java +++ b/app/src/main/java/com/github/catvod/bean/mqitv/Config.java @@ -49,7 +49,7 @@ public class Config { } public List getData() { - return data = data == null ? Data.objectFrom(OkHttp.string(getApi())).getData() : data; + return data = data == null ? Data.objectFrom(OkHttp.string(getApi(), 3000)).getData() : data; } public Uri getUri() { diff --git a/app/src/main/java/com/github/catvod/net/OkHttp.java b/app/src/main/java/com/github/catvod/net/OkHttp.java index c71057c0..895e54ec 100644 --- a/app/src/main/java/com/github/catvod/net/OkHttp.java +++ b/app/src/main/java/com/github/catvod/net/OkHttp.java @@ -24,6 +24,8 @@ import okhttp3.Response; public class OkHttp { + private static final long TIMEOUT = TimeUnit.SECONDS.toMillis(15); + public static final String POST = "POST"; public static final String GET = "GET"; @@ -45,6 +47,10 @@ public class OkHttp { return string(url, null); } + public static String string(String url, long timeout) { + return string(url, null, null, timeout); + } + public static String string(String url, Map header) { return string(url, null, header); } @@ -53,6 +59,10 @@ public class OkHttp { return new OkRequest(GET, url, params, header).execute(client()).getBody(); } + public static String string(String url, Map params, Map header, long timeout) { + return new OkRequest(GET, url, params, header).execute(client(timeout)).getBody(); + } + public static String post(String url, Map params) { return post(url, params, null).getBody(); } @@ -86,7 +96,11 @@ public class OkHttp { } private static OkHttpClient.Builder getBuilder() { - return new OkHttpClient.Builder().dns(safeDns()).connectTimeout(30, TimeUnit.SECONDS).readTimeout(30, TimeUnit.SECONDS).writeTimeout(30, TimeUnit.SECONDS).hostnameVerifier((hostname, session) -> true).sslSocketFactory(getSSLContext().getSocketFactory(), trustAllCertificates()); + return new OkHttpClient.Builder().dns(safeDns()).connectTimeout(TIMEOUT, TimeUnit.MILLISECONDS).readTimeout(TIMEOUT, TimeUnit.MILLISECONDS).writeTimeout(TIMEOUT, TimeUnit.MILLISECONDS).hostnameVerifier((hostname, session) -> true).sslSocketFactory(getSSLContext().getSocketFactory(), trustAllCertificates()); + } + + private static OkHttpClient client(long timeout) { + return client().newBuilder().connectTimeout(timeout, TimeUnit.MILLISECONDS).readTimeout(timeout, TimeUnit.MILLISECONDS).writeTimeout(timeout, TimeUnit.MILLISECONDS).build(); } private static OkHttpClient client() { diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index f363634b..720c1b1c 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 2bd1f089..906bba53 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -b17f3177fdffd71233d05a33b4ca7a89 +6e1a6ee68ebc096e7efa7fb5e9c691ed