自动使用登录header

pull/1264/head
gedoor 4 years ago
parent 33edf5bda1
commit 7b1cc365f2
  1. 7
      app/src/main/java/io/legado/app/data/entities/BaseSource.kt
  2. 2
      app/src/main/java/io/legado/app/model/webBook/BookChapterList.kt
  3. 2
      app/src/main/java/io/legado/app/model/webBook/BookContent.kt
  4. 12
      app/src/main/java/io/legado/app/model/webBook/WebBook.kt

@ -23,7 +23,7 @@ interface BaseSource : JsExtensions {
/**
* 解析header规则
*/
fun getHeaderMap() = HashMap<String, String>().apply {
fun getHeaderMap(hasLoginHeader: Boolean = false) = HashMap<String, String>().apply {
this[AppConst.UA_NAME] = AppConfig.userAgent
header?.let {
GSON.fromJsonObject<Map<String, String>>(
@ -38,6 +38,11 @@ interface BaseSource : JsExtensions {
putAll(map)
}
}
if (hasLoginHeader) {
getLoginHeader()?.let {
putAll(it)
}
}
}
/**

@ -64,6 +64,7 @@ object BookChapterList {
AnalyzeUrl(
ruleUrl = nextUrl,
book = book,
source = bookSource,
headerMapF = bookSource.getHeaderMap()
).getStrResponse(bookSource.bookSourceUrl).body?.let { nextBody ->
chapterData = analyzeChapterList(
@ -87,6 +88,7 @@ object BookChapterList {
val analyzeUrl = AnalyzeUrl(
ruleUrl = urlStr,
book = book,
source = bookSource,
headerMapF = bookSource.getHeaderMap()
)
val res = analyzeUrl.getStrResponse(bookSource.bookSourceUrl)

@ -69,6 +69,7 @@ object BookContent {
val res = AnalyzeUrl(
ruleUrl = nextUrl,
book = book,
source = bookSource,
headerMapF = bookSource.getHeaderMap()
).getStrResponse(bookSource.bookSourceUrl)
res.body?.let { nextBody ->
@ -91,6 +92,7 @@ object BookContent {
val analyzeUrl = AnalyzeUrl(
ruleUrl = urlStr,
book = book,
source = bookSource,
headerMapF = bookSource.getHeaderMap()
)
val res = analyzeUrl.getStrResponse(bookSource.bookSourceUrl)

@ -44,7 +44,7 @@ class WebBook(val bookSource: BookSource) {
key = key,
page = page,
baseUrl = sourceUrl,
headerMapF = bookSource.getHeaderMap(),
headerMapF = bookSource.getHeaderMap(true),
book = variableBook,
source = bookSource
)
@ -86,7 +86,7 @@ class WebBook(val bookSource: BookSource) {
baseUrl = sourceUrl,
book = variableBook,
source = bookSource,
headerMapF = bookSource.getHeaderMap()
headerMapF = bookSource.getHeaderMap(true)
)
var res = analyzeUrl.getStrResponse(bookSource.bookSourceUrl)
//检测书源是否已登录
@ -127,7 +127,7 @@ class WebBook(val bookSource: BookSource) {
baseUrl = sourceUrl,
book = book,
source = bookSource,
headerMapF = bookSource.getHeaderMap()
headerMapF = bookSource.getHeaderMap(true)
)
var res = analyzeUrl.getStrResponse(bookSource.bookSourceUrl)
//检测书源是否已登录
@ -168,7 +168,7 @@ class WebBook(val bookSource: BookSource) {
baseUrl = book.bookUrl,
book = book,
source = bookSource,
headerMapF = bookSource.getHeaderMap()
headerMapF = bookSource.getHeaderMap(true)
)
var res = analyzeUrl.getStrResponse(bookSource.bookSourceUrl)
//检测书源是否已登录
@ -221,10 +221,10 @@ class WebBook(val bookSource: BookSource) {
val analyzeUrl = AnalyzeUrl(
ruleUrl = bookChapter.getAbsoluteURL(),
baseUrl = book.tocUrl,
headerMapF = bookSource.getHeaderMap(),
book = book,
source = bookSource,
chapter = bookChapter
chapter = bookChapter,
headerMapF = bookSource.getHeaderMap(true)
)
var res = analyzeUrl.getStrResponse(
bookSource.bookSourceUrl,

Loading…
Cancel
Save