Merge branch 'release-3.4.5'

修复1个书源，移除1个失效书源，添加1个书源，书源页面标记出停止维护的源，删除广告SDK，默认隐藏主页菜单中的扫一扫，
AoEiuV020 · Apr 30, 2022 · 48fc224 · 48fc224
2 parents a4296a5 + 8bc0eb2
commit 48fc224
Show file tree

Hide file tree

Showing 84 changed files with 489 additions and 787 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -44,9 +44,14 @@ jobs:
               num=${num%/merge}
               BUILD_VERSION=pr-${num}-"$(date +'%Y%m%d%H%M%S')"
           else
-              CREATE_RELEASE="true"
+              if [ "${GITHUB_REF}" == "refs/heads/dev" ]
+              then
+                  CREATE_RELEASE="true"
+              else
+                  CREATE_RELEASE="false"
+              fi
               echo PRE_RELEASE="true" >> .custom_env
-              BUILD_VERSION="$(date +'%Y%m%d%H%M%S')"
+              BUILD_VERSION="$(./latest-version.sh)-$(date +'%Y%m%d%H%M%S')"
               RELEASE_BODY=$(echo '${{ toJson(github.event.commits) }}' |jq -r 'map("### "+.message)|join("\n\n------\n")')
               TG_CHANGELOG="$(echo "$RELEASE_BODY"|sed -n "s/### \(.*\)/\1/p" |sed -n '{;=;p}' | sed "N;s/\n/. /g")"
               VERSION_PREFIX='内测版-'

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/NovelContext.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/NovelContext.kt
@@ -40,10 +40,11 @@ abstract class NovelContext {
             Manhuagui(), SiFang(), Qinxiaoshuo(), N9txs(), N168kanshu(),
             Yunduwu(), N123du(), Biqugese(), Biqugezhh(), Shoudashu(),
 
-            Kssw(), Biquge5200(), N69shu(), Kenshuzw(), Wukong0()
+            Kssw(), Biquge5200(), N69shu(), Kenshuzw(), Wukong0(),
+            Ttkan()
         ).asReversed()
 
-        const val sitesVersion = 11
+        const val sitesVersion = 12
 
         // 用于存取cookie,
         private val gson: Gson = GsonUtils.gsonBuilder
