diff --git a/app/src/main/java/com/github/catvod/utils/ProxyServer.kt b/app/src/main/java/com/github/catvod/utils/ProxyServer.kt index 8a4b8118..a11549fb 100644 --- a/app/src/main/java/com/github/catvod/utils/ProxyServer.kt +++ b/app/src/main/java/com/github/catvod/utils/ProxyServer.kt @@ -37,9 +37,13 @@ object ProxyServer { }; httpServer?.addRoutes("/proxy") { req, response -> run { - val url = Util.base64Decode(req.queryParams["url"]) + var url = req.queryParams["url"]; + val headers = req.queryParams["headers"]; + SpiderDebug.log("url: $url") + SpiderDebug.log("headers: $headers") + url = Util.base64Decode(url) val header: Map = Gson().fromJson>( - Util.base64Decode(req.queryParams["headers"]), MutableMap::class.java + Util.base64Decode(headers), MutableMap::class.java ) proxyAsync(url, header, req, response) } @@ -216,7 +220,7 @@ object ProxyServer { fun buildProxyUrl(url: String, headers: Map): String { return "http://127.0.0.1:$port/proxy?url=${Util.base64Encode(url.toByteArray(Charset.defaultCharset()))}&headers=${ Util.base64Encode( - Gson().toJson(headers).toByteArray( + Json.toJson(headers).toByteArray( Charset.defaultCharset() ) ) diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 1116e73e..a550e23a 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 c73a01f9..d687a59c 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -d9c6562f45aff98d146a205881095f76 +70e0ff204c63fb77312eb360c1f2a32a diff --git a/json/test.json b/json/test.json index fbbcddc9..3b590e05 100644 --- a/json/test.json +++ b/json/test.json @@ -1,5 +1,5 @@ { - "spider": "https://gh.llkk.cc/https://raw.githubusercontent.com/lushunming/AndroidCatVodSpider/multiThreadNew/jar/custom_spider.jar;md5;d9c6562f45aff98d146a205881095f76", + "spider": "https://gh.llkk.cc/https://raw.githubusercontent.com/lushunming/AndroidCatVodSpider/multiThreadNew/jar/custom_spider.jar;md5;70e0ff204c63fb77312eb360c1f2a32a", "lives": [ { "name": "电视直播",