proxy重新加入headers

pull/395/head
Celeter 5 years ago
parent 9952fb1663
commit ab40b518bd
  1. 8
      app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt

@ -67,6 +67,10 @@ class AnalyzeUrl(
} }
headerMapF?.let { headerMapF?.let {
headerMap.putAll(it) headerMap.putAll(it)
if (it.containsKey("proxy")) {
proxy = it["proxy"]
headerMap.remove("proxy")
}
} }
//替换参数 //替换参数
analyzeJs(key, page, speakText, speakSpeed, book) analyzeJs(key, page, speakText, speakSpeed, book)
@ -187,7 +191,6 @@ class AnalyzeUrl(
val option = GSON.fromJsonObject<UrlOption>(urlArray[1]) val option = GSON.fromJsonObject<UrlOption>(urlArray[1])
option?.let { _ -> option?.let { _ ->
option.method?.let { if (it.equals("POST", true)) method = RequestMethod.POST } option.method?.let { if (it.equals("POST", true)) method = RequestMethod.POST }
option.proxy?.let { proxy = it }
option.headers?.let { headers -> option.headers?.let { headers ->
if (headers is Map<*, *>) { if (headers is Map<*, *>) {
headers.forEach { entry -> headers.forEach { entry ->
@ -417,8 +420,7 @@ class AnalyzeUrl(
val charset: String?, val charset: String?,
val webView: Any?, val webView: Any?,
val headers: Any?, val headers: Any?,
val body: Any?, val body: Any?
val proxy: String?
) )
} }

Loading…
Cancel
Save