@@ -282,9 +283,14 @@ abstract class NovelContext {
 
 
     /**
-     * 这个网站是否启用，
+     * 这个网站是否还有维护，
      */
-    open val enabled: Boolean = true
+    open val upkeep: Boolean = true
+
+    /**
+     * 这个网站停止维护的原因，
+     */
+    open val reason: String = ""
 
     /**
      * 这个网站是否隐藏，

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/base/DslJsoupNovelContext.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/base/DslJsoupNovelContext.kt
@@ -73,7 +73,8 @@ abstract class DslJsoupNovelContext : JsoupNovelContext() {
     var bookIdWithChapterIdIndex: Int = 0
 
     override var charset: String? = null
-    override var enabled: Boolean = true
+    override var upkeep: Boolean = true
+    override var reason: String = ""
     override var hide: Boolean = false
     override var login: Boolean = false
 

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/site/biquge.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/site/biquge.kt
@@ -15,10 +15,10 @@ class Biquge : DslJsoupNovelContext() {init {
         logo =
             "https://imgsa.baidu.com/forum/w%3D580/sign=1d712d8332dbb6fd255be52e3925aba6/d7d2c843fbf2b211dfb81c36c18065380dd78e1b.jpg"
     }
-    // https://www.biqubao.com/search.php?q=%E9%83%BD%E5%B8%82
+    // https://m.biqugee.com/search.php?q=%E9%83%BD%E5%B8%82
     search {
         get {
-            url = "/search.php"
+            url = "//m.biqugee.com/search.php"
             data {
                 "q" to it
             }

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/site/biqugezhh.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/site/biqugezhh.kt
@@ -6,6 +6,8 @@ import cc.aoeiuv020.panovel.api.base.DslJsoupNovelContext
 import cc.aoeiuv020.panovel.api.reverseRemoveDuplication
 
 class Biqugezhh : DslJsoupNovelContext() {init {
+    reason = "搜索失效了，搜出来的会是另一个网站的结果，www.qu-la.com"
+    upkeep = false
     site {
         name = "笔趣阁zhh"
         baseUrl = "https://www.zhhbiqu.com"

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/site/fenghuaju.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/site/fenghuaju.kt
@@ -9,10 +9,8 @@ import cc.aoeiuv020.regex.pick
  * Created by AoEiuV020 on 2018.06.02-20:00:14.
  */
 class Fenghuaju : DslJsoupNovelContext() {init {
-    /*
-    这网站时不时502,
-     */
-    enabled = false
+    reason = "这网站时不时502,"
+    upkeep = false
     site {
         name = "风华居"
         baseUrl = "http://www.fenghuaju.cc"

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/site/guanshuwang.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/site/guanshuwang.kt
@@ -9,8 +9,8 @@ import cc.aoeiuv020.panovel.api.firstTwoIntPattern
  * Created by AoEiuV020 on 2018.06.03-18:12:36.
  */
 class Guanshuwang : DslJsoupNovelContext() {init {
-    // 搜索403了，
-    enabled = false
+    reason = "搜索403了，"
+    upkeep = false
     site {
         name = "官术网"
         baseUrl = "https://www.guanshu.cc"

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/site/kssw.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/site/kssw.kt
@@ -7,6 +7,8 @@ import cc.aoeiuv020.panovel.api.base.DslJsoupNovelContext
 import java.net.URL
 
 class Kssw : DslJsoupNovelContext() {init {
+    reason = "网站关了,"
+    hide = true
     site {
         name = "看书小说"
         baseUrl = "https://pc.kssw.net"

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/site/lewen123.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/site/lewen123.kt
@@ -7,8 +7,8 @@ import cc.aoeiuv020.panovel.api.firstThreeIntPattern
  * Created by AoEiuV020 on 2018.06.06-19:24:03.
  */
 class Lewen123 : DslJsoupNovelContext() {init {
-    // 这网站章节有大量重复，
-    enabled = false
+    reason = "这网站章节有大量重复，"
+    upkeep = false
     site {
         name = "乐文小说"
         baseUrl = "http://www.lewen123.com"

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/site/liewen.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/site/liewen.kt
@@ -8,7 +8,7 @@ import cc.aoeiuv020.panovel.api.firstTwoIntPattern
  * Created by AoEiuV020 on 2018.06.06-16:47:20.
  */
 class Liewen : DslJsoupNovelContext() {init {
-    enabled = false
+    upkeep = false
     site {
         name = "猎文网"
         baseUrl = "https://www.liewen.la"

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/site/lnovel.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/site/lnovel.kt
@@ -17,7 +17,7 @@ import java.nio.charset.Charset
  * Created by AoEiuV020 on 2018.09.04-03:46:55.
  */
 class Lnovel : DslJsoupNovelContext() {init {
-    enabled = false
+    upkeep = false
     hide = true
     site {
         name = "lnovel"

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/site/manhuagui.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/site/manhuagui.kt
@@ -13,8 +13,8 @@ import com.google.gson.annotations.SerializedName
  * Created by AoEiuV020 on 2019.02.11-17:20:32.
  */
 class Manhuagui : JsNovelContext() {init {
-    // 连接超时，网站可能被墙了，
-    enabled = false
+    reason = "连接超时，网站可能被墙了，"
+    upkeep = false
     site {
         name = "漫画柜"
         baseUrl = "https://www.manhuagui.com"

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/site/mianhuatang.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/site/mianhuatang.kt
@@ -9,8 +9,8 @@ import cc.aoeiuv020.regex.pick
  * Created by AoEiuV020 on 2018.06.03-11:12:05.
  */
 class Mianhuatang : DslJsoupNovelContext() {init {
-    // 这网站搜索已经没结束了，但其他功能正常，
-    enabled = false
+    reason = "这网站搜索已经没了，但其他功能正常，"
+    upkeep = false
     site {
         name = "棉花糖小说"
         baseUrl = "http://www.mianhuatang520.com"

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/site/miaobige.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/site/miaobige.kt
@@ -8,8 +8,8 @@ import java.net.URL
  * Created by AoEiuV020 on 2018.06.05-19:09:22.
  */
 class Miaobige : DslJsoupNovelContext() {init {
-    // 这网站章节列表页的章节不全，但是点下一章又能看的，这就没法爬了，
-    enabled = false
+    reason = "这网站章节列表页的章节不全，但是点下一章又能看的，这就没法爬了，"
+    upkeep = false
     site {
         name = "妙笔阁"
         baseUrl = "https://www.miaobige.com"

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/site/n52ranwen.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/site/n52ranwen.kt
@@ -8,9 +8,8 @@ import cc.aoeiuv020.string.divide
  * Created by AoEiuV020 on 2018.06.08-19:34:21.
  */
 class N52ranwen : DslJsoupNovelContext() {init {
-    // 这网站连接超时了，
-    // 是被墙了，
-    enabled = false
+    reason = "这网站连接超时了，是被墙了，"
+    upkeep = false
     site {
         name = "燃文小说"
         baseUrl = "https://www.52ranwen.cc"

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/site/n73xs.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/site/n73xs.kt
@@ -8,6 +8,8 @@ import cc.aoeiuv020.panovel.api.firstThreeIntPattern
  * Created by AoEiuV020 on 2018.06.04-17:23:51.
  */
 class N73xs : DslJsoupNovelContext() {init {
+    reason = "超时，网站可能快凉了，"
+    upkeep = false
     site {
         name = "73文学"
         baseUrl = "http://www.73wxw.com"

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/site/n7dsw.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/site/n7dsw.kt
@@ -10,8 +10,8 @@ import java.net.URL
  * Created by AoEiuV020 on 2018.06.03-21:27:05.
  */
 class N7dsw : DslJsoupNovelContext() {init {
-    // 不咋地，随机握手失败，搜索可能502,
-    enabled = false
+    reason = "不咋地，随机握手失败，搜索可能502,"
+    upkeep = false
     site {
         name = "7度书屋"
         baseUrl = "https://www.7dsw.com"

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/site/qlwx.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/site/qlwx.kt
@@ -9,8 +9,8 @@ import java.net.URL
  * Created by AoEiuV020 on 2018.05.10-18:11:57.
  */
 class Qlwx : DslJsoupNovelContext() { init {
-    // 时不时开云锁，不稳定，
-    enabled = false
+    reason = "时不时开云锁，不稳定，"
+    upkeep = false
     site {
         name = "齐鲁文学"
         baseUrl = "http://www.76wx.com"

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/site/ttkan.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/site/ttkan.kt
@@ -0,0 +1,87 @@
+package cc.aoeiuv020.panovel.api.site
+
+import cc.aoeiuv020.base.jar.ownLinesString
+import cc.aoeiuv020.gson.GsonUtils
+import cc.aoeiuv020.panovel.api.NovelChapter
+import cc.aoeiuv020.panovel.api.base.DslJsoupNovelContext
+import cc.aoeiuv020.panovel.api.firstThreeIntPattern
+import com.google.gson.Gson
+import com.google.gson.JsonObject
+
+/**
+ * Created by AoEiuV020 on 2018.06.08-19:09:23.
+ */
+class Ttkan : DslJsoupNovelContext() {init {
+    site {
+        name = "天天看小说"
+        baseUrl = "https://cn.ttkan.co"
+        logo = "text://天天看小说/?fc=ffffff&bc=1b2631"
+    }
+    search {
+        get {
+            url = "/novel/search"
+            data {
+                "q" to it
+            }
+        }
+        document {
+            items("div.frame_body > div.pure-g > div > ul") {
+                name("> li:nth-child(1) > a")
+                // 有作者名字空白，https://hk.ttkan.co/novel/chapters/yuanworuxingjunruyue
+                author("> li:nth-child(2)", block = pickString("作者：(\\S*)"))
+            }
+        }
+    }
+    // https://www.ttkan.co/novel/chapters/shisiruguiweijunzi-pingceng
+    bookIdRegex = "/novel/chapters/(.*)"
+    detailPageTemplate = "/novel/chapters/%s"
+    detail { _ ->
+        document {
+            novel {
+                name("div.pure-g.novel_info > div:nth-child(2) > ul > li:nth-child(1) > h1")
+                author("div.pure-g.novel_info > div:nth-child(2) > ul > li:nth-child(2) > a")
+            }
+            image("div.pure-g.novel_info > div:nth-child(1) > a > amp-img")
+            introduction("div.description > div")
+        }
+    }
+    chapters {
+        val bookId = findBookId(it)
+        get {
+            url =
+                "https://www.ttkan.co/api/nq/amp_novel_chapters?language=cn&novel_id=$bookId&__amp_source_origin=https%3A%2F%2Fwww.ttkan.co"
+        }
+        response {
+            gson.fromJson(it, JsonObject::class.java)
+                .getAsJsonArray("items").map {
+                    it.asJsonObject.let {
+                        val chapterName = it.getAsJsonPrimitive("chapter_name").asString
+                        val chapterId = it.getAsJsonPrimitive("chapter_id").asInt.toString()
+                        NovelChapter(chapterName, "${bookId}_$chapterId", null)
+                    }
+                }
+        }
+    }
+    // https://www.ttkan.co/novel/user/page_direct?novel_id=shisiruguiweijunzi-pingceng&page=2
+    // https://www.bg3.co/novel/pagea/shisiruguiweijunzi-pingceng_2.html
+    contentPageTemplate = "//www.bg3.co/novel/pagea/%s.html"
+    content {
+        val bookIdAndChapterId = findBookIdWithChapterId(it)
+        val (bookId, chapterId) = bookIdAndChapterId.split('_')
+        get {
+            url = "/novel/user/page_direct"
+            data {
+                "novel_id" to bookId
+                "page" to chapterId
+            }
+        }
+        document {
+            items("div.content")
+        }
+    }
+}
+
+    // 用来解析章节api,
+    private val gson: Gson = GsonUtils.gson
+}
+
diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/site/wenxuemi.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/site/wenxuemi.kt
@@ -8,8 +8,8 @@ import cc.aoeiuv020.panovel.api.firstTwoIntPattern
  * Created by AoEiuV020 on 2018.06.03-19:56:19.
  */
 class Wenxuemi : DslJsoupNovelContext() {init {
-    // 搜索403
-    enabled = false
+    reason = "搜索403"
+    upkeep = false
     site {
         name = "文学迷"
         baseUrl = "https://www.wenxuemi.cc"

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/site/yidm.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/site/yidm.kt
@@ -17,8 +17,8 @@ import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.Semaphore
 
 class Yidm : DslJsoupNovelContext() {init {
-    // 轻小说网站默认不开启，
-    enabled = false
+    reason = "下载不到版权受限的小说了，这个源就没什么意义了，"
+    upkeep = false
     hide = true
     site {
         name = "迷糊轻小说"

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/site/yipinxia.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/site/yipinxia.kt
@@ -7,7 +7,7 @@ import java.net.URL
  * Created by AoEiuV020 on 2018.06.03-20:06:02.
  */
 class Yipinxia : DslJsoupNovelContext() {init {
-    enabled = false
+    upkeep = false
     site {
         name = "一品侠小说"
         baseUrl = "https://www.yipinxia.net"

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/site/yllxs.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/site/yllxs.kt
@@ -8,6 +8,7 @@ import cc.aoeiuv020.panovel.api.firstThreeIntPattern
  * Created by AoEiuV020 on 2018.06.02-20:54:12.
  */
 class Yllxs : DslJsoupNovelContext() {init {
+    reason = "官方搜索不可用，"
     hide = true
     site {
         name = "166小说"

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/site/yssm.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/site/yssm.kt
@@ -12,8 +12,8 @@ import java.io.ByteArrayOutputStream
  * Created by AoEiuV020 on 2018.05.10-16:48:32.
  */
 class Yssm : DslJsoupNovelContext() {init {
-    // 有用户也上不去，看来不是我的网站问题，我这里同一个教育网的电脑能上手机不能上，
-    enabled = false
+    reason = "有用户也上不去，看来不是我的网站问题，我这里同一个教育网的电脑能上手机不能上，"
+    upkeep = false
     site {
         name = "幼狮书盟"
         baseUrl = "https://www.yssm.tv/"

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/site/zhuaji.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/site/zhuaji.kt
@@ -10,8 +10,8 @@ import cc.aoeiuv020.regex.compileRegex
  * Created by AoEiuV020 on 2018.06.09-19:47:51.
  */
 class Zhuaji : DslJsoupNovelContext() {init {
-    // 这网站连接总超时，
-    enabled = false
+    reason = "这网站连接总超时，"
+    upkeep = false
     site {
         name = "爪机书屋"
         baseUrl = "https://www.zhuaji.org"

diff --git a/api/src/main/java/cc/aoeiuv020/panovel/api/site/zzdxsw.kt b/api/src/main/java/cc/aoeiuv020/panovel/api/site/zzdxsw.kt
@@ -7,9 +7,8 @@ import cc.aoeiuv020.panovel.api.base.DslJsoupNovelContext
  * Created by AoEiuV020 on 2018.06.09-19:08:51.
  */
 class Zzdxsw : DslJsoupNovelContext() {init {
-    // 网速过慢，
-    // 可能部分网络连接超时，不是墙，
-    enabled = false
+    reason = "网速过慢，可能部分网络连接超时，不是墙，"
+    upkeep = false
     site {
         name = "猪猪岛小说网"
         baseUrl = "http://www.zzdxsw.org"