dongge
/
AndroidCatVodSpider
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

This commit is contained in:
lushunming 2025-07-22 16:42:35 +08:00
parent d3ac6bd080
commit 16fb9d182e
6 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/github/catvod/api/TianyiApi.java
View File

@ -175,7 +175,7 @@ public class TianyiApi {
header.put("Cookie", cookieJar.loadForRequest("https://cloud.189.cn/api/portal/getNewVlcVideoPlayUrl.action")); header.put("Cookie", cookieJar.loadForRequest("https://cloud.189.cn/api/portal/getNewVlcVideoPlayUrl.action"));
return Result.get().url(ProxyVideo.buildCommonProxyUrl(playUrl, header)).octet().header(header).string(); return Result.get().url(ProxyServer.INSTANCE.buildProxyUrl(playUrl, header)).octet().header(header).string();
} }

3
app/src/main/java/com/github/catvod/api/YunDrive.java
View File

@ -7,6 +7,7 @@ import com.github.catvod.crawler.SpiderDebug;
import com.github.catvod.net.OkHttp; import com.github.catvod.net.OkHttp;
import com.github.catvod.net.OkResult; import com.github.catvod.net.OkResult;
import com.github.catvod.utils.Json; import com.github.catvod.utils.Json;
import com.github.catvod.utils.ProxyServer;
import com.github.catvod.utils.ProxyVideo; import com.github.catvod.utils.ProxyVideo;
import com.github.catvod.utils.Util; import com.github.catvod.utils.Util;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
@ -301,7 +302,7 @@ public class YunDrive {
String contentId = split[0]; String contentId = split[0];
String linkID = split[1]; String linkID = split[1];
playUrl = YunDrive.get().get4kVideoInfo(contentId, linkID); playUrl = YunDrive.get().get4kVideoInfo(contentId, linkID);
playUrl = ProxyVideo.buildCommonProxyUrl(playUrl, new HashMap<>()); playUrl = ProxyServer.INSTANCE.buildProxyUrl(playUrl, new HashMap<>());
} else { } else {
String contentId = split[0]; String contentId = split[0];

3
app/src/main/java/com/github/catvod/utils/ProxyServer.kt
View File

@ -158,6 +158,7 @@ object ProxyServer {
} }
} }
channels.forEach { it.close() }
} catch (e: Exception) { } catch (e: Exception) {
SpiderDebug.log("proxyAsync error: ${e.message}") SpiderDebug.log("proxyAsync error: ${e.message}")
e.printStackTrace() e.printStackTrace()
@ -232,7 +233,7 @@ object ProxyServer {
Charset.defaultCharset() Charset.defaultCharset()
) )
) )
return "http://127.0.0.1:$port/proxy?key=$urlBase64&headers=$headerBase64" return "http://127.0.0.1:$port/proxy?url=$urlBase64&headers=$headerBase64"
} }

BIN
jar/custom_spider.jar
View File

Binary file not shown.

2
jar/custom_spider.jar.md5
View File

@ -1 +1 @@
25dcdf484e1860fdd348f1585cee636a 89689d186862de9fb12508bfe3ac4689

2
json/test.json
View File

@ -1,5 +1,5 @@
{ {
"spider": "https://gh.llkk.cc/https://raw.githubusercontent.com/lushunming/AndroidCatVodSpider/multiThreadNew/jar/custom_spider.jar;md5;25dcdf484e1860fdd348f1585cee636a", "spider": "https://gh.llkk.cc/https://raw.githubusercontent.com/lushunming/AndroidCatVodSpider/multiThreadNew/jar/custom_spider.jar;md5;89689d186862de9fb12508bfe3ac4689",
"lives": [ "lives": [
{ {
"name": "电视直播", "name": "电视直播",