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 0240dcb9..c5193f30 100644 --- a/app/src/main/java/com/github/catvod/utils/ProxyServer.kt +++ b/app/src/main/java/com/github/catvod/utils/ProxyServer.kt @@ -19,6 +19,7 @@ object ProxyServer { private var httpServer: AdvancedHttpServer? = null private val infos = mutableMapOf>>(); + fun stop() { httpServer?.stop() } @@ -163,7 +164,7 @@ object ProxyServer { response.write("proxyAsync error: ${e.message}") } finally { - // channels.forEach { it.close() } + // channels.forEach { it.close() } } } @@ -224,19 +225,14 @@ object ProxyServer { } fun buildProxyUrl(url: String, headers: Map): String { - - return "http://127.0.0.1:$port/proxy?url=${ - org.apache.commons.codec.binary.Base64() - .encodeToString(url.toByteArray(Charset.defaultCharset())) - }&headers=${ - org.apache.commons.codec.binary.Base64().encodeToString( - Json.toJson(headers).toByteArray( - Charset.defaultCharset() - ) + val urlBase64 = org.apache.commons.codec.binary.Base64() + .encodeToString(url.toByteArray(Charset.defaultCharset())) + val headerBase64 = org.apache.commons.codec.binary.Base64().encodeToString( + Json.toJson(headers).toByteArray( + Charset.defaultCharset() ) - - - }" + ) + return "http://127.0.0.1:$port/proxy?key=$urlBase64&headers=$headerBase64" } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 0dc7180f..a2fce88b 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 6075f6d3..a49b447e 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -d1cf6ff4615de0bbbb26d7fb8148f0df +25dcdf484e1860fdd348f1585cee636a diff --git a/json/test.json b/json/test.json index 0ca480c4..1a608faa 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;d1cf6ff4615de0bbbb26d7fb8148f0df", + "spider": "https://gh.llkk.cc/https://raw.githubusercontent.com/lushunming/AndroidCatVodSpider/multiThreadNew/jar/custom_spider.jar;md5;25dcdf484e1860fdd348f1585cee636a", "lives": [ { "name": "电视直播",