✨ feat(manga,device): 漫画免签名兜底与 phone 注册身份选项

- /manga 设备池签名路线全部失败时自动降级 wkbrowser 免签名路线（materials/skeleton 三段策略收集原图直链，无需设备/签名/解密），响应附 source: wkbrowser
- 新增配置 fanqie.device_identity（默认 pad 保持现状；phone 对齐书源真机注册 payload：host_bit 64 + 补 hardware/device_device/fingerprint 字段）
- README 与 openapi.yaml 同步文档，新增 manga_fallback 解析测试

.deploy.env.example

@@ -32,8 +32,10 @@ SRC_DIR="/root/code/novel/fanqie-go"
 DOMAIN="fq.20010117.xyz"
 
 # ---------- 证书 ----------
-# Certbot 申请证书的邮箱，用于接收过期提醒
+# acme.sh 申请证书的邮箱，用于账户注册与过期提醒
 CERT_EMAIL="you@example.com"
+# 证书安装目录（acme.sh --install-cert 目标，nginx 配置从此处读取）
+# CERT_DIR="/etc/nginx/ssl"
 
 # ---------- 编译 ----------
 # BUILD_TARGET="./cmd/fanqie"

.gitignore

@@ -47,6 +47,7 @@ __pycache__
 /build/
 
 cache.db
+video_cache/
 
 # Build output
 fanqie-*
@@ -56,3 +57,4 @@ fanqie-*
 .env
 .finesse/
 fanqie.log
+.codegraph/

README.md

@@ -30,6 +30,12 @@ Go 语言实现的番茄小说非官方 API 服务，完整实现了签名算法
 - 分类首页数据
 - 分类详情页（支持筛选、排序、分页）
 
+### 榜单与个人数据
+
+- 🏆 榜单（推荐 / 完结 / 热搜 / 黑马 / 爆更）
+- 📚 我的书架（按分组浏览，需 sessionid）
+- 🕐 阅读历史（含阅读进度，需 sessionid）
+
 ### 技术特性
 
 - **签名算法** - Gorgon、8404、Argus、Ladon、Khronos
@@ -171,7 +177,23 @@ go run ./cmd/fanqie
 | 接口 | 方法 | 说明 | 参数 |
 | ------ | ------ | ------ | ------ |
 | `/category-front` | GET | 分类首页 | - |
-| `/category-landing` | GET | 分类详情 | `category_id`, `word_number`, `book_status`, `sort_by`, `offset` |
+| `/category-landing` | GET | 分类详情 | `category_id`, `word_number`, `book_status`, `sort_by`, `offset`, `selected_items`（新版分类标签自带筛选项，透传上游） |
+
+### 榜单与个人数据
+
+| 接口 | 方法 | 说明 | 参数 |
+| ------ | ------ | ------ | ------ |
+| `/rank` | GET | 榜单（免签名接口） | `side_type`（`10` 推荐 / `11` 完结 / `12` 热搜 / `13` 黑马 / `15` 爆更，默认推荐）, `page`（默认 1，每页 20 本） |
+| `/bookshelf` | GET | 我的书架（需登录） | `sessionid`（必填，见下方「获取 sessionid」）, `group`（可选，按分组过滤；响应含每本书的 `group_name`） |
+| `/read-history` | GET | 阅读历史（需登录） | `sessionid`（必填）, `offset`（默认 0，每页 20 条；响应每项的 `history` 字段保留上游原始记录，含阅读进度） |
+
+#### 获取 sessionid
+
+番茄网页版登录由字节风控（滑块验证）保护，无法通过 API 直接登录（书源实现同样依赖浏览器人工登录）。获取方式：
+
+1. 浏览器打开 [fanqienovel.com](https://fanqienovel.com/) 并登录（手机验证码或密码）
+2. F12 → Application → Cookies → 复制 `sessionid` 的值（有效期较长，可长期使用）
+3. 直接传入 `/bookshelf?sessionid=...` 或 `/read-history?sessionid=...` 使用（书架为空多半是 sessionid 无效或已过期）
 
 ### 媒体相关
 
@@ -256,6 +278,11 @@ fanqie:
   # - "sign4": X-Gorgon + X-Ladon + X-Argus + X-Khronos
   signature: "sign4"
 
+  # 注册设备身份:
+  # - "pad": 平板身份（默认，历史行为）
+  # - "phone": 手机身份（对齐书源真机注册 payload，可对照测试注册率/存活率）
+  device_identity: "pad"
+
   # 内容处理
   content:
     remove_images: false        # 移除图片
@@ -288,7 +315,7 @@ cache:
     password: ""           # 密码
     database: "fanqie"     # 数据库名
     sslmode: "disable"     # SSL 模式: disable | prefer | require
-  redis:                     # Redis 缓存（正文缓存与音频代理缓存，统计数据/设备池仍在 SQL 库）
+  redis:                     # Redis 热缓存层（启用后与 SQL 双写：Redis 短 TTL + SQL 持久层 30 天）
     enabled: false
     host: "127.0.0.1"      # 主机
     port: 6379             # 端口
@@ -337,6 +364,7 @@ cp .env.example .env
 | `server.protect_all` | 业务接口是否也要求访问密钥 | `false` |
 | `fanqie.algorithm` | 签名算法 `gorgon` / `8404` | `gorgon` |
 | `fanqie.signature` | 签名方法 `sign2` / `sign4` | `sign4` |
+| `fanqie.device_identity` | 注册设备身份 `phone` / `pad` | `pad` |
 | `fanqie.content.*` | 正文内容处理选项 | 见上文 |
 | `fanqie.manga.output_mode` | 漫画输出模式 | `proxy` |
 | `cache.enabled` | 是否启用正文内容缓存 | `true` |
@@ -388,15 +416,19 @@ cp .env.example .env
 
 ## 缓存机制
 
-- **接口缓存** - 命中直接返回，不打上游（Redis 启用时优先走 Redis）
+Redis 启用时为**双层架构**：Redis 热层（TTL=业务缓存时长）+ SQL 持久层（不可变内容固定保留 30 天）。
-- **自动清理** - 定期清理过期缓存（Redis 由 TTL 自动过期）
+
+- **读**：Redis → 未命中查 SQL（命中自动回填 Redis）→ 回源上游
+- **写**：Redis + SQL 双写；搜索/分类等动态短缓存只走 Redis 不落库
+- **防击穿**：singleflight 合并并发未命中请求，同一 key 只有一个请求打上游
+- **自动清理** - 定期按行内过期时间清理 SQL 过期缓存（Redis 由 TTL 自动过期）
 - **数据库压缩** - 支持 VACUUM 操作优化数据库
 
 | 接口 | 缓存时长 |
 | ------ | ------ |
-| `/content` | 24 小时 |
+| `/content`、`/multi-content` | 24 小时（SQL 层 30 天） |
-| `/detail`、`/info`、`/catalog`、`/multi-detail`、`/item-summary` | 24 小时 |
+| `/detail`、`/info`、`/catalog`、`/multi-detail`、`/item-summary` | 24 小时（SQL 层 30 天） |
-| `/search`、`/category-front`、`/category-landing` | 10 分钟 |
+| `/search`、`/category-front`、`/category-landing` | 10 分钟（仅 Redis） |
 | `/audio` 代理链接 | 2 小时（匹配 CDN 有效期） |
 
 失败响应不缓存；评论类接口为动态数据，不缓存。

bookSource.json

@@ -0,0 +1,63 @@
+[
+  {
+    "bookSourceName": "🔅番茄聚合",
+    "bookSourceGroup": "📖番茄小说",
+    "bookSourceType": 0,
+    "bookSourceUrl": "https://fq.20010117.xyz",
+    "bookSourceComment": "番茄聚合书源（fanqie-go 后端）\n\n基础使用教程：\n1、搜索：\n    1) 基础搜索：直接搜，默认搜索当前模式内容\n    2) 快捷搜索：使用特殊关键词(x,t,m,d)搜索\n         x:书名  如(x:十日终焉)  搜小说（可省略）\n         t:书名  如(t:十日终焉)  搜听书\n         m:书名  如(m:十日终焉)  搜漫画\n         d:书名  如(d:十日终焉)  搜短剧\n         冒号支持中文英文，也可在书源设置中切换默认搜索模式\n2、发现页：\n    顶部筛选选择 类型/频道/字数/更新/排序 后，点击分类宫格浏览，下拉翻页\n3、段评：\n    阅读正文时点击段尾气泡即可查看段落评论，样式可在段评设置中调整\n4、听书/漫画/短剧：\n    听书自动用播放器播放；漫画走服务端解密代理；短剧打开章节自动唤起播放\n\n更换服务器地址：只需修改源URL(bookSourceUrl)，全部规则使用相对地址自动跟随",
+    "bookSourceEnabled": true,
+    "enabledExplore": true,
+    "enabledCookieJar": true,
+    "customOrder": 0,
+    "weight": 0,
+    "respondTime": 180000,
+    "lastUpdateTime": 1791607295124,
+    "bookUrlPattern": "https?:\\/\\/(?:[a-zA-Z0-9-]+\\.)?[a-zA-Z0-9-]+(?::\\d+)?\\/detail\\?book_id=\\d+.*",
+    "jsLib": "// 当前书源版本号\nlet localVersion = '26.10.10';\n\n// 初始配置\nconst defaultConfig = {\n    发现页类型: \"小说\",\n    频道: \"男频\",\n    搜索模式: \"小说\"\n};\n\n// 获取源变量\nfunction getVariable(k) {\n    if (k == undefined) k = \"\";\n    const { source } = this;\n    let parsed = {};\n    try {\n        parsed = JSON.parse(source.getVariable());\n    } catch {}\n    if (k == \"\") {\n        return parsed;\n    }\n    let value = parsed[k];\n    if (value == undefined) {\n        value = defaultConfig[k];\n    }\n    return value != undefined ? value : \"\";\n}\n\n// 设置源变量\nfunction setVariable(k, v, t) {\n    if (t == undefined) t = true;\n    const { source, java } = this;\n    const vs = this.getVariable();\n    vs[k] = v;\n    source.setVariable(JSON.stringify(vs, null, 4));\n    if (k != '搜索关键词' && t) {\n        java.toast(`\\n设置 ${k} 为 ${v}`)\n    }\n}\n\n// 还原\nfunction deleteVariable() {\n    const { source, java } = this;\n    source.setVariable('');\n    java.longToast('\\n所有设置已还原到初始化导入状态');\n}\n\n// 从 URL 提取内容类型标记(n小说/t听书/m漫画/d短剧)。\n// 注意：jsLib 函数作用域看不到规则变量 baseUrl，必须由调用方显式传入\nfunction fqTab(url, def) {\n    if (def == undefined) def = 'n';\n    let m = String(url).match(/fqtab=([ntmd])/);\n    return m ? m[1] : def;\n}\n\n// 判断当前环境\nfunction checkEnv() {\n    const {\n        java,\n        source\n    } = this;\n\n    try {\n        java.qread();\n        return \"轻阅读\";\n    } catch (e) {}\n\n    try {\n        if (typeof java.reLoginView == 'function') {\n            return \"改版\";\n        }\n        new Packages.io.legato.kazusa.utils.TimeoutCancellationException('');\n        return \"改版\";\n    } catch (e) {}\n    try {\n        java.deviceID();\n        return \"苹果\";\n    } catch (e) {}\n\n    if (typeof source.loginUi == 'function') {\n        return \"安卓\";\n    }\n\n    return \"改版\";\n}\n\n// 备用设置方案（登录页按钮）\nfunction ste(v) {\n    const { java } = this;\n    let moreSettings = this.getVariable(\"更多设置\") || {};\n    let paraSettings = this.getVariable(\"段评设置\") || {};\n    if (v == \"段评\") {\n        if (paraSettings[\"段评开关\"] != \"false\") {\n            paraSettings[\"段评开关\"] = \"false\";\n            java.longToast(\"\\n❌段评已关闭\");\n        } else {\n            paraSettings[\"段评开关\"] = \"true\";\n            java.longToast(\"\\n✅段评已开启\");\n        }\n    }\n    if (v == \"小说\" || v == \"听书\" || v == \"漫画\" || v == \"短剧\") {\n        moreSettings[\"搜索模式\"] = v;\n        java.longToast(`\\n已设置搜索模式为 ${v}`);\n    }\n    if (v == \"图片\") {\n        if (moreSettings[\"显示图片\"] != \"false\") {\n            moreSettings[\"显示图片\"] = \"false\";\n            java.longToast(\"\\n❌已关闭图片显示\");\n        } else {\n            moreSettings[\"显示图片\"] = \"true\";\n            java.longToast(\"\\n✅已开启图片显示\");\n        }\n    }\n    if (v == \"简介\") {\n        if (moreSettings[\"完整简介\"] != \"false\") {\n            moreSettings[\"完整简介\"] = \"false\";\n            java.longToast(\"\\n❌已关闭完整简介\");\n        } else {\n            moreSettings[\"完整简介\"] = \"true\";\n            java.longToast(\"\\n✅已开启完整简介\");\n        }\n    }\n    this.setVariable(\"更多设置\", moreSettings, false);\n    this.setVariable(\"段评设置\", paraSettings, false);\n}\n\n// 按钮切换时改变源变量并刷新发现\nfunction show(m, t) {\n    const { java, source } = this;\n    let data = {};\n    try {\n        data = JSON.parse(source.getVariable())\n    } catch {}\n    data[t] = m;\n    if (t == \"发现页类型\") {\n        data[\"频道\"] = '男频';\n    }\n    source.setVariable(JSON.stringify(data, null, 2));\n    java.refreshExplore();\n}\n\nfunction createFilter(title, chars, defaultVal, paramKey, size, viewName) {\n    if (viewName == undefined) viewName = \"'请选择类型'\";\n    return {\n        title: title,\n        type: \"select\",\n        chars: chars,\n        default: defaultVal,\n        \"viewName\": viewName,\n        action: `show(infoMap['${title}'],'${paramKey}')`,\n        style: {\n            layout_flexGrow: 1,\n            layout_flexBasisPercent: size\n        }\n    };\n}\n\nfunction createText(title, action, defaultValue, size, viewName) {\n    return {\n      title: title,\n      type: 'text',\n      default: defaultValue || '',\n      action: action,\n      viewName: viewName || title,\n      style: {\n        layout_flexGrow: 1,\n        layout_flexBasisPercent: size\n      }\n    };\n}\n\nfunction createButton(title, action, size) {\n    return {\n      title: title,\n      type: 'butLine truncated
+    "loginUi": "[\n    {\n        \"name\": \"⚙️ 书源设置\",\n        \"type\": \"button\",\n        \"action\": \"getHtmlSettings()\",\n        \"style\": { \"layout_flexGrow\": 1, \"layout_flexBasisPercent\": 0.4 }\n    }, {\n        \"name\": \"🗨 段评设置\",\n        \"type\": \"button\",\n        \"action\": \"getSvgSettings()\",\n        \"style\": { \"layout_flexGrow\": 1, \"layout_flexBasisPercent\": 0.4 }\n    }, {\n        \"name\": \"===下方为备用设置方案===\",\n        \"type\": \"button\",\n        \"action\": \"\",\n        \"style\": { \"layout_flexGrow\": 1, \"layout_flexBasisPercent\": 1 }\n    }, {\n        \"name\": \"📖搜索小说\",\n        \"type\": \"button\",\n        \"action\": \"ste('小说')\",\n        \"style\": { \"layout_flexGrow\": 1, \"layout_flexBasisPercent\": 0.4 }\n    }, {\n        \"name\": \"🎧搜索听书\",\n        \"type\": \"button\",\n        \"action\": \"ste('听书')\",\n        \"style\": { \"layout_flexGrow\": 1, \"layout_flexBasisPercent\": 0.4 }\n    }, {\n        \"name\": \"🎥搜索短剧\",\n        \"type\": \"button\",\n        \"action\": \"ste('短剧')\",\n        \"style\": { \"layout_flexGrow\": 1, \"layout_flexBasisPercent\": 0.4 }\n    }, {\n        \"name\": \"🎨搜索漫画\",\n        \"type\": \"button\",\n        \"action\": \"ste('漫画')\",\n        \"style\": { \"layout_flexGrow\": 1, \"layout_flexBasisPercent\": 0.4 }\n    }, {\n        \"name\": \"段评开关\",\n        \"type\": \"button\",\n        \"action\": \"ste('段评')\",\n        \"style\": { \"layout_flexGrow\": 1, \"layout_flexBasisPercent\": 0.25 }\n    }, {\n        \"name\": \"图片开关\",\n        \"type\": \"button\",\n        \"action\": \"ste('图片')\",\n        \"style\": { \"layout_flexGrow\": 1, \"layout_flexBasisPercent\": 0.25 }\n    }, {\n        \"name\": \"简介开关\",\n        \"type\": \"button\",\n        \"action\": \"ste('简介')\",\n        \"style\": { \"layout_flexGrow\": 1, \"layout_flexBasisPercent\": 0.25 }\n    }, {\n        \"name\": \"⛔‼️ 清空还原设置\",\n        \"type\": \"button\",\n        \"action\": \"deleteVariable()\",\n        \"style\": { \"layout_flexGrow\": 1, \"layout_flexBasisPercent\": 1 }\n    }\n]",
+    "searchUrl": "<js>\nlet moreSettings = getVariable('更多设置');\nlet tab = moreSettings && moreSettings['搜索模式'] || '小说';\nvar k = String(key);\nlet m = k.match(/^[xtmdXTMD][:：]\\s*/);\nif (m) {\n    tab = { x: '小说', t: '听书', m: '漫画', d: '短剧' }[m[0][0].toLowerCase()];\n    k = k.slice(m[0].length);\n}\nlet tabType = { 小说: 3, 听书: 2, 漫画: 8, 短剧: 11 }[tab] || 3;\n`/search?query=${encodeURIComponent(k)}&offset=${(page - 1) * 10}&tab_type=${tabType}`;\n</js>",
+    "exploreUrl": "<js>\nvar base = String(source.getKey()).replace(/\\/$/, '');\nvar tab = getVariable('发现页类型') || '小说';\nvar channel = getVariable('频道') || '男频';\nvar wordNumMap = { '不限': '0', '30万字以内': '4', '100万字以内': '1', '30万-100万': '5', '100万-300万': '2', '300万字以上': '3', '100万字以上': '9' };\nvar updateMap = { '不限': '2', '完结': '0', '连载中': '1', '今日更新': '3' };\nvar sortMap = { '综合': '0', '热门': '24', '最新': '76', '评分': '12' };\nvar wordNum = getVariable('字数') || '不限';\nvar update = getVariable('更新') || '不限';\nvar sort = getVariable('排序') || '综合';\nvar q = `&word_number=${wordNumMap[wordNum] || '0'}&book_status=${updateMap[update] || '2'}&sort_by=${sortMap[sort] || '0'}`;\nvar tabCode = { 小说: 'n', 听书: 't', 漫画: 'm', 短剧: 'd' }[tab] || 'n';\n\nvar list = [];\nlist.push(createFilter('类型', ['小说', '听书', '短剧', '漫画'], tab, '发现页类型', 0.4));\nlist.push(createFilter('频道', ['男频', '女频'], channel, '频道', 0.4));\nlist.push(createText('搜索关键词', \"setVariable('搜索关键词',(infoMap['搜索关键词'] || (infoMap.get && infoMap.get('搜索关键词'))))\", getVariable('搜索关键词') || '', 0.5, \"'搜索书名或作者'\"));\nlist.push(createButton('🔍搜索', 'exploreSearch()', 0.3));\nlist.push({ title: '⚙️书源设置', type: 'button', action: 'getHtmlSettings()', style: { layout_flexGrow: 1, layout_flexBasisPercent: 0.25 } });\nlist.push({ title: '🗨段评设置', type: 'button', action: 'getSvgSettings()', style: { layout_flexGrow: 1, layout_flexBasisPercent: 0.25 } });\nlist.push(createFilter('字数', Object.keys(wordNumMap), wordNum, '字数', 0.4));\nlist.push(createFilter('更新', Object.keys(updateMap), update, '更新', 0.4));\nlist.push(createFilter('排序', Object.keys(sortMap), sort, '排序', 0.1));\n\nif (tab == '短剧') {\n    list.push({ title: '短剧暂无分类，请使用上方搜索 🔍', url: '', style: { layout_flexGrow: 1, layout_flexBasisPercent: 1 } });\n} else {\n    var ctab = tab == '小说' ? (channel == '女频' ? 0 : 1) : (tab == '听书' ? 3 : 5);\n    try {\n        var res = JSON.parse(java.ajax(base + '/category-front?tab=' + ctab));\n        var cells = ((res.data || {}).category_tab_data || {}).cell_data || [];\n        cells.forEach(function (cell) {\n            (cell.atom_data || []).forEach(function (a) {\n                var c = a.category_data;\n                if (c && c.category_id != null) {\n                    list.push({\n                        title: c.name,\n                        url: base + '/category-landing?category_id=' + c.category_id + '&offset={{(page-1)*20}}' + q + '&fqtab=' + tabCode,\n                        style: { layout_flexGrow: 1, layout_flexBasisPercent: 0.25 }\n                    });\n                }\n            });\n        });\n    } catch (e) {\n        java.toast('发现页分类获取失败');\n    }\n}\nJSON.stringify(list);\n</js>",
+    "ruleSearch": {
+      "bookList": "<js>\nvar d = JSON.parse(result);\nvar isVideo = /tab_type=11/.test(baseUrl);\nvar arr = [];\n(d.data || []).forEach(function (b) {\n    var list = isVideo ? (b.video_data || []) : (b.book_data || []);\n    list.forEach(function (x) {\n        if (isVideo) {\n            arr.push({\n                book_id: x.series_id,\n                book_name: x.title,\n                author: '',\n                abstract: x.rec_text || '',\n                thumb_url: x.horiz_cover || x.cover,\n                category: '短剧',\n                creation_status: '1',\n                score: x.score,\n                word_number: String(x.episode_cnt || '')\n            });\n        } else {\n            arr.push(x);\n        }\n    });\n});\narr;\n</js>",
+      "name": "$.book_name",
+      "author": "$.author",
+      "kind": "{{$.creation_status=='0'?'完结':'连载'}},{{$.category}},{{$.score}}分",
+      "wordCount": "$.word_number##^0+$",
+      "intro": "$.abstract",
+      "coverUrl": "$.thumb_url",
+      "bookUrl": "<js>\nvar t = /tab_type=11/.test(baseUrl) ? 'd' : /tab_type=2/.test(baseUrl) ? 't' : /tab_type=8/.test(baseUrl) ? 'm' : 'n';\n`/detail?book_id=${result.book_id}&fqtab=${t}`;\n</js>",
+      "checkKeyWord": "斗罗大陆"
+    },
+    "ruleExplore": {
+      "bookList": "$.data.book_info[*]",
+      "name": "$.book_name",
+      "author": "$.author",
+      "kind": "{{$.category}},{{$.score}}分",
+      "wordCount": "$.word_number##^0+$",
+      "intro": "$.abstract",
+      "coverUrl": "$.thumb_url",
+      "bookUrl": "<js>\nvar m = String(baseUrl).match(/fqtab=([ntmd])/);\n`/detail?book_id=${result.book_id}&fqtab=${m ? m[1] : 'n'}`;\n</js>"
+    },
+    "ruleBookInfo": {
+      "init": "$.data",
+      "name": "$.book_name",
+      "author": "$.author",
+      "kind": "{{$.creation_status=='0'?'完结':'连载'}},{{$.category}}",
+      "wordCount": "$.word_number##^0+$",
+      "lastChapter": "$.last_chapter_title",
+      "coverUrl": "$.thumb_url",
+      "intro": "<js>\nconst { book_id, last_chapter_title, last_chapter_update_time, word_number, score, abstract, read_count, category } = result;\nlet m0 = String(baseUrl).match(/fqtab=([ntmd])/);\nconst tab = { n: '小说', t: '听书', m: '漫画', d: '短剧' }[(m0 ? m0[1] : 'n')];\nlet moreSettings = getVariable('更多设置');\nconst lightDivider = \"❇️───────❇️───────❇️\";\nconst heavyDivider = \"&lrm;\\n&lrm;\";\nconst isValid = (v) => String(v).length > 1;\nlet ctitle = book.durChapterTitle || '未开始';\nconst two = (n) => ('0' + n).slice(-2);\nconst fmtTime = (t) => {\n    let n = parseInt(t);\n    if (!n || n <= 0) return '';\n    let d = new Date(n * 1000);\n    return `${d.getFullYear()}-${two(d.getMonth() + 1)}-${two(d.getDate())}`;\n};\nconst formatAbstract = (text) => String(text).split(\"\\n\").map(line => `    ${line}`).join(\"\\n\");\nconst buildBasicInfo = (items) => {\n    let info = \"\";\n    for (let [value, prefix, icon] of items) {\n        if (isValid(value)) info += `    ${icon} ${prefix} ${value}\\n`;\n    }\n    return info;\n};\nlet info = `    🏷 数据来源：番茄小说(fanqie-go)\\n    🔄 当前模式：${tab}\\n    📖 阅读至：${ctitle}\\n`;\nconst fullBasicInfo = buildBasicInfo([\n    [category, \"书籍分类：\", \"🌈\"],\n    [last_chapter_title, \"最新章节：\", \"📚\"],\n    [fmtTime(last_chapter_update_time), \"更新时间：\", \"⏳\"],\n    [word_number, \"书籍字数：\", \"📝\"],\n    [score, \"书籍评分：\", \"⭐\"],\n    [read_count, \"今阅读人数：\", \"📃\"]\n]);\nif (fullBasicInfo) info += `${lightDivider}\\n${fullBasicInfo}`;\nif (isValid(abstract)) info += `${heavyDivider}\\n    📖 书籍简介：\\n${formatAbstract(abstract)}\\n`;\ninfo += `${lightDivider}\\n${heavyDivider}\\n    数据更新于 ${new Date().toLocaleString()}\\n`;\nconst abstractMode = moreSettings && moreSettings['完整简介'] || 'true';\nif (abstractMode == \"false\") {\n    const simplifiedBasicInfo = buildBasicInfo([\n        [last_chapter_title, \"最新章节：\", \"📚\"],\n        [fmtTime(last_chapter_update_time), \"更新时间：\", \"⏳\"],\n        [word_number, \"书籍字数：\", \"📝\"],\n        [score, \"书籍评分：\", \"⭐\"]\n    ]);\n    info = `\\n&lrm;${isValid(abstract) ? `📖 书籍简介：\\n${formatAbstract(abstract)}\\n${heavyDivider}` : ''}🏷 数据来源：番茄小说\\n${simplifiedBasicInfo}`;\n} else {\n    info = info.split(\"\\n\").map(line => line.replace(/^ {4}/, \"\")).join(\"\\n\");\n}\ninfo;\n</js>",
+      "tocUrl": "<js>\nvar m = String(baseUrl).match(/fqtab=([ntmd])/);\n`/catalog?book_id=${result.book_id}&fqtab=${m ? m[1] : 'n'}`;\n</js>",
+      "canReName": "1"
+    },
+    "ruleToc": {
+      "chapterList": "<js>\n// 类型随书切换（照光遇 typeMap：安卓用 default，苹果端用其类型体系）\nconst typeMap = {\n    \"小说\": { \"苹果\": 0, \"default\": 8 },\n    \"听书\": { \"苹果\": 1, \"default\": 32 },\n    \"漫画\": { \"苹果\": 2, \"default\": 64 },\n    \"短剧\": { \"苹果\": 3, \"default\": 8 }\n};\nconst device_type = checkEnv();\nvar tabName = { n: '小说', t: '听书', m: '漫画', d: '短剧' }[fqTab(baseUrl, 'n')];\nvar currentType = typeMap[tabName] || typeMap[\"小说\"];\nif (device_type == '苹果') {\n    book.type = currentType[device_type];\n} else {\n    book.type = currentType.default;\n}\ntry {\n    book.imageStyle = checkEnv() == '改版' ? 'FULL' : 'TEXT';\n} catch (e) {}\nresult;\n</js>$.data.item_data_list[*]",
+      "chapterName": "$.title",
+      "chapterUrl": "<js>\nvar t = fqTab(baseUrl, 'n');\nvar id = result.item_id;\nvar u = {\n    n: `/content?item_id=${id}&text_mode=html&review=keep&image_mode=keep&fqtab=n`,\n    t: `/audio?item_ids=${id}&fqtab=t`,\n    m: `/manga?item_ids=${id}&output=proxy&fqtab=m`,\n    d: `/video?item_ids=${id}&fqtab=d`\n}[t];\nu;\n</js>"
+    },
+    "ruleContent": {
+      "content": "<js>\nvar t = fqTab(baseUrl, 'n');\nlet moreSettings = getVariable('更多设置');\nlet dpSettings = getVariable('段评设置');\nlet islyc = checkEnv();\n\nif (t == 't') {\n    // 听书：直接返回音频地址\n    JSON.parse(result).data[0].main_url;\n} else if (t == 'm') {\n    // 漫画：拼装图片\n    var d = JSON.parse(result);\n    var org = String(baseUrl).match(/^https?:\\/\\/[^\\/]+/)[0];\n    var imgs = (d.data || {}).images || [];\n    var out = [];\n    for (var i = 0; i < imgs.length; i++) {\n        out.push('<img src=\"' + org + imgs[i].data + '\">');\n    }\n    out.join('\\n');\n} else if (t == 'd') {\n    // 短剧：选最高清晰度，当前章节自动唤起播放\n    var d = JSON.parse(result).data || {};\n    var vl = d.video_list || {};\n    var list = [];\n    for (var k in vl) { list.push(vl[k]); }\n    list.sort(function (a, b) { return (b.vheight || 0) - (a.vheight || 0); });\n    var org = String(baseUrl).match(/^https?:\\/\\/[^\\/]+/)[0];\n    var url = list.length ? String(list[0].main_url) : '';\n    if (url && url.indexOf('http') != 0) { url = org + url; }\n    if (url && book.durChapterIndex == chapter.index) {\n        java.startBrowser(url, chapter.title);\n    }\n    '▶️ 本集已唤起播放（菜单-刷新可重新打开）：\\n' + url;\n} else {\n    // 小说：正文 + 段评气泡\n    var d = JSON.parse(result);\n    var content = String((d.data || {}).content || '');\n    let show_img = moreSettings && moreSettings['显示图片'] || 'true';\n    if (show_img == 'false') {\n        content = removeAllImgTags(content);\n    }\n    let para = dpSettings && dpSettings['段评开关'] || 'true';\n    if (para == 'true' && content.indexOf('<comment') != -1) {\n        content = islyc == '苹果' ? paraForiOS(content, '番茄') : paraForAndroid(content, '番茄');\n    }\n    content;\n}\n</js>",
+      "title": "$.data.title"
+    }
+  }
+]

cmd/fanqie/main.go

@@ -76,6 +76,7 @@ func main() {
 		logger.Error("设备密钥池初始化失败: " + err.Error())
 		os.Exit(1)
 	}
+	defer fqapi.FlushDevicePool() // 程序退出时落盘设备使用记录
 
 	// 设置路由
 	setupRoutes()
@@ -164,6 +165,9 @@ func setupRoutes() {
 	http.HandleFunc("/catalog", wrap(handlers.HandleCatalog))
 	http.HandleFunc("/directory/all_items", wrap(handlers.HandleCatalog))
 	http.HandleFunc("/multi-detail", wrap(handlers.HandleMultiDetail))
+	http.HandleFunc("/rank", wrap(handlers.HandleRank))
+	http.HandleFunc("/bookshelf", wrap(handlers.HandleBookshelf))
+	http.HandleFunc("/read-history", wrap(handlers.HandleReadHistory))
 	http.HandleFunc("/multi-content", wrap(handlers.HandleMultiContent))
 	http.HandleFunc("/content", wrap(handlers.HandleContent))
 	http.HandleFunc("/item-summary", wrap(handlers.HandleItemSummary))
@@ -172,6 +176,7 @@ func setupRoutes() {
 	http.HandleFunc("/audio", wrap(handlers.HandleAudio))
 	http.HandleFunc("/audio/proxy/", wrap(handlers.HandleAudioProxy))
 	http.HandleFunc("/video", wrap(handlers.HandleVideo))
+	http.HandleFunc("/video/proxy/", wrap(handlers.HandleVideoProxy))
 	http.HandleFunc("/manga", wrap(handlers.HandleManga))
 	http.HandleFunc("/manga/image/", wrap(handlers.HandleMangaImageProxy))
 

config/config.yaml

@@ -51,6 +51,21 @@ fanqie:
     # 是否启用段评功能（默认true，启用段评）
     enable_review: true
 
+  # 视频处理配置
+  video:
+    # 输出模式：proxy / url
+    # proxy: 返回本地解密代理URL /video/proxy/{key}（已解密，可直接播放，推荐）
+    # url: 返回原始CDN链接（内容为 CENC 加密，需自行解密）
+    output_mode: "proxy"
+
+    # 默认清晰度：max（最高档）/ 360p/480p/540p/720p / 档位 key（video_1..N）
+    # 留空返回全部清晰度；/video 接口的 quality 参数优先于此配置
+    quality: "max"
+
+    # 解密后视频的磁盘缓存（同一视频重复播放直接读本地文件，无需重新下载解密）
+    cache_enabled: true
+    cache_path: "./video_cache"
+
   # 漫画处理配置
   manga:
     # 输出模式：proxy / data_uri / url

deploy.sh

@@ -7,10 +7,16 @@
 #   ./deploy.sh v1.2.0                # 编译 + 部署（指定版本）
 #   ./deploy.sh v1.2.0 --init         # 首次初始化（写 systemd/nginx 配置）
 #   ./deploy.sh v1.2.0 --no-pull      # 跳过 git pull
+#   ./deploy.sh v1.2.0 --no-autostart # 部署后不开机自启
+#   ./deploy.sh v1.2.0 --no-restart   # 只部署，不重启服务
+#   ./deploy.sh --stop                # 停止服务
+#   ./deploy.sh --start               # 启动服务
+#   ./deploy.sh --clean               # 清除所有部署内容（服务/nginx/证书），重新 --init 前用
 #   ./deploy.sh --build-only          # 只编译，不部署
 #   ./deploy.sh --rollback            # 交互式回滚到指定版本
 #   ./deploy.sh --rollback v1.0.0     # 直接回滚到指定版本
 #   ./deploy.sh --list                # 列出所有已部署版本
+#   ./deploy.sh --sync-nginx          # 更新线上 nginx 配置（备份+校验+失败回滚）
 #   ./deploy.sh --help                # 显示帮助
 # ============================================================
 
@@ -35,9 +41,11 @@ NGINX_CONF="${NGINX_CONF:-/etc/nginx/conf.d/${APP_NAME}.conf}"
 APP_PORT="${APP_PORT:-40180}"              # 程序监听端口
 DOMAIN="${DOMAIN:-fq.20010117.xyz}"        # 域名
 CERT_EMAIL="${CERT_EMAIL:-admin@${DOMAIN}}"  # 证书申请邮箱（过期提醒）
+CERT_DIR="${CERT_DIR:-/etc/nginx/ssl}"       # 证书目录（acme.sh --install-cert 安装位置）
 BUILD_TARGET="${BUILD_TARGET:-./cmd/fanqie}"  # go build 的包路径
 ENV_FILE="${ENV_FILE:-${SRC_DIR}/.env}"    # 应用环境变量（.env.example 为模板）
 KEEP_VERSIONS="${KEEP_VERSIONS:-5}"        # 保留最近几个版本
+AUTO_START="${AUTO_START:-true}"           # 服务是否开机自启（--no-autostart 覆盖）
 
 # ==================== 颜色与日志 ====================
 C_GREEN='\033[1;32m'; C_YELLOW='\033[1;33m'; C_RED='\033[1;31m'; C_BLUE='\033[1;34m'; C_RESET='\033[0m'
@@ -61,6 +69,12 @@ ROLLBACK=false
 ROLLBACK_VERSION=""
 LIST=false
 FORCE=false
+SYNC_NGINX=false
+AUTO_START="${AUTO_START:-true}"
+NO_RESTART=false
+STOP=false
+START=false
+CLEAN=false
 
 print_help() {
   cat <<EOF
@@ -69,10 +83,17 @@ print_help() {
 选项:
   --init                首次初始化，写入 systemd 和 nginx 配置
   --no-pull             跳过 git pull
+  --no-autostart        服务不设置开机自启（默认自启）
+  --no-restart          只部署不重启服务（自启设置仍会应用）
+  --stop                停止服务后退出
+  --start               启动服务后退出
+  --clean               清除本脚本部署的全部内容（服务/nginx/二进制/证书，含 certbot 残留；
+                        保留 SRC_DIR 下的 .env/配置/数据库），之后重新 --init 即可
   --build-only          只编译，不部署、不重启服务
   --force, -f           允许覆盖已存在的同名版本（默认报错退出）
   --rollback [版本]     回滚到指定版本（不带版本号则交互式选择）
   --list                列出所有已部署的版本
+  --sync-nginx          只更新 nginx 配置（备份旧配置，校验失败自动回滚）
   --help, -h            显示此帮助
 
 示例:
@@ -93,6 +114,11 @@ while [ $i -lt ${#ARGS[@]} ]; do
   case "$arg" in
     --init)        INIT=true ;;
     --no-pull)     NO_PULL=true ;;
+    --no-autostart) AUTO_START=false ;;
+    --no-restart)  NO_RESTART=true ;;
+    --stop)        STOP=true ;;
+    --start)       START=true ;;
+    --clean)       CLEAN=true ;;
     --build-only)  BUILD_ONLY=true ;;
     --rollback)
       ROLLBACK=true
@@ -103,6 +129,7 @@ while [ $i -lt ${#ARGS[@]} ]; do
       fi
       ;;
     --list)        LIST=true ;;
+    --sync-nginx)  SYNC_NGINX=true ;;
     --force|-f)    FORCE=true ;;
     --help|-h)     print_help; exit 0 ;;
     v*)            VERSION="$arg" ;;
@@ -167,28 +194,72 @@ cleanup_old_versions() {
   done
 }
 
-# 重启服务 + 验证
+# 定位 acme.sh：PATH → 当前用户目录 → root 目录（sudo 后 HOME 可能被重置）
-restart_and_verify() {
+find_acme_sh() {
-  log "重启 ${APP_NAME} 服务..."
+  local acme
-  # 注意：不要用 "list-unit-files | grep -q"——grep -q 提前退出会让 systemctl 收到
+  acme="$(command -v acme.sh 2>/dev/null || true)"
-  # SIGPIPE，在 pipefail 下整条管道判假（unit 多的机器必踩），误报"服务不存在"
+  for c in "${HOME}/.acme.sh/acme.sh" "/root/.acme.sh/acme.sh"; do
-  if systemctl cat "${APP_NAME}" >/dev/null 2>&1; then
+    if [ -z "$acme" ] && [ -x "$c" ]; then acme="$c"; fi
-    $SUDO systemctl restart "${APP_NAME}"
+  done
+  echo "$acme"
+}
+
+# 删除已存在的路径并逐项记录（文件/目录/glob 展开结果均可，不存在则跳过）
+rm_logged() {
+  local p
+  for p in "$@"; do
+    if [ -e "$p" ] || [ -L "$p" ]; then
+      $SUDO rm -rf "$p"
+      log "  已删除: $p"
+    fi
+  done
+}
+
+# 应用开机自启设置（AUTO_START 由 --no-autostart / .deploy.env 决定）
+apply_autostart() {
+  if [ "$AUTO_START" = true ]; then
     $SUDO systemctl enable "${APP_NAME}" >/dev/null 2>&1 || true
   else
+    $SUDO systemctl disable "${APP_NAME}" >/dev/null 2>&1 || true
+    info "开机自启已禁用（--no-autostart）"
+  fi
+}
+
+# 重启服务 + 验证
+restart_and_verify() {
+  # 注意：不要用 "list-unit-files | grep -q"——grep -q 提前退出会让 systemctl 收到
+  # SIGPIPE，在 pipefail 下整条管道判假（unit 多的机器必踩），误报"服务不存在"
+  if ! systemctl cat "${APP_NAME}" >/dev/null 2>&1; then
     warn "服务 ${APP_NAME}.service 不存在，请先执行 $0 --init"
     return 0
   fi
 
+  apply_autostart
+
+  if [ "$NO_RESTART" = true ]; then
+    info "跳过服务重启（--no-restart），需要时执行: sudo systemctl restart ${APP_NAME}"
+    return 0
+  fi
+
+  log "重启 ${APP_NAME} 服务..."
+  $SUDO systemctl restart "${APP_NAME}"
+
   if command -v nginx >/dev/null 2>&1; then
     $SUDO systemctl reload nginx 2>/dev/null || $SUDO nginx -s reload 2>/dev/null || true
   fi
 
-  sleep 2
-
   # 健康自检：确认服务真正响应，而非仅进程存活
+  # 应用启动时初始化设备池（逐个注册设备）较慢，轮询等待就绪，最多 60s
   if command -v curl >/dev/null 2>&1; then
-    if curl -fsS --max-time 5 "http://127.0.0.1:${APP_PORT}/healthz" >/dev/null 2>&1; then
+    healthy=false
+    for _ in $(seq 1 30); do
+      if curl -fsS --max-time 2 "http://127.0.0.1:${APP_PORT}/healthz" >/dev/null 2>&1; then
+        healthy=true
+        break
+      fi
+      sleep 2
+    done
+    if [ "$healthy" = true ]; then
       log "健康检查通过: /healthz"
     else
       err "健康检查失败: http://127.0.0.1:${APP_PORT}/healthz"
@@ -206,12 +277,222 @@ restart_and_verify() {
   $SUDO journalctl -u "${APP_NAME}" -n 15 --no-pager || true
 }
 
+
+# 写入 nginx 配置（--init 与 --sync-nginx 共用的唯一模板来源）
+# 模板自带完整 443/证书配置（证书存在时启用），不依赖签发工具注入——
+# 这样 --sync-nginx 覆盖配置时不会丢失 HTTPS 段（注入式配置会被覆盖回 80-only）
+write_nginx_conf() {
+  # 反代 location（80 无证书时与 443 共用）
+  local proxy_locations
+  proxy_locations=$(cat <<LOC_EOF
+
+    # 视频解密代理：关闭缓冲，分片（Range/206）直通，避免 nginx 对大文件二次落盘
+    location /video/proxy/ {
+        proxy_pass http://127.0.0.1:${APP_PORT};
+        proxy_http_version 1.1;
+        proxy_set_header Host \$host;
+        proxy_set_header X-Real-IP \$remote_addr;
+        proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto \$scheme;
+        proxy_buffering off;
+        proxy_read_timeout 300s;
+        proxy_send_timeout 300s;
+    }
+
+    location / {
+        proxy_pass http://127.0.0.1:${APP_PORT};
+        proxy_http_version 1.1;
+        proxy_set_header Host \$host;
+        proxy_set_header X-Real-IP \$remote_addr;
+        proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto \$scheme;
+        proxy_set_header Upgrade \$http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_read_timeout 300s;
+        proxy_send_timeout 300s;
+    }
+LOC_EOF
+)
+
+  local ssl_block=""
+  if [ -f "${CERT_DIR}/${DOMAIN}/fullchain.pem" ]; then
+    log "检测到 ${DOMAIN} 证书，配置启用 443"
+    ssl_block=$(cat <<SSL_EOF
+
+server {
+    listen 443 ssl http2;
+    server_name ${DOMAIN};
+
+    ssl_certificate     ${CERT_DIR}/${DOMAIN}/fullchain.pem;
+    ssl_certificate_key ${CERT_DIR}/${DOMAIN}/privkey.pem;
+    ssl_protocols TLSv1.2 TLSv1.3;
+
+    access_log /var/log/nginx/${APP_NAME}.access.log;
+    error_log  /var/log/nginx/${APP_NAME}.error.log;
+${proxy_locations}
+}
+SSL_EOF
+)
+  else
+    warn "未找到 ${CERT_DIR}/${DOMAIN}/ 证书，本次仅写 80 配置（不跳转 HTTPS）；证书签发后重跑: $0 --sync-nginx"
+  fi
+
+  # 80 端口：有证书时仅 ACME 验证 + 301 跳转；无证书时直接反代
+  local root_location
+  if [ -n "${ssl_block}" ]; then
+    root_location='    location / {
+        return 301 https://$host$request_uri;
+    }'
+  else
+    root_location="${proxy_locations}"
+  fi
+
+  $SUDO tee "${NGINX_CONF}" >/dev/null <<NGINX_EOF
+server {
+    listen 80;
+    server_name ${DOMAIN};
+
+    access_log /var/log/nginx/${APP_NAME}.access.log;
+    error_log  /var/log/nginx/${APP_NAME}.error.log;
+
+    # ACME http-01 验证（acme.sh webroot 模式依赖）
+    location /.well-known/acme-challenge/ {
+        root /var/www/html;
+    }
+
+${root_location}
+}${ssl_block}
+NGINX_EOF
+
+  # 写入后立即校验并重载：ACME 验证必须打到最新配置，
+  # 否则签发时线上仍是内存里的旧配置（80→301→443→反代→404），验证必败
+  if $SUDO nginx -t 2>/dev/null; then
+    $SUDO systemctl reload nginx 2>/dev/null || $SUDO nginx -s reload 2>/dev/null || true
+  fi
+}
+
+# 更新已部署服务器的 nginx 配置：备份 → 重写 → 校验 → 失败回滚
+sync_nginx_conf() {
+  local backup=""
+  if [ -f "${NGINX_CONF}" ]; then
+    backup="${NGINX_CONF}.bak.$(date +%Y%m%d%H%M%S)"
+    $SUDO cp "${NGINX_CONF}" "${backup}"
+    log "已备份原配置: ${backup}"
+  else
+    warn "nginx 配置不存在，将写入全新配置: ${NGINX_CONF}"
+  fi
+
+  write_nginx_conf
+  log "已写入新配置: ${NGINX_CONF}"
+
+  if $SUDO nginx -t; then
+    $SUDO systemctl reload nginx 2>/dev/null || $SUDO nginx -s reload 2>/dev/null || true
+    log "nginx 配置已更新并重载"
+  else
+    err "nginx -t 校验失败"
+    if [ -n "${backup}" ] && [ -f "${backup}" ]; then
+      $SUDO cp "${backup}" "${NGINX_CONF}"
+      if $SUDO nginx -t >/dev/null 2>&1; then
+        $SUDO systemctl reload nginx 2>/dev/null || $SUDO nginx -s reload 2>/dev/null || true
+        warn "已回滚到备份配置: ${backup}"
+      fi
+    fi
+    exit 1
+  fi
+}
+
 # ==================== --list ====================
 if [ "$LIST" = true ]; then
   list_versions
   exit 0
 fi
 
+# ==================== --sync-nginx ====================
+# 只更新 nginx 配置（给已部署服务器同步模板变更用），不动二进制与服务
+if [ "$SYNC_NGINX" = true ]; then
+  command -v nginx >/dev/null 2>&1 || { err "未找到 nginx"; exit 1; }
+  sync_nginx_conf
+  exit 0
+fi
+
+# ==================== --stop / --start ====================
+if [ "$STOP" = true ] || [ "$START" = true ]; then
+  systemctl cat "${APP_NAME}" >/dev/null 2>&1 || { err "服务 ${APP_NAME}.service 不存在，请先执行 $0 --init"; exit 1; }
+  if [ "$STOP" = true ]; then
+    $SUDO systemctl stop "${APP_NAME}"
+    log "✅ 已停止 ${APP_NAME}（开机自启设置不变）"
+  else
+    $SUDO systemctl start "${APP_NAME}"
+    sleep 1
+    $SUDO systemctl status "${APP_NAME}" --no-pager -l | head -n 15 || true
+  fi
+  exit 0
+fi
+
+# ==================== --clean ====================
+# 清除本脚本部署的全部内容，便于重新 --init 初次部署
+if [ "$CLEAN" = true ]; then
+  warn "将删除以下内容："
+  echo "  - systemd 服务: ${SERVICE_FILE}"
+  echo "  - nginx 配置:   ${NGINX_CONF}（含 --sync-nginx 的 .bak.* 备份）"
+  echo "  - 二进制目录:   ${BIN_DIR}"
+  echo "  - 证书:         ${CERT_DIR}/${DOMAIN}、acme.sh 中该域名的全部数据、certbot 残留"
+  echo "  （保留 ${SRC_DIR} 下的 .env / 配置 / 数据库；acme.sh 本体保留供重新部署使用）"
+  read -rp "确认清理？输入 yes 继续: " REPLY
+  [ "$REPLY" = "yes" ] || { info "已取消"; exit 0; }
+
+  echo ""
+  log "开始清理，实际删除项："
+
+  # 服务
+  if systemctl cat "${APP_NAME}" >/dev/null 2>&1; then
+    $SUDO systemctl disable --now "${APP_NAME}" || true
+    $SUDO rm -f "${SERVICE_FILE}"
+    $SUDO systemctl daemon-reload
+    log "  已删除: ${SERVICE_FILE}（服务已停止并取消自启）"
+  fi
+
+  # nginx 配置（含 --sync-nginx 产生的 .bak.* 备份）
+  if [ -f "${NGINX_CONF}" ] || ls "${NGINX_CONF}".bak.* >/dev/null 2>&1; then
+    rm_logged "${NGINX_CONF}" "${NGINX_CONF}".bak.*
+    if $SUDO nginx -t 2>/dev/null; then
+      $SUDO systemctl reload nginx 2>/dev/null || $SUDO nginx -s reload 2>/dev/null || true
+      log "  nginx 已重载"
+    fi
+  fi
+
+  # 二进制与版本目录
+  rm_logged "${BIN_DIR}"
+
+  # 证书：移除 acme.sh 管理（--remove 不吊销，LE 证书自然过期），删安装目录
+  # 及 acme.sh 域名数据（含验证失败残留的 domain key，否则重签会要求 --force）
+  ACME_SH="$(find_acme_sh)"
+  if [ -n "$ACME_SH" ]; then
+    $SUDO "$ACME_SH" --remove -d "${DOMAIN}" >/dev/null 2>&1 || true
+  fi
+  rm_logged "${CERT_DIR}/${DOMAIN}" \
+            "${HOME}/.acme.sh/${DOMAIN}_ecc" "${HOME}/.acme.sh/${DOMAIN}" \
+            "/root/.acme.sh/${DOMAIN}_ecc" "/root/.acme.sh/${DOMAIN}"
+
+  # certbot 残留（历史部署用 certbot 时遗留）
+  if command -v certbot &>/dev/null; then
+    if systemctl is-enabled certbot.timer >/dev/null 2>&1; then
+      $SUDO systemctl disable --now certbot.timer
+      log "  已停用: certbot.timer"
+    fi
+    if [ -d "/etc/letsencrypt/live/${DOMAIN}" ]; then
+      $SUDO certbot delete --cert-name "${DOMAIN}" --non-interactive >/dev/null 2>&1 || true
+    fi
+  fi
+  rm_logged "/etc/letsencrypt/live/${DOMAIN}" "/etc/letsencrypt/archive/${DOMAIN}" \
+            "/etc/letsencrypt/renewal/${DOMAIN}.conf" \
+            "/etc/letsencrypt/renewal-hooks/deploy/reload-nginx.sh"
+
+  echo ""
+  log "✅ 清理完成。重新部署: $0 --init"
+  exit 0
+fi
+
 # ==================== --rollback ====================
 if [ "$ROLLBACK" = true ]; then
   if [ ! -d "${BIN_DIR}" ]; then
@@ -326,55 +607,31 @@ WantedBy=multi-user.target
 EOF
 
   log "初始化 Nginx 配置: ${NGINX_CONF}"
-  $SUDO tee "${NGINX_CONF}" >/dev/null <<EOF
+  write_nginx_conf
-server {
-    listen 80;
-    server_name ${DOMAIN};
-
-    access_log /var/log/nginx/${APP_NAME}.access.log;
-    error_log  /var/log/nginx/${APP_NAME}.error.log;
-
-    location / {
-        proxy_pass http://127.0.0.1:${APP_PORT};
-        proxy_http_version 1.1;
-        proxy_set_header Host \$host;
-        proxy_set_header X-Real-IP \$remote_addr;
-        proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto \$scheme;
-        proxy_set_header Upgrade \$http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_read_timeout 300s;
-        proxy_send_timeout 300s;
-    }
-}
-EOF
 
 
-  # ---- Certbot 续期后自动重载 Nginx（deploy-hook 只在续期成功时执行）----
+  # ---- 首次初始化自动申请 HTTPS 证书（一次性；续期由 acme.sh cron 自动处理）----
-  HOOK_FILE="/etc/letsencrypt/renewal-hooks/deploy/reload-nginx.sh"
+  if [ -f "${CERT_DIR}/${DOMAIN}/fullchain.pem" ]; then
-  if [ ! -f "${HOOK_FILE}" ]; then
-    log "创建 Certbot 续期重载 Hook: ${HOOK_FILE}"
-    $SUDO mkdir -p /etc/letsencrypt/renewal-hooks/deploy/
-    $SUDO tee "${HOOK_FILE}" >/dev/null <<'HOOK'
-#!/bin/bash
-if /usr/sbin/nginx -t 2>/dev/null; then
-    systemctl reload nginx
-fi
-HOOK
-    $SUDO chmod +x "${HOOK_FILE}"
-  fi
-
-  # ---- 首次初始化自动申请 HTTPS 证书（一次性；续期由 certbot.timer 自动处理）----
-  if [ ! -d "/etc/letsencrypt/live/${DOMAIN}" ]; then
-    if command -v certbot >/dev/null 2>&1; then
-      log "未检测到证书，尝试自动申请: ${DOMAIN}"
-      $SUDO certbot --nginx -d "${DOMAIN}" --non-interactive --agree-tos -m "${CERT_EMAIL}" --redirect \
-        || warn "证书申请失败，请检查域名解析与 80 端口；可稍后手动执行 certbot --nginx -d ${DOMAIN}"
-    else
-      warn "未安装 certbot，跳过证书申请。可手动执行: dnf install certbot python3-certbot-nginx"
-    fi
-  else
     log "证书已存在，跳过申请"
+  else
+    ACME_SH="$(find_acme_sh)"
+    if [ -z "$ACME_SH" ]; then
+      err "未找到 acme.sh，请先安装: curl https://get.acme.sh | sh -s email=${CERT_EMAIL}"
+      exit 1
+    fi
+    log "未检测到证书，使用 acme.sh 申请: ${DOMAIN}"
+    $SUDO mkdir -p /var/www/html "${CERT_DIR}/${DOMAIN}"
+    # --force：上次验证失败会残留 domain key，重试时 acme.sh 拒绝覆盖要求 --force
+    if $SUDO "$ACME_SH" --issue -d "${DOMAIN}" -w /var/www/html --server letsencrypt --keylength ec-256 -m "${CERT_EMAIL}" --force \
+       && $SUDO "$ACME_SH" --install-cert -d "${DOMAIN}" --ecc \
+            --fullchain-file "${CERT_DIR}/${DOMAIN}/fullchain.pem" \
+            --key-file "${CERT_DIR}/${DOMAIN}/privkey.pem" \
+            --reloadcmd "systemctl reload nginx"; then
+      log "证书申请成功，写入 443 配置..."
+      write_nginx_conf
+    else
+      warn "证书申请失败，请检查域名解析与 80 端口；成功后重跑: $0 --sync-nginx"
+    fi
   fi
 
   if command -v getenforce >/dev/null 2>&1 && [ "$(getenforce)" != "Disabled" ]; then

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/mattn/go-sqlite3 v1.14.18
 	github.com/redis/go-redis/v9 v9.22.0
 	github.com/spf13/viper v1.18.2
+	golang.org/x/sync v0.17.0
 	golang.org/x/time v0.5.0
 )
 
@@ -35,7 +36,6 @@ require (
 	go.uber.org/multierr v1.9.0 // indirect
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
 	golang.org/x/net v0.46.0 // indirect
-	golang.org/x/sync v0.17.0 // indirect
 	golang.org/x/sys v0.37.0 // indirect
 	golang.org/x/text v0.30.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect

internal/algos/signer.go

@@ -74,6 +74,7 @@ func Sign4(
 	// 添加 Ladon 和 Argus 签名
 	ladon := &Ladon{}
 	result["x-ladon"] = ladon.Encrypt(timestamp, licenseID, aid)
+	result["x-helios"] = result["x-ladon"] // X-Helios 与 X-Ladon 同值（对齐书源实现）
 
 	argus := &Argus{}
 	result["x-argus"] = argus.GetSign(

internal/config/config.go

@@ -39,8 +39,11 @@ type RequestLogConfig struct {
 type FanqieConfig struct {
 	Algorithm string        `mapstructure:"algorithm"`
 	Signature string        `mapstructure:"signature"` // 签名方法: sign2 / sign4
+	// 注册设备身份: pad（默认，历史行为）/ phone（对齐手机 App 书源注册 payload）
+	DeviceIdentity string   `mapstructure:"device_identity"`
 	Content   ContentConfig `mapstructure:"content"`
 	Manga     MangaConfig   `mapstructure:"manga"`
+	Video     VideoConfig   `mapstructure:"video"`
 }
 
 // ContentConfig 内容处理配置
@@ -60,6 +63,14 @@ type MangaConfig struct {
 	OutputMode string `mapstructure:"output_mode"` // 输出模式: data_uri / base64 / url
 }
 
+// VideoConfig 视频处理配置
+type VideoConfig struct {
+	OutputMode   string `mapstructure:"output_mode"`  // 输出模式: url（原始CDN链接，内容加密）/ proxy（本地解密代理，可直接播放）
+	Quality      string `mapstructure:"quality"`      // 默认清晰度: max（最高档）/ 360p/480p/... 或档位 key（video_1..N），留空返回全部
+	CacheEnabled bool   `mapstructure:"cache_enabled"` // 解密后视频的磁盘缓存
+	CachePath    string `mapstructure:"cache_path"`    // 缓存目录
+}
+
 // CacheConfig 缓存配置
 type CacheConfig struct {
 	Enabled        bool           `mapstructure:"enabled"`
@@ -183,6 +194,7 @@ func setDefaults() {
 	// 番茄小说配置
 	viper.SetDefault("fanqie.algorithm", "gorgon")
 	viper.SetDefault("fanqie.signature", "sign2")
+	viper.SetDefault("fanqie.device_identity", "pad")
 	
 	// 内容处理配置
 	viper.SetDefault("fanqie.content.remove_images", false)
@@ -197,6 +209,12 @@ func setDefaults() {
 	// 漫画处理配置
 	viper.SetDefault("fanqie.manga.output_mode", "url")
 
+	// 视频处理配置
+	viper.SetDefault("fanqie.video.output_mode", "proxy")
+	viper.SetDefault("fanqie.video.quality", "max")
+	viper.SetDefault("fanqie.video.cache_enabled", true)
+	viper.SetDefault("fanqie.video.cache_path", "./video_cache")
+
 	// 缓存配置
 	viper.SetDefault("cache.enabled", true)
 	viper.SetDefault("cache.backend", "sqlite")

internal/config/video_config_test.go

@@ -0,0 +1,46 @@
+package config
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/spf13/viper"
+)
+
+// video 段配置读取：显式值生效、缺省回落 viper 默认值
+func TestVideoConfig(t *testing.T) {
+	dir := t.TempDir()
+	path := filepath.Join(dir, "config.yaml")
+	os.WriteFile(path, []byte(`
+fanqie:
+  video:
+    output_mode: "proxy"
+    quality: "720p"
+`), 0644)
+
+	v := viper.New()
+	v.SetConfigFile(path)
+	if err := v.ReadInConfig(); err != nil {
+		t.Fatal(err)
+	}
+	var c Config
+	if err := v.Unmarshal(&c); err != nil {
+		t.Fatal(err)
+	}
+	if c.Fanqie.Video.OutputMode != "proxy" || c.Fanqie.Video.Quality != "720p" {
+		t.Fatalf("显式配置未生效: %+v", c.Fanqie.Video)
+	}
+
+	// 缺省回落
+	v2 := viper.New()
+	v2.SetDefault("fanqie.video.output_mode", "url")
+	v2.SetDefault("fanqie.video.quality", "")
+	var c2 Config
+	if err := v2.Unmarshal(&c2); err != nil {
+		t.Fatal(err)
+	}
+	if c2.Fanqie.Video.OutputMode != "url" || c2.Fanqie.Video.Quality != "" {
+		t.Fatalf("默认值不符: %+v", c2.Fanqie.Video)
+	}
+}

internal/fqapi/audio_proxy.go

@@ -52,54 +52,61 @@ func GenerateAudioProxyURL(originalURL, deviceID string, headers map[string]stri
 	return fmt.Sprintf("/audio/proxy/%s", key)
 }
 
-// HandleAudioProxy 处理音频代理请求（流式返回，调用方负责 Close）
+// loadMediaProxyEntry 读取媒体代理映射（audio/video 共用；Redis 优先，回退 SQL）
-func HandleAudioProxy(key string) (io.ReadCloser, string, error) {
+type mediaProxyEntry struct {
-	var originalURL, deviceID string
+	OriginalURL string
-	var headers map[string]string
+	DeviceID    string
+	Headers     map[string]string
+}
 
+func loadMediaProxyEntry(key string) (*mediaProxyEntry, error) {
 	if redisCache != nil {
 		entry, err := loadAudioProxyEntry(key)
 		if err != nil {
-			return nil, "", err
+			return nil, err
+		}
+		return &mediaProxyEntry{OriginalURL: entry.OriginalURL, DeviceID: entry.DeviceID, Headers: entry.Headers}, nil
 	}
-		originalURL, deviceID, headers = entry.OriginalURL, entry.DeviceID, entry.Headers
-	} else {
 	if cacheDB == nil {
-			return nil, "", fmt.Errorf("数据库未初始化")
+		return nil, fmt.Errorf("数据库未初始化")
 	}
 
-		// 从数据库获取音频信息
+	var originalURL, deviceID, headersJSON string
-		var headersJSON string
 	var createdAt int64
-
 	err := cacheDB.QueryRow(q(`
 		SELECT original_url, device_id, headers, created_at
 		FROM audio_cache WHERE key = ?
 	`), key).Scan(&originalURL, &deviceID, &headersJSON, &createdAt)
 
 	if err == sql.ErrNoRows {
-			return nil, "", fmt.Errorf("音频信息不存在，请先调用 /audio 接口")
+		return nil, fmt.Errorf("媒体信息不存在，请先调用 /audio 或 /video 接口")
 	}
 	if err != nil {
-			return nil, "", fmt.Errorf("查询音频缓存失败: %w", err)
+		return nil, fmt.Errorf("查询媒体缓存失败: %w", err)
 	}
-
+	// 过期清理（2小时，匹配CDN链接有效期）
-		// 检查缓存是否过期（2小时，匹配CDN链接有效期）
+	if time.Now().Unix()-createdAt > 7200 {
-		if time.Now().Unix()-createdAt > 7200 { // 2小时 = 7200秒
-			// 清理过期缓存
 		cacheDB.Exec(q("DELETE FROM audio_cache WHERE key = ?"), key)
-			return nil, "", fmt.Errorf("音频信息已过期，请重新调用 /audio 接口")
+		return nil, fmt.Errorf("媒体信息已过期，请重新调用接口")
 	}
 
-		// 解析headers
+	var headers map[string]string
 	json.Unmarshal([]byte(headersJSON), &headers)
-	}
 	if headers == nil {
 		headers = make(map[string]string)
 	}
+	return &mediaProxyEntry{OriginalURL: originalURL, DeviceID: deviceID, Headers: headers}, nil
+}
+
+// HandleAudioProxy 处理音频代理请求（流式返回，调用方负责 Close）
+func HandleAudioProxy(key string) (io.ReadCloser, string, error) {
+	entry, err := loadMediaProxyEntry(key)
+	if err != nil {
+		return nil, "", err
+	}
 
 	// 下载音频内容（流式），使用关联的设备信息
-	body, contentType, err := downloadMediaWithRetry(originalURL, deviceID, headers, 3)
+	body, contentType, err := downloadMediaWithRetry(entry.OriginalURL, entry.DeviceID, entry.Headers, 3)
 	if err != nil {
 		return nil, "", fmt.Errorf("下载音频失败: %w", err)
 	}

internal/fqapi/cache_manager.go

@@ -16,8 +16,31 @@ import (
 	_ "github.com/jackc/pgx/v5/stdlib"
 	_ "github.com/mattn/go-sqlite3"
 	"github.com/redis/go-redis/v9"
+	"golang.org/x/sync/singleflight"
 )
 
+const (
+	// sqlCacheTTLSeconds SQL 持久层保留时长：不可变内容（正文/详情/目录）与业务 TTL 解耦，
+	// Redis 过期或重启后由 SQL 回填，避免重新打上游
+	sqlCacheTTLSeconds = 30 * 86400
+)
+
+// volatileCachePrefixes 动态短缓存（值会变）只走 Redis/短 TTL，不进 SQL 长期层
+var volatileCachePrefixes = []string{"search_", "category_", "rank_"}
+
+// isVolatileCacheKey 判断是否为动态短缓存 key
+func isVolatileCacheKey(key string) bool {
+	for _, p := range volatileCachePrefixes {
+		if strings.HasPrefix(key, p) {
+			return true
+		}
+	}
+	return false
+}
+
+// cacheSF 合并并发 miss 的回源请求，防止缓存击穿
+var cacheSF singleflight.Group
+
 var (
 	cacheDB             *sql.DB
 	dbDriver            string // "sqlite3" | "pgx"
@@ -56,6 +79,11 @@ func InitRedis() error {
 		Addr:     fmt.Sprintf("%s:%d", cfg.Cache.Redis.Host, cfg.Cache.Redis.Port),
 		Password: cfg.Cache.Redis.Password,
 		DB:       cfg.Cache.Redis.DB,
+		// 缓存场景失败不重试：miss 直接降级 SQL，重试只会放大网络慢时的请求延迟
+		MaxRetries:      0,
+		ReadTimeout:     3 * time.Second,
+		WriteTimeout:    3 * time.Second,
+		MinRetryBackoff: 0,
 	})
 
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
@@ -149,12 +177,14 @@ func createTables() error {
 			`CREATE TABLE IF NOT EXISTS cache (
 			key TEXT PRIMARY KEY,
 			value TEXT,
+			expi INTEGER DEFAULT 0,
 			created_at INTEGER DEFAULT (strftime('%s', 'now')),
 			updated_at INTEGER DEFAULT (strftime('%s', 'now'))
 		)`,
 			`CREATE TABLE IF NOT EXISTS cache (
 			key TEXT PRIMARY KEY,
 			value TEXT,
+			expi BIGINT DEFAULT 0,
 			created_at BIGINT DEFAULT extract(epoch FROM now())::bigint,
 			updated_at BIGINT DEFAULT extract(epoch FROM now())::bigint
 		)`},
@@ -259,8 +289,10 @@ func createTables() error {
 	// 旧表补 created_at/updated_at 列（新表 DDL 自带，此处仅老库生效）
 	for _, m := range []struct{ table, col, ddl string }{
 		{"cache", "updated_at", "INTEGER DEFAULT 0"}, // SQLite ALTER 不允许非常量默认值，先补 0 再回填
+		{"cache", "expi", "INTEGER DEFAULT 0"},
 		{"statistics", "created_at", "INTEGER DEFAULT 0"},
 		{"device_pool", "updated_at", "INTEGER DEFAULT 0"},
+		{"device_pool", "key_ts", "INTEGER DEFAULT 0"},
 		{"audio_cache", "updated_at", "INTEGER DEFAULT 0"},
 	} {
 		if dbDriver == "pgx" {
@@ -278,6 +310,7 @@ func createTables() error {
 	// 旧行回填（幂等：仅 0 值行受影响）
 	for _, backfill := range []string{
 		`UPDATE cache SET updated_at = created_at WHERE updated_at = 0`,
+		`UPDATE cache SET expi = created_at + 86400 WHERE expi = 0`,
 		`UPDATE statistics SET created_at = updated_at WHERE created_at = 0`,
 		`UPDATE device_pool SET updated_at = last_used_at WHERE updated_at = 0`,
 		`UPDATE audio_cache SET updated_at = created_at WHERE updated_at = 0`,
@@ -299,7 +332,8 @@ func isCacheEnabled() bool {
 	return cfg.Cache.Enabled
 }
 
-// withCache 只读接口的缓存包装：命中直接返回，miss 回源后写入（仅缓存成功响应）
+// withCache 只读接口的缓存包装：命中直接返回，miss 回源后写入（仅缓存成功响应）。
+// singleflight 合并并发 miss，同一 key 只有一个请求打上游
 // ponytail: 空参等防御分支若漏到此处，其错误 JSON 也会被缓存到 TTL 到期——handler 层 validateParams 已拦截
 func withCache(key string, ttl int, fetch func() (string, error)) (string, error) {
 	if c := GetCache(key); c != "" {
@@ -307,21 +341,36 @@ func withCache(key string, ttl int, fetch func() (string, error)) (string, error
 		// （对新写入的已解包数据无影响）
 		return reencodeUnwrapped(c), nil
 	}
+	v, err, _ := cacheSF.Do(key, func() (interface{}, error) {
+		// 双重检查：等锁期间可能已被并发请求填充
+		if c := GetCache(key); c != "" {
+			return c, nil
+		}
 		result, err := fetch()
 		if err == nil {
 			UpdateCache(key, result, ttl)
 		}
 		return result, err
+	})
+	if err != nil {
+		return "", err
+	}
+	return v.(string), nil
 }
 
-// GetCache 获取正文内容缓存
+// GetCache 获取缓存：Redis 热层 → SQL 持久层（命中回填 Redis）→ 未命中
 func GetCache(key string) string {
 	if !isCacheEnabled() {
 		return ""
 	}
 
 	if redisCache != nil {
-		return redisGetCache(key)
+		if v := redisGetCache(key); v != "" {
+			return v
+		}
+		if isVolatileCacheKey(key) {
+			return "" // 搜索/分类等动态数据不落库，Redis 未命中即回源
+		}
 	}
 
 	if cacheDB == nil {
@@ -329,7 +378,8 @@ func GetCache(key string) string {
 	}
 
 	var value string
-	err := cacheDB.QueryRow(q("SELECT value FROM cache WHERE key = ?"), key).Scan(&value)
+	var expi int64
+	err := cacheDB.QueryRow(q("SELECT value, expi FROM cache WHERE key = ?"), key).Scan(&value, &expi)
 	if err != nil {
 		if err != sql.ErrNoRows {
 			cacheLogger.Error("查询缓存失败: " + err.Error())
@@ -337,33 +387,46 @@ func GetCache(key string) string {
 		return ""
 	}
 
+	// 检查是否过期（expi 为 0 的旧行由启动回填兜底，此处防御）
+	if time.Now().Unix() >= expi {
+		cacheLogger.Debug("缓存已过期(SQL): " + key)
+		return ""
+	}
+
 	var cacheData CacheData
-	err = json.Unmarshal([]byte(value), &cacheData)
+	if err := json.Unmarshal([]byte(value), &cacheData); err != nil {
-	if err != nil {
 		cacheLogger.Error("解析缓存数据失败: " + err.Error())
 		return ""
 	}
 
-	cacheLogger.Debug("缓存命中: " + key)
+	cacheLogger.Debug("缓存命中(SQL): " + key)
 
-	// 检查是否过期
+	// SQL 命中而 Redis 未命中（过期/重启）：异步回填热层，剩余时长为 TTL，
-	if time.Now().Unix() < int64(cacheData.Expi) {
+	// 回填（尤其大 value）不阻塞本次请求
-		cacheLogger.Debug("缓存有效！")
+	if redisCache != nil {
-		return cacheData.Data
+		remain := int(expi - time.Now().Unix())
+		if remain < 60 {
+			remain = 60
 		}
-
+		go redisUpdateCache(key, cacheData.Data, remain)
-	cacheLogger.Debug("缓存已过期！")
+	}
-	return ""
+	return cacheData.Data
 }
 
-// UpdateCache 更新或插入正文内容缓存
+// UpdateCache 写入缓存：Redis 热层（TTL=业务过期时间）+ SQL 持久层双写。
+// 不可变内容在 SQL 固定保留 30 天，动态短缓存（search/category）只走 Redis。
+// Redis 写失败只降级不阻断：持久层照常落库，热层下次请求回填
 func UpdateCache(key string, value string, expi int) error {
 	if !isCacheEnabled() {
 		return nil
 	}
 
 	if redisCache != nil {
-		return redisUpdateCache(key, value, expi)
+		if err := redisUpdateCache(key, value, expi); err != nil {
+			cacheLogger.Warning(fmt.Sprintf("Redis 写入失败（降级为仅 SQL 落库）: %v", err))
+		} else if isVolatileCacheKey(key) {
+			return nil // 动态短缓存不落库（Redis 成功即止）
+		}
 	}
 
 	if cacheDB == nil {
@@ -380,10 +443,17 @@ func UpdateCache(key string, value string, expi int) error {
 		return err
 	}
 
+	// SQL 保留时长：不可变内容固定 30 天（Redis 未启用时沿用业务 TTL，保持纯 SQL 模式原行为）
+	sqlTTL := int64(sqlCacheTTLSeconds)
+	if redisCache == nil || isVolatileCacheKey(key) {
+		sqlTTL = int64(expi)
+	}
+
 	// UPSERT：ON CONFLICT 语法 SQLite 3.24+ 与 PostgreSQL 通用
-	_, err = cacheDB.Exec(q(`INSERT INTO cache (key, value, created_at, updated_at) VALUES (?, ?, ?, ?)
+	now := time.Now().Unix()
-		ON CONFLICT(key) DO UPDATE SET value = excluded.value, updated_at = excluded.updated_at`),
+	_, err = cacheDB.Exec(q(`INSERT INTO cache (key, value, expi, created_at, updated_at) VALUES (?, ?, ?, ?, ?)
-		key, string(jsonData), time.Now().Unix(), time.Now().Unix())
+		ON CONFLICT(key) DO UPDATE SET value = excluded.value, expi = excluded.expi, updated_at = excluded.updated_at`),
+		key, string(jsonData), now+sqlTTL, now, now)
 	if err != nil {
 		cacheLogger.Error("更新缓存失败: " + err.Error())
 		return err
@@ -465,11 +535,8 @@ func CleanupExpiredCache() error {
 		return fmt.Errorf("数据库未初始化")
 	}
 
-	// 计算过期时间点（当前时间 - cleanup_seconds）
+	// 删除已过期的缓存（按行内过期时间 expi，而非创建时间）
-	expiredTime := time.Now().Unix() - int64(cfg.Cache.CleanupSeconds)
+	result, err := cacheDB.Exec(q("DELETE FROM cache WHERE expi < ?"), time.Now().Unix())
-
-	// 删除过期的缓存（created_at < expiredTime）
-	result, err := cacheDB.Exec(q("DELETE FROM cache WHERE created_at < ?"), expiredTime)
 	if err != nil {
 		cacheLogger.Error("清理过期缓存失败: " + err.Error())
 		return err
@@ -480,9 +547,12 @@ func CleanupExpiredCache() error {
 	if err != nil {
 		cacheLogger.Warning("获取删除行数失败: " + err.Error())
 	} else if rowsAffected > 0 {
-		cacheLogger.Info(fmt.Sprintf("已清理 %d 条过期缓存（创建时间早于 %d 秒前）", rowsAffected, cfg.Cache.CleanupSeconds))
+		cacheLogger.Info(fmt.Sprintf("已清理 %d 条过期缓存（SQL 持久层）", rowsAffected))
 	}
 
+	// 顺带清理磁盘视频缓存（7 天未访问的解密文件）
+	CleanupVideoCache()
+
 	return nil
 }
 

internal/fqapi/cache_manager_test.go

@@ -30,6 +30,7 @@ func TestConcurrentCacheAccess(t *testing.T) {
 	if _, err := db.Exec(`CREATE TABLE IF NOT EXISTS cache (
 		key TEXT PRIMARY KEY,
 		value TEXT,
+		expi INTEGER DEFAULT 0,
 		created_at INTEGER DEFAULT (strftime('%s', 'now')),
 		updated_at INTEGER DEFAULT (strftime('%s', 'now'))
 	)`); err != nil {
@@ -74,6 +75,7 @@ func TestWithCache(t *testing.T) {
 	}()
 	if _, err := db.Exec(`CREATE TABLE IF NOT EXISTS cache (
 		key TEXT PRIMARY KEY, value TEXT,
+		expi INTEGER DEFAULT 0,
 		created_at INTEGER DEFAULT (strftime('%s', 'now')),
 		updated_at INTEGER DEFAULT (strftime('%s', 'now'))
 	)`); err != nil {

internal/fqapi/category_front.go

@@ -17,10 +17,13 @@ func HandleCategoryFront(tab interface{}) (string, error) {
 func fetchCategoryFront(tab interface{}) (string, error) {
 	tabInt := ParseIntParam(tab, 0)
 
+	// 新版分类接口参数（category_new_page_715=1 + new_category_type，
+	// 旧参数 new_category_tab 已失效——对齐 2026-10 可用的书源实现）
 	reqURL := BuildURL(
 		"https://reading.snssdk.com/reading/bookapi/new_category/front/v/",
-		fmt.Sprintf("new_category_tab=%d", tabInt),
+		"category_new_page_715=1",
-		fmt.Sprintf("update_version_code=%s", "58932"),
+		fmt.Sprintf("new_category_type=%d", tabInt),
+		"update_version_code=" + ClientVersionCode,
 		"distinct_style=1",
 	)
 

internal/fqapi/category_landing.go

@@ -8,32 +8,54 @@ import (
 var categoryLandingLogger = common.NewLogger("category_landing", "INFO", "")
 
 // HandleCategoryLanding 处理获取分类详情,分类详情短缓存 10 分钟
-func HandleCategoryLanding(categoryID, offset, wordNumber, bookStatus, sortBy interface{}) (string, error) {
+// selectedItems：新版分类标签自带的筛选项（selected_items，透传上游）
-	return withCache(fmt.Sprintf("category_landing_%v_%v_%v_%v_%v", categoryID, offset, wordNumber, bookStatus, sortBy), 600, func() (string, error) {
+func HandleCategoryLanding(categoryID, offset, wordNumber, bookStatus, sortBy, selectedItems interface{}) (string, error) {
-		return fetchCategoryLanding(categoryID, offset, wordNumber, bookStatus, sortBy)
+	return withCache(fmt.Sprintf("category_landing_%v_%v_%v_%v_%v_%v", categoryID, offset, wordNumber, bookStatus, sortBy, selectedItems), 600, func() (string, error) {
+		return fetchCategoryLanding(categoryID, offset, wordNumber, bookStatus, sortBy, selectedItems)
 	})
 }
 
-func fetchCategoryLanding(categoryID, offset, wordNumber, bookStatus, sortBy interface{}) (string, error) {
+func fetchCategoryLanding(categoryID, offset, wordNumber, bookStatus, sortBy, selectedItems interface{}) (string, error) {
 	// 参数转换
 	categoryIDInt := ParseIntParam(categoryID, 0)
 	offsetInt := ParseIntParam(offset, 0)
 	wordNumberInt := ParseIntParam(wordNumber, 0)
 	bookStatusInt := ParseIntParam(bookStatus, 0)
 	sortByInt := ParseIntParam(sortBy, 0)
+	selectedItemsStr := ParseStringParam(selectedItems, "")
 
-	if categoryIDInt == 0 {
+	if categoryIDInt == 0 && selectedItemsStr == "" {
 		return BuildErrorResponseWithCode(100144, "参数错误"), nil
 	}
 
+	params := []string{
+		fmt.Sprintf("limit=%d", 20),
+		fmt.Sprintf("offset=%d", offsetInt),
+	}
+	if categoryIDInt != 0 {
+		params = append(params, fmt.Sprintf("category_id=%d", categoryIDInt))
+	}
+	if wordNumberInt != 0 {
+		params = append(params, fmt.Sprintf("word_number=%d", wordNumberInt))
+	}
+	if bookStatusInt != 0 {
+		params = append(params, fmt.Sprintf("book_status=%d", bookStatusInt))
+	}
+	if sortByInt != 0 {
+		params = append(params, fmt.Sprintf("sort_by=%d", sortByInt))
+	}
+	// 新版分类标签：selected_items 由 front 页标签自带，需与其 from_front_page 配对透传
+	if selectedItemsStr != "" {
+		params = append(params,
+			"selected_items="+selectedItemsStr,
+			"selected_item_from_front_page="+selectedItemsStr,
+			"source=front_category",
+		)
+	}
+
 	reqURL := BuildURL(
 		"https://reading.snssdk.com/reading/bookapi/new_category/landing/v/",
-		fmt.Sprintf("category_id=%d", categoryIDInt),
+		params...,
-		fmt.Sprintf("limit=%d", 20),
-		fmt.Sprintf("offset=%d", offsetInt),
-		fmt.Sprintf("word_number=%d", wordNumberInt),
-		fmt.Sprintf("book_status=%d", bookStatusInt),
-		fmt.Sprintf("sort_by=%d", sortByInt),
 	)
 
 	resp, err := GorgonRequest(reqURL, map[string]interface{}{

internal/fqapi/content.go

@@ -5,12 +5,14 @@ import (
 	"encoding/json"
 	"fanqie/internal/common"
 	"fmt"
-	"sort"
 	"strings"
+
+	"golang.org/x/sync/singleflight"
 )
 
 var (
 	contentLogger = common.NewLogger("content", "INFO", "")
+	contentSF     singleflight.Group // 合并同一章节的并发回源请求，防缓存击穿
 )
 
 // ContentFetcher 内容获取器
@@ -26,19 +28,27 @@ func HandleGetContent(itemID string, textMode, imageMode interface{}) (string, e
 	textModeBool := parseBoolParamDefault(textMode, getContentConfig().RemoveHTMLTags)
 	imageModeBool := parseBoolParamDefault(imageMode, !getContentConfig().RemoveImages)
 
-	// contentLogger.Info(fmt.Sprintf("获取内容 item_id=%s text_mode=%v image_mode=%v", itemID, textModeBool, imageModeBool))
-
-	// 检查缓存
 	cache := GetCache("content_" + itemID)
-	if cache != "" {
+	if cache == "" {
-		return processCachedContent(cache, textModeBool, imageModeBool)
+		// 同一章节并发请求只打一次上游，其余等待共享结果
+		v, err, _ := contentSF.Do("content_"+itemID, func() (interface{}, error) {
+			// 双重检查：等锁期间可能已被并发请求填充
+			if c := GetCache("content_" + itemID); c != "" {
+				return c, nil
+			}
+			return fetchContentFromAPI(itemID)
+		})
+		if err != nil {
+			return "", err
+		}
+		cache = v.(string)
 	}
 
-	// 缓存未命中，从API获取
+	// 出口按各自参数解析（缓存/回源共用同一路径）
-	return fetchContentFromAPI(itemID, textModeBool, imageModeBool)
+	return processCachedContent(cache, textModeBool, imageModeBool)
 }
 
-// processCachedContent 处理缓存内容
+// processCachedContent 处理缓存内容（content 为解密后的原始正文）
 func processCachedContent(cache string, textMode, imageMode bool) (string, error) {
 	var d map[string]interface{}
 	json.Unmarshal([]byte(cache), &d)
@@ -53,18 +63,18 @@ func processCachedContent(cache string, textMode, imageMode bool) (string, error
 	return buildJSONResponse(UnwrapJSONStrings(d)), nil
 }
 
-// fetchContentFromAPI 从API获取内容（带设备切换重试）
+// fetchContentFromAPI 从API获取内容（带设备切换重试），返回缓存格式 JSON
-func fetchContentFromAPI(itemID string, textMode, imageMode bool) (string, error) {
+func fetchContentFromAPI(itemID string) (string, error) {
-	return fetchContentWithRetry(itemID, textMode, imageMode, 0)
+	return fetchContentWithRetry(itemID, 0)
 }
 
 // fetchContentWithRetry 从API获取内容，支持设备切换重试
-func fetchContentWithRetry(itemID string, textMode, imageMode bool, retryCount int) (string, error) {
+func fetchContentWithRetry(itemID string, retryCount int) (string, error) {
 	// 防止无限递归
 	const maxRetries = 5
 	if retryCount >= maxRetries {
 		contentLogger.Warning(fmt.Sprintf("已重试 %d 次，尝试备用接口", maxRetries))
-		return tryBackupAPI(itemID, textMode, imageMode)
+		return tryBackupAPI(itemID)
 	}
 
 	// 从设备密钥池获取设备
@@ -79,6 +89,7 @@ func fetchContentWithRetry(itemID string, textMode, imageMode bool, retryCount i
 	currentKeyInfo := &KeyInfo{
 		Key: item.Key,
 		Ver: item.KeyVer,
+		Ts:  item.KeyTs,
 	}
 	contentLogger.Debug(fmt.Sprintf("使用池中设备 ID=%d (重试次数: %d)", item.ID, retryCount))
 
@@ -90,16 +101,13 @@ func fetchContentWithRetry(itemID string, textMode, imageMode bool, retryCount i
 		"app_name=novelapp",
 		"channel=0",
 		"device_platform=android",
-		"version_code=66.9",
+		"version_code=" + ClientVersionCode,
 		"item_id=" + itemID,
 		"os_version=0",
+		fmt.Sprintf("key_register_ts=%d", currentKeyInfo.Ts), // 降低上游密钥不匹配概率
 		headerWithoutVersion,
 	}
-
+	sortedParams := buildSortedQuery(params...)
-	allParams := strings.Join(params, "&")
-	paramList := strings.Split(allParams, "&")
-	sort.Strings(paramList)
-	sortedParams := strings.Join(paramList, "&")
 
 	url := "https://reading.snssdk.com/reading/reader/full/v/?" + sortedParams
 
@@ -114,7 +122,7 @@ func fetchContentWithRetry(itemID string, textMode, imageMode bool, retryCount i
 		contentLogger.Warning(fmt.Sprintf("主接口请求出错，标记设备无效并切换设备: %v", err))
 		pool.MarkInvalid(header)
 		pool.RemoveInvalid()
-		return fetchContentWithRetry(itemID, textMode, imageMode, retryCount+1)
+		return fetchContentWithRetry(itemID, retryCount+1)
 	}
 
 	var body map[string]interface{}
@@ -126,7 +134,7 @@ func fetchContentWithRetry(itemID string, textMode, imageMode bool, retryCount i
 			contentLogger.Warning("响应data字段无效，切换设备重试")
 			pool.MarkInvalid(header)
 			pool.RemoveInvalid()
-			return fetchContentWithRetry(itemID, textMode, imageMode, retryCount+1)
+			return fetchContentWithRetry(itemID, retryCount+1)
 		}
 
 		contentEncoded, ok := data["content"].(string)
@@ -135,76 +143,101 @@ func fetchContentWithRetry(itemID string, textMode, imageMode bool, retryCount i
 			contentLogger.Warning(fmt.Sprintf("内容返回 Invalid，标记设备无效并切换设备 (重试: %d)", retryCount))
 			pool.MarkInvalid(header)
 			pool.RemoveInvalid()
-			return fetchContentWithRetry(itemID, textMode, imageMode, retryCount+1)
+			return fetchContentWithRetry(itemID, retryCount+1)
 		}
 
 		// 检查密钥版本
 		keyVersion, _ := data["key_version"].(float64)
-		if currentKeyInfo != nil && int(keyVersion) != currentKeyInfo.Ver {
+		if int(keyVersion) != currentKeyInfo.Ver {
 			contentLogger.Warning("密钥版本不匹配，重新获取密钥")
 
 			// 更新池中的密钥
 			newKeyInfo, err := GetKey(header)
 			if err == nil {
-				UpdateKeyInPool(header, newKeyInfo.Key, newKeyInfo.Ver)
+				UpdateKeyInPool(header, newKeyInfo)
 				currentKeyInfo = newKeyInfo
 			} else {
 				// 获取密钥失败，切换设备
 				contentLogger.Warning("获取密钥失败，切换设备重试")
 				pool.MarkInvalid(header)
 				pool.RemoveInvalid()
-				return fetchContentWithRetry(itemID, textMode, imageMode, retryCount+1)
+				return fetchContentWithRetry(itemID, retryCount+1)
 			}
 		}
 
-		// 解密内容
+		contentStr, err := decodeContentBody(data, currentKeyInfo)
-		contentBytes, _ := base64.StdEncoding.DecodeString(contentEncoded)
-		if len(contentBytes) < 16 {
-			contentLogger.Warning("内容长度不足，切换设备重试")
-			pool.MarkInvalid(header)
-			pool.RemoveInvalid()
-			return fetchContentWithRetry(itemID, textMode, imageMode, retryCount+1)
-		}
-
-		iv := contentBytes[0:16]
-		encryptedData := contentBytes[16:]
-
-		keyBytes, _ := base64.StdEncoding.DecodeString(currentKeyInfo.Key)
-		decrypted, err := De(encryptedData, keyBytes, iv)
 		if err != nil {
 			contentLogger.Warning(fmt.Sprintf("解密失败，切换设备重试: %v", err))
 			pool.MarkInvalid(header)
 			pool.RemoveInvalid()
-			return fetchContentWithRetry(itemID, textMode, imageMode, retryCount+1)
+			return fetchContentWithRetry(itemID, retryCount+1)
 		}
 
-		// 处理内容
+		contentStr = strings.ReplaceAll(contentStr, `<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"no\"?>`, "")
-		contentStr := string(decrypted)
-		contentStr = strings.Replace(contentStr, `<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"no\"?>`, "", -1)
 		contentStr = strings.TrimSpace(contentStr)
 
 		data["content"] = contentStr
 
-		// 更新缓存
+		// 写缓存并返回缓存格式（按参数的解析统一放在出口 processCachedContent）
-		cacheData := buildCacheData(data)
+		cacheStr := marshalNoEscape(buildCacheData(UnwrapJSONStrings(data)))
-		saveCacheJSON("content_"+itemID, cacheData, 86400*2)
+		UpdateCache("content_"+itemID, cacheStr, 86400)
-
+		return cacheStr, nil
-		// 解析内容
-		parser := NewContentParser()
-		data["content"] = parser.Parse(contentStr, textMode, imageMode)
-
-		return buildJSONResponse(UnwrapJSONStrings(body)), nil
 	}
 
 	// 响应code不为0，切换设备重试
 	contentLogger.Warning(fmt.Sprintf("响应code异常: %.0f，切换设备重试", body["code"]))
 	pool.MarkInvalid(header)
 	pool.RemoveInvalid()
-	return fetchContentWithRetry(itemID, textMode, imageMode, retryCount+1)
+	return fetchContentWithRetry(itemID, retryCount+1)
 }
 
-// tryBackupAPI 尝试备用API（所有设备都失败后的最后手段）
+// decodeContentBody 按上游 crypt_status 解出正文：
-func tryBackupAPI(itemID string, textMode, imageMode bool) (string, error) {
+//   - 0：base64 密文，设备密钥 AES-CBC 解密（compress_status!=0 时解压）
+//   - 1：明文（可能压缩）
+//   - 2：密钥已失效，刷新密钥后由调用方重试
+func decodeContentBody(data map[string]interface{}, keyInfo *KeyInfo) (string, error) {
+	contentEncoded, _ := data["content"].(string)
+	cryptStatus, _ := data["crypt_status"].(float64)
+	compressStatus, _ := data["compress_status"].(float64)
+
+	switch int(cryptStatus) {
+	case 1:
+		if compressStatus != 0 {
+			return string(gunzipMaybe([]byte(contentEncoded))), nil
+		}
+		return contentEncoded, nil
+
+	case 2:
+		return "", fmt.Errorf("密钥已失效（crypt_status=2），需刷新密钥重试")
+
+	default:
+		// 500003 场景（设备无需解密）仍下发密文时按明文兜底
+		if keyInfo == nil || keyInfo.Key == "" {
+			return contentEncoded, nil
+		}
+
+		contentBytes, err := base64.StdEncoding.DecodeString(contentEncoded)
+		if err != nil || len(contentBytes) < 16 {
+			return "", fmt.Errorf("内容密文长度异常")
+		}
+
+		iv := contentBytes[0:16]
+		encryptedData := contentBytes[16:]
+
+		keyBytes, _ := base64.StdEncoding.DecodeString(keyInfo.Key)
+		decrypted, err := De(encryptedData, keyBytes, iv)
+		if err != nil {
+			return "", err
+		}
+		if compressStatus != 0 {
+			decrypted = gunzipMaybe(decrypted)
+		}
+		return string(decrypted), nil
+	}
+}
+
+// tryBackupAPI 尝试备用API（所有设备都失败后的最后手段），返回缓存格式 JSON
+func tryBackupAPI(itemID string) (string, error) {
 	contentLogger.Warning("尝试备用接口1（所有设备均失败）")
 
 	// 从设备池获取任意一个有效设备用于备用接口
@@ -217,8 +250,8 @@ func tryBackupAPI(itemID string, textMode, imageMode bool) (string, error) {
 	header := item.DeviceHeader
 
 	// 备用接口1：使用DH加密
-	backupAPI := fmt.Sprintf("https://novel.snssdk.com/api/novel/book/reader/content/v1?support_image=1&item_id=%s&aid=1319&app_name=novelapp&channel=0&device_platform=android&os_version=2&version_code=58932&%s",
+	backupAPI := fmt.Sprintf("https://novel.snssdk.com/api/novel/book/reader/content/v1?support_image=1&item_id=%s&aid=1319&app_name=novelapp&channel=0&device_platform=android&os_version=2&version_code=%s&%s",
-		itemID, header)
+		itemID, ClientVersionCode, header)
 
 	cm := NewCM()
 	resp, err := GorgonRequest(backupAPI, map[string]interface{}{
@@ -259,18 +292,14 @@ func tryBackupAPI(itemID string, textMode, imageMode bool) (string, error) {
 			contentLogger.Error("解密失败: " + err.Error())
 			return `{"code": -1, "msg": "解密失败"}`, err
 		}
+		decryptedContent = string(gunzipMaybe([]byte(decryptedContent)))
 
-		data["content"] = decryptedContent
+		data["content"] = strings.TrimSpace(decryptedContent)
 
-		// 更新缓存
+		// 写缓存并返回缓存格式
-		bodyJSONStr := buildJSONResponse(body)
+		cacheStr := marshalNoEscape(buildCacheData(UnwrapJSONStrings(data)))
-		UpdateCache("content_"+itemID, bodyJSONStr, 86400)
+		UpdateCache("content_"+itemID, cacheStr, 86400)
-
+		return cacheStr, nil
-		// 解析内容
-		parser := NewContentParser()
-		data["content"] = parser.Parse(decryptedContent, textMode, imageMode)
-
-		return buildJSONResponse(UnwrapJSONStrings(body)), nil
 	}
 
 	contentLogger.Warning("备用接口1获取正文出错！")

internal/fqapi/content_parser.go

@@ -9,6 +9,20 @@ import (
 	"github.com/PuerkitoBio/goquery"
 )
 
+// imgSrcRe 匹配 img 标签的 src 属性
+var imgSrcRe = regexp.MustCompile(`(?i)(<img[^>]*\ssrc=")([^"]*)(")`)
+
+// permanentizeImgSrc 将正文插图链接替换为永久 CDN 链接（原链接带临时参数会过期）
+func permanentizeImgSrc(html string) string {
+	return imgSrcRe.ReplaceAllStringFunc(html, func(m string) string {
+		parts := imgSrcRe.FindStringSubmatch(m)
+		if len(parts) < 3 || parts[2] == "" {
+			return m
+		}
+		return parts[1] + NormalizeNovelImageURL(parts[2]) + parts[3]
+	})
+}
+
 var (
 	parserLogger = common.NewLogger("content_parser", "INFO", "")
 )
@@ -118,6 +132,8 @@ func (p *ContentParser) extractText(content string) string {
 				divHTML = decodeHTMLEntities(divHTML)
 				// 标准化img属性
 				divHTML = normalizeImgAttributes(divHTML)
+				// 插图链接永久化
+				divHTML = permanentizeImgSrc(divHTML)
 				finalResult = append(finalResult, divHTML)
 			}
 			return
@@ -173,6 +189,9 @@ func (p *ContentParser) processHTMLMode(content string) string {
 	// 解码HTML实体
 	content = decodeHTMLEntities(content)
 
+	// 插图链接永久化（原链接带临时参数会过期）
+	content = permanentizeImgSrc(content)
+
 	// 根据配置决定是否移除空行
 	if p.cfg.RemoveBlankLines {
 		// 对HTML内容移除空的<p>标签

internal/fqapi/content_utils.go

@@ -2,12 +2,84 @@ package fqapi
 
 import (
 	"bytes"
+	"compress/gzip"
+	"compress/zlib"
 	"encoding/json"
 	"fanqie/internal/config"
-	"sort"
+	"io"
+	"net/url"
+	"regexp"
 	"strings"
 )
 
+// 客户端版本统一（与 2026-10 可用的书源实现一致；旧值 58932/5.8.9.32 混用易触发风控）
+const (
+	ClientVersionCode = "72732"
+	ClientVersionName = "7.2.7.32"
+)
+
+// PermanentNovelImgHost 番茄小说图片的永久 CDN 域名（原始链接带临时参数会过期失效）
+const PermanentNovelImgHost = "https://p6-novel.byteimg.com"
+
+// novelPicMd5Re 匹配图片路径中的 32 位十六进制资源 ID
+var novelPicMd5Re = regexp.MustCompile(`^/novel-pic/([a-f0-9]{32})`)
+
+// NormalizeNovelImageURL 将临时图片链接永久化：
+//   - /novel-pic/{md5} → p6-novel.byteimg.com/origin/novel-pic/{md5}（正文插图原图）
+//   - 含 ~tplv 的模板图（封面缩放）→ p6-novel.byteimg.com 保留原路径
+func NormalizeNovelImageURL(raw string) string {
+	u := strings.TrimSpace(strings.ReplaceAll(raw, "&", "&"))
+	if u == "" {
+		return ""
+	}
+	if strings.HasPrefix(u, "//") {
+		u = "https:" + u
+	}
+	idx := strings.Index(u, "/novel-pic/")
+	if idx < 0 {
+		return u
+	}
+	path := u[idx:]
+	if m := novelPicMd5Re.FindStringSubmatch(path); m != nil && !strings.Contains(path, "~tplv") {
+		return PermanentNovelImgHost + "/origin/novel-pic/" + m[1]
+	}
+	return PermanentNovelImgHost + path
+}
+
+// gunzipMaybe 自适应解压上游正文（gzip 与 zlib 帧都可能出现），非压缩数据原样返回
+func gunzipMaybe(data []byte) []byte {
+	if r, err := gzip.NewReader(bytes.NewReader(data)); err == nil {
+		if out, err2 := io.ReadAll(r); err2 == nil {
+			r.Close()
+			return out
+		}
+	}
+	if r, err := zlib.NewReader(bytes.NewReader(data)); err == nil {
+		if out, err2 := io.ReadAll(r); err2 == nil {
+			r.Close()
+			return out
+		}
+	}
+	return data
+}
+
+// buildSortedQuery 将若干 "k=v" 段合并为 form 编码的查询串（按键排序）。
+// 设备机型等值含空格时必须编码，否则实际请求的 URL 与签名输入不一致，
+// registerkey 等接口会注册失败（书源 2026-10-10 修复的同类问题）
+func buildSortedQuery(parts ...string) string {
+	vals := url.Values{}
+	for _, part := range parts {
+		for _, seg := range strings.Split(part, "&") {
+			if seg == "" {
+				continue
+			}
+			k, v, _ := strings.Cut(seg, "=")
+			vals.Add(k, v)
+		}
+	}
+	return vals.Encode()
+}
+
 // getContentConfig 获取内容配置（带默认值）
 func getContentConfig() config.ContentConfig {
 	if config.GetAppConfig() != nil {
@@ -188,7 +260,7 @@ func getDeviceHeader() string {
 
 // removeVersionFromHeader 移除header中的version_name参数
 func removeVersionFromHeader(header string) string {
-	return strings.Replace(header, "&version_name=5.8.9.32", "", -1)
+	return strings.Replace(header, "&version_name="+ClientVersionName, "", -1)
 }
 
 // ============ API参数构建工具 ============
@@ -203,7 +275,7 @@ func BuildURL(fullURL string, customParams ...string) string {
 		"channel=0",
 		"device_platform=android",
 		"os_version=0",
-		"version_code=58932",
+		"version_code=" + ClientVersionCode,
 	}
 
 	// 添加设备header
@@ -215,13 +287,8 @@ func BuildURL(fullURL string, customParams ...string) string {
 	// 添加自定义参数
 	allParams = append(allParams, customParams...)
 
-	// 合并、拆分、排序
+	// form 编码 + 排序（机型含空格等特殊字符时保证 URL 与签名一致）
-	joined := strings.Join(allParams, "&")
+	return fullURL + "?" + buildSortedQuery(allParams...)
-	paramList := strings.Split(joined, "&")
-	sort.Strings(paramList)
-	params := strings.Join(paramList, "&")
-
-	return fullURL + "?" + params
 }
 
 // ============ 缓存处理工具函数 ============

internal/fqapi/content_utils_test.go

@@ -0,0 +1,31 @@
+package fqapi
+
+import "testing"
+
+// TestBuildSortedQuery form 编码 + 排序（机型含空格时 URL 与签名一致的关键）
+func TestBuildSortedQuery(t *testing.T) {
+	got := buildSortedQuery("b=2", "a=1", "device_type=Pixel 6")
+	want := "a=1&b=2&device_type=Pixel+6"
+	if got != want {
+		t.Fatalf("buildSortedQuery = %q, want %q", got, want)
+	}
+}
+
+// TestNormalizeNovelImageURL 插图/封面/已永久化链接的归一化
+func TestNormalizeNovelImageURL(t *testing.T) {
+	cases := map[string]string{
+		// 正文插图（纯 md5）→ origin 原图
+		"//p9-novel.byteimg.com/img/novel-pic/0123456789abcdef0123456789abcdef": "https://p6-novel.byteimg.com/origin/novel-pic/0123456789abcdef0123456789abcdef",
+		// 已永久化的链接幂等
+		"https://p6-novel.byteimg.com/origin/novel-pic/0123456789abcdef0123456789abcdef": "https://p6-novel.byteimg.com/origin/novel-pic/0123456789abcdef0123456789abcdef",
+		// 封面模板图（~tplv 缩放）→ 保留原路径仅换域名
+		"https://p3-novel.byteimg.com/novel-pic/0123456789abcdef0123456789abcdef~tplv-novel-pic-large.webp": "https://p6-novel.byteimg.com/novel-pic/0123456789abcdef0123456789abcdef~tplv-novel-pic-large.webp",
+		// 非 novel-pic 链接原样返回
+		"https://example.com/other.jpg": "https://example.com/other.jpg",
+	}
+	for in, want := range cases {
+		if got := NormalizeNovelImageURL(in); got != want {
+			t.Errorf("NormalizeNovelImageURL(%q) = %q, want %q", in, got, want)
+		}
+	}
+}

internal/fqapi/detail.go

@@ -42,9 +42,13 @@ func fetchDetail(bookID string) (string, error) {
 	}
 
 	if code, ok := respJSON["code"].(float64); ok && code == 0 {
-		// 删除content字段
 		if data, ok := respJSON["data"].(map[string]interface{}); ok {
+			// 删除content字段
 			delete(data, "content")
+			// 封面链接永久化（原链接带临时参数会过期）
+			if thumb, ok := data["thumb_url"].(string); ok && thumb != "" {
+				data["thumb_url"] = NormalizeNovelImageURL(thumb)
+			}
 		}
 
 		// 重新序列化（解包 JSON 字符串字段）

internal/fqapi/device_key_pool.go

@@ -20,9 +20,14 @@ type DeviceKeyItem struct {
 	DeviceHeader string    `json:"device_header"`
 	Key          string    `json:"key"`
 	KeyVer       int       `json:"key_ver"`
+	KeyTs        int64     `json:"key_ts"` // 密钥注册时间戳（key_register_ts）
 	IsValid      bool      `json:"is_valid"`
 	CreatedAt    time.Time `json:"created_at"`
 	LastUsedAt   time.Time `json:"last_used_at"`
+
+	// 仅内存字段（不落库）
+	KeyFetchedAt time.Time `json:"-"` // 密钥获取时间，超 24h 异步刷新
+	KeyRefreshAt time.Time `json:"-"` // 上次刷新尝试时间，防刷新风暴
 }
 
 // DeviceKeyPool 设备密钥池
@@ -77,6 +82,10 @@ func (p *DeviceKeyPool) Initialize() error {
 	}
 
 	poolLogger.Info(fmt.Sprintf("设备密钥池初始化完成，当前有效设备数: %d", p.getValidCount()))
+
+	// last_used_at 批量落库（GetNext 不再同步写库）
+	p.StartDevicePoolFlusher()
+
 	return nil
 }
 
@@ -110,11 +119,22 @@ func (p *DeviceKeyPool) GetNext() (*DeviceKeyItem, error) {
 	item := validItems[p.currentIndex%len(validItems)]
 	p.currentIndex++
 
-	// 更新最后使用时间
+	// 只更新内存中的最后使用时间，由后台 flusher 定期批量落库
+	// （此前每次取设备同步 UPDATE，SQLite 单写锁下是吞吐瓶颈）
 	item.LastUsedAt = time.Now()
-	p.updateDeviceInDB(item)
 
-	// poolLogger.Debug(fmt.Sprintf("使用设备 ID=%d", item.ID))
+	// 密钥超 24h 未刷新：异步换新（本次请求仍用旧密钥，下次生效）
+	if time.Since(item.KeyFetchedAt) > 20*time.Hour && time.Since(item.KeyRefreshAt) > 10*time.Minute {
+		item.KeyRefreshAt = time.Now()
+		header := item.DeviceHeader
+		go func() {
+			if ki, err := GetKey(header); err == nil {
+				UpdateKeyInPool(header, ki)
+			} else {
+				poolLogger.Warning(fmt.Sprintf("刷新设备密钥失败: %v", err))
+			}
+		}()
+	}
 
 	// 异步检查是否需要补充
 	go p.checkAndRefill()
@@ -316,9 +336,11 @@ func (p *DeviceKeyPool) addNewDevice() error {
 		DeviceHeader: deviceHeader,
 		Key:          keyInfo.Key,
 		KeyVer:       keyInfo.Ver,
+		KeyTs:        keyInfo.Ts,
 		IsValid:      true,
 		CreatedAt:    time.Now(),
 		LastUsedAt:   time.Now(),
+		KeyFetchedAt: time.Now(),
 	}
 
 	// 保存到数据库
@@ -344,7 +366,7 @@ func (p *DeviceKeyPool) loadFromDB() error {
 	}
 
 	rows, err := cacheDB.Query(`
-		SELECT id, device_header, key, key_ver, is_valid, created_at, last_used_at 
+		SELECT id, device_header, key, key_ver, COALESCE(key_ts, 0), is_valid, created_at, last_used_at
 		FROM device_pool
 		ORDER BY id
 	`)
@@ -363,6 +385,7 @@ func (p *DeviceKeyPool) loadFromDB() error {
 			&item.DeviceHeader,
 			&item.Key,
 			&item.KeyVer,
+			&item.KeyTs,
 			&item.IsValid,
 			&createdAt,
 			&lastUsedAt,
@@ -374,6 +397,7 @@ func (p *DeviceKeyPool) loadFromDB() error {
 
 		item.CreatedAt = time.Unix(createdAt, 0)
 		item.LastUsedAt = time.Unix(lastUsedAt, 0)
+		item.KeyFetchedAt = time.Now() // 旧设备的密钥年龄未知，从加载起算
 		items = append(items, &item)
 	}
 
@@ -401,10 +425,10 @@ func (p *DeviceKeyPool) saveDeviceToDB(item *DeviceKeyItem) error {
 
 	// RETURNING id 同时兼容 SQLite(3.35+) 与 PostgreSQL，替代 LastInsertId()
 	err := cacheDB.QueryRow(q(`
-		INSERT INTO device_pool (device_header, key, key_ver, is_valid, created_at, last_used_at, updated_at)
+		INSERT INTO device_pool (device_header, key, key_ver, key_ts, is_valid, created_at, last_used_at, updated_at)
-		VALUES (?, ?, ?, ?, ?, ?, ?)
+		VALUES (?, ?, ?, ?, ?, ?, ?, ?)
 		RETURNING id
-	`), item.DeviceHeader, item.Key, item.KeyVer, boolToInt(item.IsValid),
+	`), item.DeviceHeader, item.Key, item.KeyVer, item.KeyTs, boolToInt(item.IsValid),
 		item.CreatedAt.Unix(), item.LastUsedAt.Unix(), item.CreatedAt.Unix()).Scan(&item.ID)
 
 	return err
@@ -418,14 +442,39 @@ func (p *DeviceKeyPool) updateDeviceInDB(item *DeviceKeyItem) error {
 
 	_, err := cacheDB.Exec(q(`
 		UPDATE device_pool
-		SET device_header = ?, key = ?, key_ver = ?, is_valid = ?, last_used_at = ?, updated_at = ?
+		SET device_header = ?, key = ?, key_ver = ?, key_ts = ?, is_valid = ?, last_used_at = ?, updated_at = ?
 		WHERE id = ?
-	`), item.DeviceHeader, item.Key, item.KeyVer, boolToInt(item.IsValid),
+	`), item.DeviceHeader, item.Key, item.KeyVer, item.KeyTs, boolToInt(item.IsValid),
 		item.LastUsedAt.Unix(), item.LastUsedAt.Unix(), item.ID)
 
 	return err
 }
 
+// StartDevicePoolFlusher 启动 last_used_at 批量落库任务（GetNext 已改为只写内存）
+func (p *DeviceKeyPool) StartDevicePoolFlusher() {
+	go func() {
+		for range time.Tick(time.Minute) {
+			FlushDevicePool()
+		}
+	}()
+	poolLogger.Info("设备池 last_used_at 批量落库已启动（每分钟）")
+}
+
+// FlushDevicePool 将内存中的设备使用时间批量刷入数据库
+// ponytail: 进程退出时最多丢 1 分钟使用记录（仅统计用途），无需精确停表
+func FlushDevicePool() {
+	p := GetDeviceKeyPool()
+	if !p.enabled || cacheDB == nil {
+		return
+	}
+	p.mu.RLock()
+	items := append([]*DeviceKeyItem(nil), p.items...)
+	p.mu.RUnlock()
+	for _, it := range items {
+		p.updateDeviceInDB(it)
+	}
+}
+
 // removeInvalidFromDB 从数据库移除无效设备
 func (p *DeviceKeyPool) removeInvalidFromDB() error {
 	if cacheDB == nil {
@@ -483,10 +532,10 @@ func GetKeyInfoFromPool(deviceHeader string) *KeyInfo {
 	return nil
 }
 
-// UpdateKeyInPool 更新池中设备的密钥
+// UpdateKeyInPool 更新池中设备的密钥（含注册时间戳）
-func UpdateKeyInPool(deviceHeader string, key string, ver int) error {
+func UpdateKeyInPool(deviceHeader string, ki *KeyInfo) error {
 	pool := GetDeviceKeyPool()
-	if !pool.IsEnabled() {
+	if !pool.IsEnabled() || ki == nil {
 		return nil
 	}
 
@@ -495,8 +544,10 @@ func UpdateKeyInPool(deviceHeader string, key string, ver int) error {
 
 	for _, item := range pool.items {
 		if item.DeviceHeader == deviceHeader {
-			item.Key = key
+			item.Key = ki.Key
-			item.KeyVer = ver
+			item.KeyVer = ki.Ver
+			item.KeyTs = ki.Ts
+			item.KeyFetchedAt = time.Now()
 			return pool.updateDeviceInDB(item)
 		}
 	}

internal/fqapi/device_register.go

@@ -5,6 +5,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fanqie/internal/common"
+	"fanqie/internal/config"
 	"fmt"
 	"math/big"
 	"net"
@@ -186,6 +187,22 @@ func generateIPv6List() []map[string]string {
 	}
 }
 
+// deviceIdentity 注册设备身份：pad（默认，历史行为）/ phone（对齐手机 App 书源注册 payload）
+func deviceIdentity() string {
+	if cfg := config.GetConfig(); cfg != nil && cfg.Fanqie.DeviceIdentity == "phone" {
+		return "phone"
+	}
+	return "pad"
+}
+
+// deviceCustomFields 注册身份对应的 custom 字段
+func deviceCustomFields() map[string]interface{} {
+	if deviceIdentity() == "phone" {
+		return map[string]interface{}{"host_bit": 64, "dragon_device_type": "phone"}
+	}
+	return map[string]interface{}{"host_bit": 32, "dragon_device_type": "pad"}
+}
+
 // GenerateFullRequestBody 生成完整的请求体数据
 func GenerateFullRequestBody() map[string]interface{} {
 	rawData := map[string]interface{}{
@@ -214,7 +231,7 @@ func GenerateFullRequestBody() map[string]interface{} {
 			"sim_serial_number":     []interface{}{},
 			"oaid_may_support":      false,
 			"device_platform":       "android",
-			"custom":                map[string]interface{}{"host_bit": 32, "dragon_device_type": "pad"},
+			"custom":                deviceCustomFields(),
 			"pre_installed_channel": "",
 			"is_system_app":         0,
 			"sdk_flavor":            "china",
@@ -234,6 +251,16 @@ func GenerateFullRequestBody() map[string]interface{} {
 	}
 	header["ipv6_list"] = generateIPv6List()
 
+	// phone 身份补充真机指纹字段（对齐书源注册 payload，规避 pad 身份的差异化风控）
+	if deviceIdentity() == "phone" {
+		rom, _ := header["rom"].(string)
+		header["hardware"] = "qcom"
+		header["device_device"] = rom
+		header["fingerprint"] = fmt.Sprintf("%v/%v/%v:%v/%s/%s:user/release-keys",
+			header["device_brand"], header["device_model"], header["device_model"],
+			header["os_version"], rom, rom)
+	}
+
 	for k, v := range genTime {
 		rawData[k] = v
 	}
@@ -252,9 +279,9 @@ func tryActivatePremium(header string) {
 		"channel=0",
 		"device_platform=android",
 		"os_version=0",
-		"version_code=58932",
+		"version_code=" + ClientVersionCode,
-		"manifest_version_code=58932",
+		"manifest_version_code=" + ClientVersionCode,
-		"update_version_code=58932",
+		"update_version_code=" + ClientVersionCode,
 		header,
 	}
 
@@ -365,7 +392,7 @@ func Register() (string, error) {
 		}
 
 		deviceModel := data["header"].(map[string]interface{})["device_model"].(string)
-		header := fmt.Sprintf("device_id=%v&device_type=%s&iid=%v&version_name=5.8.9.32",
+		header := fmt.Sprintf("device_id=%v&device_type=%s&iid=%v&version_name="+ClientVersionName,
 			respData["device_id_str"],
 			deviceModel,
 			respData["install_id_str"])

internal/fqapi/gorgon_utils.go

@@ -14,6 +14,16 @@ func CreateMD5(s string) string {
 	return hex.EncodeToString(hasher.Sum(nil))
 }
 
+// setCommonHeaders 注入番茄客户端通用请求头（与签名头不冲突，对齐书源实现降低风控特征）
+func setCommonHeaders(headers map[string]string) {
+	if _, ok := headers["x-tt-store-region"]; ok {
+		return
+	}
+	headers["x-tt-store-region"] = "cn-zj"
+	headers["x-tt-store-region-src"] = "did"
+	headers["sdk-version"] = "2"
+}
+
 // GorgonRequest Gorgon请求（使用签名切换器）
 func GorgonRequest(urlStr string, options map[string]interface{}) (*common.ClientResponse, error) {
 	headers, ok := options["headers"].(map[string]string)
@@ -21,6 +31,7 @@ func GorgonRequest(urlStr string, options map[string]interface{}) (*common.Clien
 		headers = make(map[string]string)
 		options["headers"] = headers
 	}
+	setCommonHeaders(headers)
 
 	dataMD5 := ""
 	if body, ok := options["body"].(string); ok && body != "" {
@@ -53,6 +64,7 @@ func GorgonRequestSync(urlStr string, options map[string]interface{}) (*common.C
 		headers = make(map[string]string)
 		options["headers"] = headers
 	}
+	setCommonHeaders(headers)
 
 	dataMD5 := ""
 	if body, ok := options["body"].(string); ok && body != "" {
@@ -69,9 +81,7 @@ func GorgonRequestSync(urlStr string, options map[string]interface{}) (*common.C
 	signedHeaders := algos.GlobalSignatureSwitcher.Sign(urlStr, headers)
 
 	// 删除x-ss-stub（如果存在）
-	if _, exists := signedHeaders["x-ss-stub"]; exists {
 	delete(signedHeaders, "x-ss-stub")
-	}
 
 	// 更新headers
 	for k, v := range signedHeaders {
@@ -90,6 +100,7 @@ func ContentRequest(urlStr string, options map[string]interface{}) (*common.Clie
 		headers = make(map[string]string)
 		options["headers"] = headers
 	}
+	setCommonHeaders(headers)
 
 	dataMD5 := ""
 	if body, ok := options["body"].(string); ok && body != "" {

internal/fqapi/manga.go

@@ -58,9 +58,14 @@ type ImageResult struct {
 	Index  int    `json:"index"`
 }
 
-// HandleGetManga 处理漫画请求
+// HandleGetManga 处理漫画请求；设备池签名路线全部失败时降级 wkbrowser 免签名兜底
 func HandleGetManga(itemID string, showHTML bool, urlOutputMode string) (interface{}, error) {
-	return getMangaWithRetry(itemID, showHTML, urlOutputMode, 0)
+	res, err := getMangaWithRetry(itemID, showHTML, urlOutputMode, 0)
+	if err == nil {
+		return res, nil
+	}
+	mangaLogger.Warning(fmt.Sprintf("签名路线失败，尝试 wkbrowser 免签名兜底: %v", err))
+	return fetchMangaFallback(itemID, showHTML)
 }
 
 // getMangaWithRetry 获取漫画内容，支持设备切换重试
@@ -87,7 +92,7 @@ func getMangaWithRetry(itemID string, showHTML bool, urlOutputMode string, retry
 	mangaLogger.Debug(fmt.Sprintf("使用池中设备 ID=%d (重试次数: %d)", item.ID, retryCount))
 
 	// 2. 构建URL - 使用 BuildURL 添加设备参数
-	headerWithoutVersion := strings.Replace(header, "&version_name=5.8.9.32", "", -1)
+	headerWithoutVersion := removeVersionFromHeader(header)
 
 	url := BuildURL("https://reading.snssdk.com/reading/reader/full/v/",
 		"aid=1967",
@@ -146,7 +151,7 @@ func getMangaWithRetry(itemID string, showHTML bool, urlOutputMode string, retry
 			mangaLogger.Warning("密钥版本不匹配，重新获取密钥")
 			newKeyInfo, err := GetKey(header)
 			if err == nil {
-				UpdateKeyInPool(header, newKeyInfo.Key, newKeyInfo.Ver)
+				UpdateKeyInPool(header, newKeyInfo)
 				keyInfo = newKeyInfo
 			} else {
 				mangaLogger.Warning("获取密钥失败，切换设备重试")

internal/fqapi/manga_fallback.go

@@ -0,0 +1,212 @@
+package fqapi
+
+import (
+	"encoding/json"
+	"fmt"
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
+
+	"fanqie/internal/common"
+)
+
+// 漫画免签名兜底（对齐书源 20261012 的 wkbrowser 路线）：
+// 设备池签名路线全部失败时，直接从 m.wkbrowser.com 取章节图片，
+// 无需注册设备/签名/解密，返回原图直链。
+
+var (
+	mangaFallbackItemIDRe = regexp.MustCompile(`^\d+$`)
+	trailingNumberRe      = regexp.MustCompile(`(\d+)$`)
+)
+
+const mangaFallbackOrigin = "https://p6-novel.byteimg.com/origin/"
+
+// fetchMangaFallback 免签名获取漫画章节图片（wkbrowser 原图直链）
+func fetchMangaFallback(itemID string, showHTML bool) (interface{}, error) {
+	if !mangaFallbackItemIDRe.MatchString(itemID) {
+		return nil, fmt.Errorf("无效的 item_id: %s", itemID)
+	}
+
+	client := common.NewHTTPClient()
+	resp, err := client.Get("https://m.wkbrowser.com/i"+itemID+"/info/v2/", map[string]string{
+		"User-Agent": "Mozilla/5.0 (Linux; Android 14) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0 Mobile Safari/537.36",
+		"Accept":     "application/json, text/plain, */*",
+	})
+	if err != nil {
+		return nil, fmt.Errorf("wkbrowser 请求失败: %w", err)
+	}
+
+	var body map[string]interface{}
+	if err := json.Unmarshal(resp.Content, &body); err != nil {
+		return nil, fmt.Errorf("wkbrowser 响应解析失败: %w", err)
+	}
+	data, _ := body["data"].(map[string]interface{})
+	if data == nil {
+		return nil, fmt.Errorf("wkbrowser 响应缺少 data（code=%v）", body["code"])
+	}
+
+	// content 为 JSON 字符串或对象，内含 materials/skeleton 图片清单
+	payload := data["content"]
+	if s, ok := payload.(string); ok {
+		var p map[string]interface{}
+		if err := json.Unmarshal([]byte(s), &p); err != nil {
+			return nil, fmt.Errorf("wkbrowser 图片内容解析失败: %w", err)
+		}
+		payload = p
+	}
+
+	uris := collectMangaFallbackURIs(payload)
+	if len(uris) == 0 {
+		return nil, fmt.Errorf("wkbrowser 未找到图片")
+	}
+
+	images := make([]ImageResult, len(uris))
+	for i, u := range uris {
+		images[i] = ImageResult{Data: u, Format: "unknown", Index: i}
+	}
+
+	if showHTML {
+		var b strings.Builder
+		for _, img := range images {
+			fmt.Fprintf(&b, "<img src=\"%s\">\n", img.Data)
+		}
+		return map[string]interface{}{"content": b.String(), "source": "wkbrowser"}, nil
+	}
+	return map[string]interface{}{"images": images, "source": "wkbrowser"}, nil
+}
+
+// collectMangaFallbackURIs 按书源三段策略收集图片链接（保证页序）：
+// 1) skeleton.data 顺序引用 materials 的 key
+// 2) materials key 按末尾数字排序
+// 3) 递归遍历全树兜底（顺序不保证，仅防白屏）
+func collectMangaFallbackURIs(payload interface{}) []string {
+	p, _ := payload.(map[string]interface{})
+	if p == nil {
+		return nil
+	}
+
+	images := make([]string, 0, 32)
+	seen := map[string]bool{}
+	push := func(uri string) {
+		src := mangaFallbackImageURL(uri)
+		if src != "" && !seen[src] {
+			seen[src] = true
+			images = append(images, src)
+		}
+	}
+
+	materials, _ := p["materials"].(map[string]interface{})
+	skeletonWrapper, _ := p["skeleton"].(map[string]interface{})
+	skeleton, _ := skeletonWrapper["data"].([]interface{})
+
+	if materials != nil && skeleton != nil {
+		for _, s := range skeleton {
+			node, _ := s.(map[string]interface{})
+			if node == nil {
+				continue
+			}
+			key := ""
+			for _, k := range []string{"elementInfo", "key", "id"} {
+				if v, _ := node[k].(string); v != "" {
+					key = v
+					break
+				}
+			}
+			if m, ok := materials[key].(map[string]interface{}); ok {
+				if uri := mangaFallbackNodeURI(m); uri != "" {
+					push(uri)
+				}
+			}
+		}
+		if len(images) > 0 {
+			return images
+		}
+	}
+
+	if materials != nil {
+		keys := make([]string, 0, len(materials))
+		for k := range materials {
+			keys = append(keys, k)
+		}
+		sort.Slice(keys, func(i, j int) bool {
+			return trailingNumber(keys[i]) < trailingNumber(keys[j])
+		})
+		for _, k := range keys {
+			if m, ok := materials[k].(map[string]interface{}); ok {
+				if uri := mangaFallbackNodeURI(m); uri != "" {
+					push(uri)
+				}
+			}
+		}
+		if len(images) > 0 {
+			return images
+		}
+	}
+
+	var walk func(node interface{})
+	walk = func(node interface{}) {
+		switch t := node.(type) {
+		case []interface{}:
+			for _, item := range t {
+				walk(item)
+			}
+		case map[string]interface{}:
+			if uri := mangaFallbackNodeURI(t); uri != "" {
+				push(uri)
+				return
+			}
+			for _, v := range t {
+				switch v.(type) {
+				case map[string]interface{}, []interface{}:
+					walk(v)
+				}
+			}
+		}
+	}
+	walk(p)
+	return images
+}
+
+// mangaFallbackNodeURI 从 materials 节点取图片资源（web_uri 优先，其次 novel-pic/md5）
+func mangaFallbackNodeURI(node map[string]interface{}) string {
+	if d, ok := node["data"].(map[string]interface{}); ok {
+		if u, _ := d["web_uri"].(string); u != "" {
+			return u
+		}
+	}
+	if u, _ := node["web_uri"].(string); u != "" {
+		return u
+	}
+	if d, ok := node["data"].(map[string]interface{}); ok {
+		if md5, _ := d["md5"].(string); md5 != "" {
+			return "novel-pic/" + md5
+		}
+	}
+	return ""
+}
+
+// mangaFallbackImageURL web_uri 转可访问的原图直链
+func mangaFallbackImageURL(uri string) string {
+	u := strings.TrimPrefix(uri, "/")
+	if u == "" {
+		return ""
+	}
+	if strings.HasPrefix(u, "http://") {
+		return "https://" + strings.TrimPrefix(u, "http://")
+	}
+	if strings.HasPrefix(u, "https://") {
+		return u
+	}
+	return mangaFallbackOrigin + u
+}
+
+// trailingNumber 取字符串末尾数字（materials key 排序用），无数字排最后
+func trailingNumber(s string) int {
+	m := trailingNumberRe.FindStringSubmatch(s)
+	if m == nil {
+		return 1 << 30
+	}
+	n, _ := strconv.Atoi(m[1])
+	return n
+}

internal/fqapi/manga_fallback_test.go

@@ -0,0 +1,44 @@
+package fqapi
+
+import "testing"
+
+// TestCollectMangaFallbackURIs skeleton 顺序优先、web_uri/md5 取值与原图直链拼接
+func TestCollectMangaFallbackURIs(t *testing.T) {
+	payload := map[string]interface{}{
+		"materials": map[string]interface{}{
+			"img_1": map[string]interface{}{"data": map[string]interface{}{"web_uri": "novel-pic/aaa"}},
+			"img_2": map[string]interface{}{"data": map[string]interface{}{"web_uri": "/novel-pic/bbb"}},
+			"img_3": map[string]interface{}{"data": map[string]interface{}{"md5": "c0ffee"}},
+		},
+		"skeleton": map[string]interface{}{
+			"data": []interface{}{
+				map[string]interface{}{"elementInfo": "img_2"},
+				map[string]interface{}{"key": "img_1"},
+				map[string]interface{}{"id": "img_3"},
+			},
+		},
+	}
+
+	// 页序以 skeleton 引用顺序为准
+	want := []string{
+		"https://p6-novel.byteimg.com/origin/novel-pic/bbb",
+		"https://p6-novel.byteimg.com/origin/novel-pic/aaa",
+		"https://p6-novel.byteimg.com/origin/novel-pic/c0ffee",
+	}
+	got := collectMangaFallbackURIs(payload)
+	if len(got) != len(want) {
+		t.Fatalf("got %d 张 want %d 张: %v", len(got), len(want), got)
+	}
+	for i := range want {
+		if got[i] != want[i] {
+			t.Errorf("[%d] got %s want %s", i, got[i], want[i])
+		}
+	}
+
+	// 无 skeleton 时退化为 materials key 末尾数字排序
+	delete(payload, "skeleton")
+	got = collectMangaFallbackURIs(payload)
+	if got[0] != want[1] || got[1] != want[0] {
+		t.Errorf("key 排序错误: %v", got)
+	}
+}

internal/fqapi/multi_content.go

@@ -1,14 +1,9 @@
 package fqapi
 
 import (
-	"bytes"
-	"compress/zlib"
-	"encoding/base64"
 	"encoding/json"
 	"fanqie/internal/common"
 	"fmt"
-	"io"
-	"sort"
 	"strings"
 	"sync"
 )
@@ -17,57 +12,29 @@ var (
 	multiContentLogger = common.NewLogger("multi_content", "INFO", "")
 )
 
-// handleDecryptTask 处理解密任务
+// handleDecryptTask 处理解密任务（crypt_status 分支见 decodeContentBody）
 func handleDecryptTask(itemID string, itemData map[string]interface{}, keyInfo *KeyInfo, textMode, imageMode bool) (string, map[string]interface{}) {
 	if code, ok := itemData["code"].(float64); !ok || code != 0 {
 		return itemID, itemData
 	}
 
-	contentEncoded, ok := itemData["content"].(string)
+	if _, ok := itemData["content"].(string); !ok {
-	if !ok {
 		return itemID, itemData
 	}
 
-	// 解码content
+	// 解密（含压缩与明文分支）
-	contentBytes, err := base64.StdEncoding.DecodeString(contentEncoded)
+	contentStr, err := decodeContentBody(itemData, keyInfo)
-	if err != nil || len(contentBytes) < 16 {
+	if err != nil || contentStr == "" {
+		// 解密失败保留上游原样（ignore_failed 默认跳过失败章节）
 		return itemID, itemData
 	}
 
-	iv := contentBytes[0:16]
-	encryptedData := contentBytes[16:]
-
-	// 解密
-	if keyInfo == nil {
-		return itemID, itemData
-	}
-
-	keyBytes, _ := base64.StdEncoding.DecodeString(keyInfo.Key)
-	decrypted, err := De(encryptedData, keyBytes, iv)
-	if err != nil {
-		return itemID, itemData
-	}
-
-	// 检查是否需要解压
-	compressStatus, _ := itemData["compress_status"].(float64)
-	if compressStatus != 0 {
-		// zlib解压
-		reader, err := zlib.NewReader(bytes.NewReader(decrypted))
-		if err == nil {
-			decompressed, err := io.ReadAll(reader)
-			reader.Close()
-			if err == nil {
-				decrypted = decompressed
-			}
-		}
-	}
-
 	// 更新内容
 	bodyCopy := make(map[string]interface{})
 	for k, v := range itemData {
 		bodyCopy[k] = v
 	}
-	bodyCopy["content"] = string(decrypted)
+	bodyCopy["content"] = contentStr
 
 	// 缓存
 	cacheData := buildCacheData(bodyCopy)
@@ -75,7 +42,7 @@ func handleDecryptTask(itemID string, itemData map[string]interface{}, keyInfo *
 
 	// 解析内容
 	parser := NewContentParser()
-	bodyCopy["content"] = parser.Parse(string(decrypted), textMode, imageMode)
+	bodyCopy["content"] = parser.Parse(contentStr, textMode, imageMode)
 
 	return itemID, bodyCopy
 }
@@ -121,10 +88,11 @@ func MultiContent(itemIDs interface{}, bookID string, textMode, imageMode, ignor
 	currentKeyInfo := &KeyInfo{
 		Key: item.Key,
 		Ver: item.KeyVer,
+		Ts:  item.KeyTs,
 	}
 	multiContentLogger.Debug(fmt.Sprintf("使用池中设备 ID=%d (depth: %d)", item.ID, depth))
 
-	// 构建参数
+	// 构建参数（form 编码，见 buildSortedQuery 注释）
 	headerWithoutVersion := removeVersionFromHeader(header)
 
 	params := []string{
@@ -133,18 +101,15 @@ func MultiContent(itemIDs interface{}, bookID string, textMode, imageMode, ignor
 		"channel=0",
 		"device_platform=android",
 		"os_version=0",
-		"version_code=66.9",
+		"version_code=" + ClientVersionCode,
 		"book_id=" + bookID,
 		"item_ids=" + itemIDStr,
 		"novel_text_type=1",
 		"req_type=1",
+		fmt.Sprintf("key_register_ts=%d", currentKeyInfo.Ts),
 		headerWithoutVersion,
 	}
-
+	sortedParams := buildSortedQuery(params...)
-	allParams := strings.Join(params, "&")
-	paramList := strings.Split(allParams, "&")
-	sort.Strings(paramList)
-	sortedParams := strings.Join(paramList, "&")
 
 	url := "https://reading.snssdk.com/reading/reader/batch_full/v/?" + sortedParams
 
@@ -205,7 +170,7 @@ func MultiContent(itemIDs interface{}, bookID string, textMode, imageMode, ignor
 					multiContentLogger.Warning("密钥版本不匹配，重新获取密钥")
 					newKeyInfo, err := GetKey(header)
 					if err == nil {
-						UpdateKeyInPool(header, newKeyInfo.Key, newKeyInfo.Ver)
+						UpdateKeyInPool(header, newKeyInfo)
 					} else {
 						// 获取密钥失败，切换设备
 						multiContentLogger.Warning(fmt.Sprintf("获取密钥失败，切换设备重试 (depth: %d)", depth))

internal/fqapi/multi_detail.go

@@ -3,6 +3,7 @@ package fqapi
 import (
 	"fanqie/internal/common"
 	"fmt"
+	"sort"
 	"strings"
 	"sync"
 )
@@ -108,11 +109,41 @@ func chunkArray(arr []string, size int) [][]string {
 
 // HandleGetMultiDetail 处理批量获取书籍详情,详情数据基本不变,缓存 24 小时
 func HandleGetMultiDetail(bookID interface{}) (string, error) {
-	return withCache(fmt.Sprintf("multi_detail_%v", bookID), 86400, func() (string, error) {
+	// 缓存 key 归一化：ID 排序去重，相同集合不同顺序共享缓存
+	ids := normalizeIDList(bookID)
+	if ids == "" {
+		return fetchMultiDetail(bookID)
+	}
+	return withCache("multi_detail_"+ids, 86400, func() (string, error) {
 		return fetchMultiDetail(bookID)
 	})
 }
 
+// normalizeIDList 将 book_id 参数归一化为排序去重后的逗号串
+func normalizeIDList(bookID interface{}) string {
+	var list []string
+	switch v := bookID.(type) {
+	case string:
+		list = strings.Split(v, ",")
+	case []string:
+		list = v
+	default:
+		return ""
+	}
+	seen := make(map[string]bool, len(list))
+	out := make([]string, 0, len(list))
+	for _, id := range list {
+		id = strings.TrimSpace(id)
+		if id == "" || seen[id] {
+			continue
+		}
+		seen[id] = true
+		out = append(out, id)
+	}
+	sort.Strings(out)
+	return strings.Join(out, ",")
+}
+
 func fetchMultiDetail(bookID interface{}) (string, error) {
 	if bookID == nil {
 		return BuildErrorResponse("需要参数 book_id"), nil

internal/fqapi/rank.go

@@ -0,0 +1,77 @@
+package fqapi
+
+import (
+	"fanqie/internal/common"
+	"fmt"
+	"net/url"
+)
+
+var rankLogger = common.NewLogger("rank", "INFO", "")
+
+// rankSDKHosts 免签名榜单接口的可用域名（依次容错）
+var rankSDKHosts = []string{
+	"https://novel.snssdk.com",
+	"https://api.fanqiesdk.com",
+	"https://api-lf.fanqiesdk.com",
+}
+
+const rankSDKUA = "com.ss.android.article.news/7.0.3 (Linux; U; Android 12; zh_CN; Pixel 6)"
+
+// RankTypes 榜单类型
+var RankTypes = map[int]string{
+	10: "推荐榜",
+	11: "完结榜",
+	12: "热搜榜",
+	13: "黑马榜",
+	15: "爆更榜",
+}
+
+// HandleGetRank 处理获取榜单,榜单数据动态,短缓存 10 分钟
+// sideType 见 RankTypes（无效值回退推荐榜）；page 从 1 起，每页 20 本
+func HandleGetRank(sideType, page int) (string, error) {
+	if _, ok := RankTypes[sideType]; !ok {
+		sideType = 10
+	}
+	if page < 1 {
+		page = 1
+	}
+	return withCache(fmt.Sprintf("rank_%d_%d", sideType, page), 600, func() (string, error) {
+		return fetchRank(sideType, page)
+	})
+}
+
+// fetchRank 免签名 SDK 接口获取榜单（无设备/签名依赖，多域名容错）
+func fetchRank(sideType, page int) (string, error) {
+	vals := url.Values{
+		"aid":       {"13"},
+		"type":      {"1"},
+		"side_type": {fmt.Sprintf("%d", sideType)},
+		"offset":    {fmt.Sprintf("%d", page-1)},
+		"limit":     {"20"},
+	}
+	path := "/api/novel/channel/homepage/rank/rank_list/v2/?" + vals.Encode()
+
+	var lastErr error
+	client := common.NewHTTPClient()
+	for _, host := range rankSDKHosts {
+		resp, err := client.Get(host+path, map[string]string{
+			"User-Agent": rankSDKUA,
+			"Accept":     "application/json, text/plain, */*",
+		})
+		if err != nil {
+			lastErr = err
+			continue
+		}
+		respJSON, err := resp.JSON()
+		if err != nil {
+			lastErr = fmt.Errorf("响应解析失败: %w", err)
+			continue
+		}
+		if code, ok := respJSON["code"].(float64); ok && code == 0 {
+			return reencodeUnwrapped(resp.Text), nil
+		}
+		lastErr = fmt.Errorf("code=%.0f msg=%v", respJSON["code"], respJSON["message"])
+	}
+	rankLogger.Error(fmt.Sprintf("获取榜单失败: %v", lastErr))
+	return BuildErrorResponse("获取榜单失败"), lastErr
+}

internal/fqapi/register_key.go

@@ -12,15 +12,13 @@ import (
 	"fmt"
 	"math/rand"
 	"regexp"
-	"sort"
-	"strings"
-	"time"
 )
 
 // KeyInfo 密钥信息
 type KeyInfo struct {
 	Key string `json:"key"`
 	Ver int    `json:"ver"`
+	Ts  int64  `json:"ts"` // 密钥注册时间戳（key_register_ts），随正文请求上传可降低密钥不匹配重试
 }
 
 var (
@@ -154,25 +152,22 @@ func GetKey(header string) (*KeyInfo, error) {
 
 	keyLogger.Info("正在获取密钥...")
 
-	// 构建参数
+	// 构建参数（form 编码：机型含空格等字符时 URL 与签名一致才不会注册失败）
 	params := []string{
 		"aid=1967",
 		"app_name=novelapp",
 		"channel=0",
 		"device_platform=android",
 		"os_version=0",
-		"version_code=5.8.9.32",
+		"version_code=" + ClientVersionCode,
 		header,
 	}
-
+	sortedParams := buildSortedQuery(params...)
-	allParams := strings.Join(params, "&")
-	paramList := strings.Split(allParams, "&")
-	sort.Strings(paramList)
-	sortedParams := strings.Join(paramList, "&")
 
 	// 准备请求体
 	requestBody := map[string]string{
 		"content": content,
+		"keyver":  "1",
 	}
 
 	bodyJSON, _ := json.Marshal(requestBody)
@@ -203,6 +198,12 @@ func GetKey(header string) (*KeyInfo, error) {
 		var respData map[string]interface{}
 		json.Unmarshal(resp.Content, &respData)
 
+		// 上游判定该设备无需解密（正文明文下发），返回空密钥信息由调用方分支处理
+		if code, ok := respData["code"].(float64); ok && int(code) == 500003 {
+			keyLogger.Info("上游标记无需解密（code=500003）")
+			return &KeyInfo{}, nil
+		}
+
 		dataObj, ok := respData["data"].(map[string]interface{})
 		if !ok {
 			return nil, fmt.Errorf("响应格式错误")
@@ -231,12 +232,17 @@ func GetKey(header string) (*KeyInfo, error) {
 		finalKey := base64.StdEncoding.EncodeToString(decryptedKey)
 
 		keyVer, _ := dataObj["keyver"].(float64)
+		keyTs, _ := dataObj["key_register_ts"].(float64)
+		if keyTs == 0 {
+			keyTs, _ = dataObj["register_time"].(float64)
+		}
 		keyInfo = &KeyInfo{
 			Key: finalKey,
 			Ver: int(keyVer),
+			Ts:  int64(keyTs),
 		}
 
-		keyLogger.Info(fmt.Sprintf("密钥获取成功！"))
+		keyLogger.Info("密钥获取成功！")
 
 		return keyInfo, nil
 	}
@@ -248,7 +254,3 @@ func GetKey(header string) (*KeyInfo, error) {
 func GetKeyInfo() *KeyInfo {
 	return keyInfo
 }
-
-func init() {
-	rand.Seed(time.Now().UnixNano())
-}

internal/fqapi/request_log.go

@@ -16,7 +16,7 @@ type RequestLogEntry struct {
 	IP         string `json:"ip"`
 	Method     string `json:"method"`
 	Path       string `json:"path"`
-	Query      string `json:"query"`     // 解码后查询串（含 key，不脱敏）
+	Query      string `json:"query"`     // 解码后查询串（key 参数值已脱敏）
 	Status     int    `json:"status"`
 	DurationMs int64  `json:"duration_ms"`
 	ErrorMsg   string `json:"error_msg"`  // 仅 status>=400 时截断保留

internal/fqapi/search.go

@@ -6,12 +6,22 @@ import (
 	"fanqie/internal/common"
 	"fmt"
 	"net/url"
+	"regexp"
+	"strconv"
+	"time"
 )
 
 var searchLogger = common.NewLogger("search", "INFO", "")
 
-// GetDeviceHeader 获取设备header（需要从外部注入）
+// 搜索分页与上游续传参数（对齐书源 20261012：上游翻页依赖上一页返回的
-var GetDeviceHeader func() string
+// passback/search_id/next_offset/corrected_query 续传，仅传数字 offset 深翻页会拿到重复/错序结果）
+const (
+	searchPageSize     = 10 // 对外每页书数
+	searchMaxUpstreams = 24 // 单次搜索累计上游翻页上限（对齐书源）
+)
+
+// bookIDKeyRe 纯数字 15~20 位关键词按书 ID 直搜详情
+var bookIDKeyRe = regexp.MustCompile(`^\d{15,20}$`)
 
 // HandleBookSearch 处理书籍搜索,搜索结果短缓存 10 分钟,减轻上游压力
 func HandleBookSearch(key string, offset int, tabType int) (string, error) {
@@ -24,21 +34,111 @@ func fetchBookSearch(key string, offset int, tabType int) (string, error) {
 	if key == "" {
 		return BuildErrorResponseWithCode(1, "需要参数 key"), nil
 	}
-
 	if tabType == 0 {
 		tabType = 3
 	}
+	if offset < 0 {
+		offset = 0
+	}
 
-	// 编码查询关键字
+	// 书 ID 直搜：跳过搜索接口直接查详情，精确命中单本
-	encodedKey := url.QueryEscape(key)
+	if bookIDKeyRe.MatchString(key) {
+		return idSearchResult(key)
+	}
 
-	// 使用新的参数构建函数
+	// 累计翻页直到凑够本页书：上游单页 count=20，按 book_id 去重后切出 offset 起的 10 本
-	reqURL := BuildURL("https://reading.snssdk.com/reading/bookapi/search/tab/v/",
+	session := strconv.FormatInt(time.Now().UnixNano(), 10)
-		fmt.Sprintf("tab_type=%d", tabType),
+	var (
-		"update_version_code=58932",
+		rows      []interface{} // 上游搜索行（含 book_data 包装），原样透传
-		"query="+encodedKey,
+		seen      = map[string]bool{}
-		fmt.Sprintf("passback=%d", offset),
+		passback  = "0"
+		searchID  = ""
+		corrected = ""
+		nextOff   = 0
+		hasMore   = true
 	)
+	want := offset + searchPageSize
+
+	for i := 0; i < searchMaxUpstreams && hasMore && len(rows) < want; i++ {
+		params := []string{
+			fmt.Sprintf("tab_type=%d", tabType),
+			"update_version_code=" + ClientVersionCode,
+			"query=" + url.QueryEscape(key),
+			"passback=" + passback,
+			fmt.Sprintf("offset=%d", nextOff),
+			"count=20",
+			fmt.Sprintf("is_first_enter_search=%t", i == 0),
+			"normal_session_id=" + session,
+			"cold_start_session_id=" + session,
+		}
+		if searchID != "" {
+			params = append(params, "search_id="+searchID)
+		}
+		if corrected != "" {
+			params = append(params, "corrected_query="+corrected)
+		}
+
+		tab, err := fetchSearchTab(params, tabType)
+		if err != nil {
+			if i == 0 {
+				return BuildErrorResponseWithCode(1, "搜索请求失败"), err
+			}
+			break // 已有数据时后续页失败，降级返回现有结果
+		}
+		if tab == nil {
+			break
+		}
+
+		if data, ok := tab["data"].([]interface{}); ok {
+			for _, r := range data {
+				row, _ := r.(map[string]interface{})
+				if row == nil {
+					continue
+				}
+				// 行 ID 取 book_data[0].book_id；无包装的行按行本身的 book_id
+				bd, _ := row["book_data"].([]interface{})
+				if len(bd) > 0 {
+					if b, ok := bd[0].(map[string]interface{}); ok {
+						if id := searchRowID(b); id != "" && !seen[id] {
+							seen[id] = true
+							rows = append(rows, row)
+						}
+						continue
+					}
+				}
+				if id := searchRowID(row); id != "" && !seen[id] {
+					seen[id] = true
+					rows = append(rows, row)
+				}
+			}
+		}
+
+		hasMore = searchHasMore(tab["has_more"])
+		nextOff = searchInt(tab["next_offset"])
+		passback = searchStr(tab["passback"])
+		searchID = searchStr(tab["search_id"])
+		corrected = searchStr(tab["corrected_query"])
+	}
+
+	start, end := offset, offset+searchPageSize
+	if start > len(rows) {
+		start = len(rows)
+	}
+	if end > len(rows) {
+		end = len(rows)
+	}
+	return marshalNoEscape(UnwrapJSONStrings(map[string]interface{}{
+		"code":        0,
+		"message":     "SUCCESS",
+		"data":        rows[start:end],
+		"has_more":    hasMore || end < len(rows),
+		"next_offset": offset + searchPageSize,
+	})), nil
+}
+
+// fetchSearchTab 请求一页搜索并返回目标 tab_type 的 tab；nil 表示该页无匹配 tab
+func fetchSearchTab(params []string, tabType int) (map[string]interface{}, error) {
+	reqURL := BuildURL("https://reading.snssdk.com/reading/bookapi/search/tab/v/", params...)
 
 	resp, err := GorgonRequest(reqURL, map[string]interface{}{
 		"method": "GET",
@@ -46,35 +146,61 @@ func fetchBookSearch(key string, offset int, tabType int) (string, error) {
 			"User-Agent": "com.dragon.read",
 		},
 	})
-
 	if err != nil {
 		searchLogger.Error(fmt.Sprintf("搜索请求失败: %v", err))
-		return BuildErrorResponseWithCode(1, "搜索请求失败"), err
+		return nil, err
 	}
 
-	respJSON, err := resp.JSON()
+	// UseNumber 重新解析后按 tab_type 过滤:
-	if err != nil {
-		searchLogger.Error(fmt.Sprintf("解析响应失败: %v", err))
-		return BuildErrorResponseWithCode(1, "解析响应失败"), err
-	}
-
-	if code, ok := respJSON["code"].(float64); ok && code == 0 {
-		// 用 UseNumber 重新解析后按 tab_type 过滤:
 	// 上游 search/tab/v/ 固定返回所有 tab 的 search_tabs;
 	// 大整数 ID 经 float64 重组会丢精度,必须 UseNumber
 	dec := json.NewDecoder(bytes.NewReader(resp.Content))
 	dec.UseNumber()
-		var numJSON map[string]interface{}
+	var pageJSON map[string]interface{}
-		if err := dec.Decode(&numJSON); err != nil {
+	if err := dec.Decode(&pageJSON); err != nil {
-			return resp.Text, nil // 解析失败时退回原样转发
+		searchLogger.Error(fmt.Sprintf("解析响应失败: %v", err))
+		return nil, fmt.Errorf("解析失败")
 	}
-		filterSearchTabs(numJSON, tabType)
+	if code, _ := pageJSON["code"].(float64); code != 0 {
-		unwrapSearchTab(numJSON)
+		return nil, fmt.Errorf("搜索失败 code=%v", pageJSON["code"])
-		UnwrapJSONStrings(numJSON)
-		return ToJSON(numJSON)
 	}
 
-	return BuildErrorResponseWithCode(1, "搜索失败"), nil
+	filterSearchTabs(pageJSON, tabType)
+	tabs, _ := pageJSON["search_tabs"].([]interface{})
+	for _, t := range tabs {
+		m, ok := t.(map[string]interface{})
+		if !ok {
+			continue
+		}
+		if tt, ok := m["tab_type"].(json.Number); ok {
+			if v, err := tt.Int64(); err == nil && int(v) == tabType {
+				return m, nil
+			}
+		}
+	}
+	return nil, nil
+}
+
+// idSearchResult 书 ID 直搜：复用详情接口（24h 缓存），包成上游搜索行形状（book_data 包装）
+func idSearchResult(bookID string) (string, error) {
+	detailJSON, err := HandleGetDetail(bookID)
+	if err != nil {
+		return BuildErrorResponseWithCode(1, "ID 搜索失败"), err
+	}
+	var detail map[string]interface{}
+	if err := json.Unmarshal([]byte(detailJSON), &detail); err != nil {
+		return detailJSON, nil // 透传上游错误响应
+	}
+	if code, _ := detail["code"].(float64); code != 0 {
+		return detailJSON, nil
+	}
+	return marshalNoEscape(UnwrapJSONStrings(map[string]interface{}{
+		"code":        0,
+		"message":     "SUCCESS",
+		"data":        []interface{}{map[string]interface{}{"book_data": []interface{}{detail["data"]}}},
+		"has_more":    false,
+		"next_offset": 0,
+	})), nil
 }
 
 // filterSearchTabs 按 tab_type 只保留 search_tabs 中匹配的项;无匹配时保留原样
@@ -100,26 +226,44 @@ func filterSearchTabs(respJSON map[string]interface{}, tabType int) {
 	}
 }
 
-// unwrapSearchTab 将过滤后的唯一 tab 展平：去掉 search_tabs 包装，
+// searchRowID 取行的 book_id（UseNumber 下为 json.Number，也可能是字符串）
-// tab 的 data 直接作为顶层 data，并提升分页字段 has_more/next_offset
+func searchRowID(m map[string]interface{}) string {
-func unwrapSearchTab(respJSON map[string]interface{}) {
+	if m == nil {
-	tabs, ok := respJSON["search_tabs"].([]interface{})
+		return ""
-	if !ok || len(tabs) != 1 {
-		return
 	}
-	tab, ok := tabs[0].(map[string]interface{})
+	if s, _ := m["book_id"].(string); s != "" {
-	if !ok {
+		return s
-		return
-	}
-	delete(respJSON, "search_tabs")
-	delete(respJSON, "selected_tab_idx") // tab 已展平，索引无意义
-	delete(respJSON, "server_ab_params") // 上游 AB 实验参数，透传无意义
-	if data, ok := tab["data"]; ok {
-		respJSON["data"] = data
-	}
-	for _, k := range []string{"has_more", "next_offset"} {
-		if v, ok := tab[k]; ok {
-			respJSON[k] = v
 	}
+	if n, ok := m["book_id"].(json.Number); ok {
+		return n.String()
 	}
+	return ""
+}
+
+func searchStr(v interface{}) string {
+	s, _ := v.(string)
+	return s
+}
+
+func searchInt(v interface{}) int {
+	switch t := v.(type) {
+	case json.Number:
+		n, _ := t.Int64()
+		return int(n)
+	case string:
+		n, _ := strconv.Atoi(t)
+		return n
+	}
+	return 0
+}
+
+func searchHasMore(v interface{}) bool {
+	switch t := v.(type) {
+	case bool:
+		return t
+	case json.Number:
+		n, _ := t.Int64()
+		return n != 0
+	}
+	return false
 }

internal/fqapi/shelf.go

@@ -0,0 +1,194 @@
+package fqapi
+
+import (
+	"fanqie/internal/common"
+	"fmt"
+	"strings"
+)
+
+var shelfLogger = common.NewLogger("shelf", "INFO", "")
+
+// HandleBookshelf 获取登录用户书架。个人动态数据不缓存。
+// group 非空时只返回该分组的书；书架接口对无效/过期 sessionid 也返回空书架，无法区分——
+// 空结果时提示重新登录
+func HandleBookshelf(sessionID, group string) (string, error) {
+	if sessionID == "" {
+		return BuildErrorResponse("需要参数 sessionid（在 fanqienovel.com 登录后从浏览器 Cookie 中获取）"), nil
+	}
+
+	resp, err := signedBookAPIGet("/reading/bookapi/bookshelf/info/v/", nil, sessionID)
+	if err != nil {
+		shelfLogger.Error(fmt.Sprintf("获取书架失败: %v", err))
+		return BuildErrorResponse("获取书架失败"), err
+	}
+
+	items, err := bookAPIList(resp, "book_shelf_info")
+	if err != nil {
+		return BuildErrorResponse("获取书架失败: " + err.Error()), nil
+	}
+
+	// 过滤分组并收集 book_id
+	type shelfRow struct {
+		id        string
+		groupName string
+	}
+	rows := make([]shelfRow, 0, len(items))
+	for _, it := range items {
+		m, ok := it.(map[string]interface{})
+		if !ok {
+			continue
+		}
+		id := bookIDOf(m)
+		if id == "" {
+			continue
+		}
+		gn, _ := m["group_name"].(string)
+		if group != "" && gn != group {
+			continue
+		}
+		rows = append(rows, shelfRow{id: id, groupName: gn})
+	}
+
+	if len(rows) == 0 {
+		return BuildErrorResponse("书架为空：sessionid 可能无效或已过期，请重新获取"), nil
+	}
+
+	ids := make([]string, len(rows))
+	for i, row := range rows {
+		ids[i] = row.id
+	}
+	details := detailMapByIDs(ids)
+	result := make([]map[string]interface{}, 0, len(rows))
+	for _, row := range rows {
+		d := details[row.id]
+		if d == nil {
+			d = map[string]interface{}{"book_id": row.id}
+		}
+		d["group_name"] = row.groupName
+		result = append(result, d)
+	}
+
+	return marshalNoEscape(UnwrapJSONStrings(buildCacheData(result))), nil
+}
+
+// HandleReadHistory 获取登录用户阅读历史。个人动态数据不缓存。
+// offset 从 0 起，每页 20 条；每项合并书籍详情并保留原始记录（进度等）于 history 字段
+func HandleReadHistory(sessionID string, offset int) (string, error) {
+	if sessionID == "" {
+		return BuildErrorResponse("需要参数 sessionid（在 fanqienovel.com 登录后从浏览器 Cookie 中获取）"), nil
+	}
+	if offset < 0 {
+		offset = 0
+	}
+
+	resp, err := signedBookAPIGet("/reading/bookapi/read_history/list/v/",
+		[]string{fmt.Sprintf("offset=%d", offset), "book_type=0"}, sessionID)
+	if err != nil {
+		shelfLogger.Error(fmt.Sprintf("获取阅读历史失败: %v", err))
+		return BuildErrorResponse("获取阅读历史失败"), err
+	}
+
+	items, err := bookAPIList(resp, "data_list")
+	if err != nil {
+		return BuildErrorResponse("获取阅读历史失败: " + err.Error()), nil
+	}
+
+	type historyRow struct {
+		id  string
+		raw map[string]interface{}
+	}
+	rows := make([]historyRow, 0, len(items))
+	for _, it := range items {
+		m, ok := it.(map[string]interface{})
+		if !ok {
+			continue
+		}
+		id := bookIDOf(m)
+		if id == "" {
+			continue
+		}
+		rows = append(rows, historyRow{id: id, raw: m})
+	}
+
+	if len(rows) == 0 {
+		return marshalNoEscape(buildCacheData([]interface{}{})), nil
+	}
+
+	ids := make([]string, len(rows))
+	for i, row := range rows {
+		ids[i] = row.id
+	}
+	details := detailMapByIDs(ids)
+	result := make([]map[string]interface{}, 0, len(rows))
+	for _, row := range rows {
+		d := details[row.id]
+		if d == nil {
+			d = map[string]interface{}{"book_id": row.id}
+		}
+		// 原始记录（含阅读进度/时间）挂 history 字段保留
+		d["history"] = row.raw
+		result = append(result, d)
+	}
+
+	return marshalNoEscape(UnwrapJSONStrings(buildCacheData(result))), nil
+}
+
+// signedBookAPIGet 个人书架/历史接口：常规签名请求 + 登录态 Cookie
+func signedBookAPIGet(path string, extraParams []string, sessionID string) (*common.ClientResponse, error) {
+	reqURL := BuildURL("https://reading.snssdk.com"+path, extraParams...)
+	return GorgonRequest(reqURL, map[string]interface{}{
+		"method": "GET",
+		"headers": map[string]string{
+			"User-Agent": "com.dragon.read",
+			"Cookie":     "sessionid=" + sessionID,
+		},
+	})
+}
+
+// bookAPIList 校验上游响应并取出 data 下的指定列表字段
+func bookAPIList(resp *common.ClientResponse, field string) ([]interface{}, error) {
+	respJSON, err := resp.JSON()
+	if err != nil {
+		return nil, fmt.Errorf("响应解析失败: %w", err)
+	}
+	if code, ok := respJSON["code"].(float64); !ok || code != 0 {
+		msg, _ := respJSON["message"].(string)
+		return nil, fmt.Errorf("code=%.0f msg=%s", respJSON["code"], msg)
+	}
+	data, _ := respJSON["data"].(map[string]interface{})
+	items, _ := data[field].([]interface{})
+	return items, nil
+}
+
+// bookIDOf 兼容提取 book_id / book_id_str（数字或字符串）
+func bookIDOf(m map[string]interface{}) string {
+	for _, k := range []string{"book_id_str", "book_id", "bookId"} {
+		switch v := m[k].(type) {
+		case string:
+			if v != "" {
+				return v
+			}
+		case float64:
+			return fmt.Sprintf("%.0f", v)
+		}
+	}
+	return ""
+}
+
+// detailMapByIDs 按 book_id 建立详情映射（复用批量详情接口，分批请求）
+func detailMapByIDs(ids []string) map[string]map[string]interface{} {
+	m := make(map[string]map[string]interface{}, len(ids))
+	for _, chunk := range chunkArray(ids, 100) {
+		list, err := multiDetail(strings.Join(chunk, ","))
+		if err != nil {
+			shelfLogger.Warning(fmt.Sprintf("批量获取详情失败（该批保留 book_id）: %v", err))
+			continue
+		}
+		for _, d := range list {
+			if id, ok := d["book_id"].(string); ok {
+				m[id] = d
+			}
+		}
+	}
+	return m
+}

internal/fqapi/store_redis.go

@@ -77,7 +77,7 @@ func loadAudioProxyEntry(key string) (*audioProxyEntry, error) {
 
 	val, err := redisCache.Get(ctx, redisAudioKeyPrefix+key).Result()
 	if err != nil {
-		return nil, fmt.Errorf("音频信息不存在或已过期，请重新调用 /audio 接口")
+		return nil, fmt.Errorf("媒体信息不存在或已过期，请重新调用 /audio 或 /video 接口")
 	}
 
 	var entry audioProxyEntry

internal/fqapi/video.go

@@ -1,17 +1,27 @@
 package fqapi
 
 import (
+	"bytes"
 	"encoding/base64"
 	"encoding/json"
 	"fanqie/internal/common"
+	"fanqie/internal/config"
 	"fmt"
+	"io"
 	"math"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
 )
 
 var videoLogger = common.NewLogger("video", "INFO", "")
 
-// HandleVideo 处理获取视频（支持批量和单个接口）
+// HandleVideo 处理获取视频（支持批量和单个接口）。
-func HandleVideo(itemIDs interface{}) (string, error) {
+// output: url（默认，返回原始CDN链接，内容为 CENC 加密）/ proxy（返回本地解密代理链接，可直接播放）
+// quality: 清晰度过滤，支持 max（最高档，默认）、definition（360p/480p/...）或档位 key（video_1..N），空为全部；
+// 未传时回退 config fanqie.video.quality，output 为空时回退 fanqie.video.output_mode
+func HandleVideo(itemIDs, output, quality interface{}) (string, error) {
 	if itemIDs == nil || itemIDs == "" {
 		return BuildSuccessResponse([]interface{}{}), nil
 	}
@@ -44,6 +54,26 @@ func HandleVideo(itemIDs interface{}) (string, error) {
 	requestBody := fmt.Sprintf(`{"biz_param":{"device_level":3,"need_all_video_definition":true,"need_mp4_align":false,"use_os_player":false,"video_platform":1024},"video_id":"%s"}`,
 		itemIDStr)
 
+	outputMode := ParseStringParam(output, "")
+	qualityFilter := ParseStringParam(quality, "")
+	if cfg := config.GetAppConfig(); cfg != nil {
+		if outputMode == "" {
+			outputMode = cfg.Fanqie.Video.OutputMode
+		}
+		if qualityFilter == "" {
+			qualityFilter = cfg.Fanqie.Video.Quality
+		}
+	}
+	if outputMode == "" {
+		outputMode = "url"
+	}
+	deviceID := ""
+	if outputMode == "proxy" {
+		if dev := GetCurrentDevice(); dev != nil {
+			deviceID = dev.DeviceHeader
+		}
+	}
+
 	// 使用 GorgonRequest 添加签名和设备信息
 	resp, err := GorgonRequest(url, map[string]interface{}{
 		"method": "POST",
@@ -86,7 +116,14 @@ func HandleVideo(itemIDs interface{}) (string, error) {
 
 		if data != nil {
 			if videoModelStr, ok := data["video_model"].(string); ok && isSingle {
-				decodedModel := decodeVideoModelAsJSON(videoModelStr)
+				decodedModel := decodeVideoModelAsJSON(videoModelStr, outputMode, deviceID, qualityFilter)
+
+				// 清晰度过滤无匹配时报错（调用方能立即发现参数写错）
+				if qualityFilter != "" {
+					if vl, ok := decodedModel.(map[string]interface{})["video_list"].(map[string]interface{}); ok && len(vl) == 0 {
+						return BuildErrorResponse(fmt.Sprintf("无匹配清晰度: %s（可用档位见 video_list）", qualityFilter)), nil
+					}
+				}
 
 				// 单个接口直接返回 video_model
 				response := map[string]interface{}{
@@ -103,7 +140,7 @@ func HandleVideo(itemIDs interface{}) (string, error) {
 				for itemID, itemData := range data {
 					if itemMap, ok := itemData.(map[string]interface{}); ok {
 						if videoModelStr, ok := itemMap["video_model"].(string); ok {
-							decodedModel := decodeVideoModelAsJSON(videoModelStr)
+							decodedModel := decodeVideoModelAsJSON(videoModelStr, outputMode, deviceID, qualityFilter)
 							result[itemID] = map[string]interface{}{
 								"video_model": decodedModel,
 							}
@@ -134,8 +171,10 @@ func HandleVideo(itemIDs interface{}) (string, error) {
 	return BuildErrorResponse(errMsg), nil
 }
 
-// decodeVideoModelAsJSON 解析并解码 video_model，返回关键字段的 JSON 对象
+// decodeVideoModelAsJSON 解析并解码 video_model，返回关键字段的 JSON 对象。
-func decodeVideoModelAsJSON(videoModelStr string) interface{} {
+// outputMode=proxy 时把 CDN 链接替换为本地解密代理链接（/video/proxy/{key}）
+// qualityFilter 非空时只保留匹配的清晰度（definition 或档位 key，大小写不敏感）
+func decodeVideoModelAsJSON(videoModelStr, outputMode, deviceID, qualityFilter string) interface{} {
 	// 解析 video_model JSON 字符串
 	var videoModel map[string]interface{}
 	if err := json.Unmarshal([]byte(videoModelStr), &videoModel); err != nil {
@@ -151,8 +190,10 @@ func decodeVideoModelAsJSON(videoModelStr string) interface{} {
 	result := make(map[string]interface{})
 
 	// 提取关键字段
-	if videoID, ok := videoModel["video_id"].(string); ok {
+	videoID := ""
-		result["video_id"] = videoID
+	if v, ok := videoModel["video_id"].(string); ok {
+		result["video_id"] = v
+		videoID = v
 	}
 	if duration, ok := videoModel["video_duration"].(float64); ok {
 		result["video_duration"] = formatDuration(duration)
@@ -167,10 +208,37 @@ func decodeVideoModelAsJSON(videoModelStr string) interface{} {
 
 	// 处理 video_list
 	if videoList, ok := videoModel["video_list"].(map[string]interface{}); ok {
+		// max/best：解析为实际最高档位 key（不同视频可用档位不同，按 vheight/definition 取最大）
+		if strings.EqualFold(qualityFilter, "max") || strings.EqualFold(qualityFilter, "best") {
+			bestKey, bestH := "", 0
+			for q, qd := range videoList {
+				qm, ok := qd.(map[string]interface{})
+				if !ok {
+					continue
+				}
+				if h := qualityHeight(qm); h > bestH {
+					bestH, bestKey = h, q
+				}
+			}
+			qualityFilter = bestKey
+		}
+
 		processedVideoList := make(map[string]interface{})
 
 		for quality, qualityData := range videoList {
 			if qualityMap, ok := qualityData.(map[string]interface{}); ok {
+				// 清晰度过滤：匹配档位 key（video_1）或 definition（720p）
+				if qualityFilter != "" {
+					def, _ := qualityMap["definition"].(string)
+					if !strings.EqualFold(quality, qualityFilter) && !strings.EqualFold(def, qualityFilter) {
+						continue
+					}
+				}
+				// spade_a（PlayAuth）：解出 CENC 内容密钥的种子，proxy 模式随代理下发
+				spadeA := ""
+				if v, ok := qualityMap["spade_a"].(string); ok {
+					spadeA = v
+				}
 				// 只保留关键字段
 				qualityInfo := make(map[string]interface{})
 
@@ -205,18 +273,23 @@ func decodeVideoModelAsJSON(videoModelStr string) interface{} {
 					}
 				}
 
-				// 解码 main_url
+				// 解码 main_url / backup_url_1（base64 的CDN链接），proxy 模式替换为解密代理。
+				// 代理 key 用 videoID+档位（稳定），同一视频重复调用复用磁盘缓存
+				processURL := func(b64 string) interface{} {
+					decoded, err := base64.StdEncoding.DecodeString(b64)
+					if err != nil {
+						return b64
+					}
+					if outputMode == "proxy" && spadeA != "" && videoID != "" {
+						return GenerateVideoProxyURL(videoID+"_"+quality, string(decoded), deviceID, spadeA)
+					}
+					return string(decoded)
+				}
 				if mainURL, ok := qualityMap["main_url"].(string); ok {
-					if decoded, err := base64.StdEncoding.DecodeString(mainURL); err == nil {
+					qualityInfo["main_url"] = processURL(mainURL)
-						qualityInfo["main_url"] = string(decoded)
 				}
-				}
-
-				// 解码 backup_url_1
 				if backupURL, ok := qualityMap["backup_url_1"].(string); ok {
-					if decoded, err := base64.StdEncoding.DecodeString(backupURL); err == nil {
+					qualityInfo["backup_url_1"] = processURL(backupURL)
-						qualityInfo["backup_url_1"] = string(decoded)
-					}
 				}
 
 				processedVideoList[quality] = qualityInfo
@@ -229,6 +302,22 @@ func decodeVideoModelAsJSON(videoModelStr string) interface{} {
 	return result
 }
 
+// qualityHeight 取清晰度的比较高度：优先 vheight，缺失时从 definition（如 "720p"）解析
+func qualityHeight(qm map[string]interface{}) int {
+	if h, ok := qm["vheight"].(float64); ok && h > 0 {
+		return int(h)
+	}
+	def, _ := qm["definition"].(string)
+	n := 0
+	for _, c := range def {
+		if c < '0' || c > '9' {
+			break
+		}
+		n = n*10 + int(c-'0')
+	}
+	return n
+}
+
 // formatDuration 将秒数转换为可读的时间格式
 func formatDuration(seconds float64) string {
 	totalSeconds := int(math.Round(seconds))
@@ -278,3 +367,123 @@ func formatBitrate(bitrate float64) string {
 	mbps := kbps / unit
 	return fmt.Sprintf("%.2f Mbps", mbps)
 }
+
+// GenerateVideoProxyURL 生成视频解密代理URL。
+// cacheKey 需稳定（videoID+档位）：映射表覆盖式更新，磁盘缓存按 key 复用
+func GenerateVideoProxyURL(cacheKey, originalURL, deviceID, spadeA string) string {
+	headers := map[string]string{"x-spade-a": spadeA}
+	if redisCache != nil {
+		saveAudioProxyEntry(cacheKey, &audioProxyEntry{
+			OriginalURL: originalURL,
+			DeviceID:    deviceID,
+			Headers:     headers,
+		})
+		return "/video/proxy/" + cacheKey
+	}
+	headersJSON, _ := json.Marshal(headers)
+	if cacheDB != nil {
+		cacheDB.Exec(q(`
+			INSERT INTO audio_cache (key, original_url, device_id, headers, created_at, updated_at)
+			VALUES (?, ?, ?, ?, ?, ?)
+			ON CONFLICT(key) DO UPDATE SET original_url = excluded.original_url,
+				device_id = excluded.device_id, headers = excluded.headers, updated_at = excluded.updated_at
+		`), cacheKey, originalURL, deviceID, string(headersJSON), time.Now().Unix(), time.Now().Unix())
+	}
+	return "/video/proxy/" + cacheKey
+}
+
+// videoCachePath 解密后视频的磁盘缓存路径；缓存未启用返回空串
+func videoCachePath(key string) string {
+	cfg := config.GetAppConfig()
+	if cfg == nil || !cfg.Fanqie.Video.CacheEnabled || cfg.Fanqie.Video.CachePath == "" {
+		return ""
+	}
+	return filepath.Join(cfg.Fanqie.Video.CachePath, key+".mp4")
+}
+
+// HandleVideoProxy 处理视频代理请求：磁盘缓存命中直接返回；否则下载 CENC 加密 MP4 →
+// SpadeA 解 key → 解密 → 写入缓存。返回 ReadSeeker 供 http.ServeContent（支持 Range/seek）。
+func HandleVideoProxy(key string) (io.ReadSeeker, string, error) {
+	// 磁盘缓存命中：直接返回文件（映射记录即使过期也不影响已缓存的视频）
+	if p := videoCachePath(key); p != "" {
+		if f, err := os.Open(p); err == nil {
+			return f, "video/mp4", nil
+		}
+	}
+
+	entry, err := loadMediaProxyEntry(key)
+	if err != nil {
+		return nil, "", err
+	}
+	spadeA := entry.Headers["x-spade-a"]
+	if spadeA == "" {
+		return nil, "", fmt.Errorf("视频信息缺少 spade_a，请重新调用 /video 接口")
+	}
+
+	body, _, err := downloadMediaWithRetry(entry.OriginalURL, entry.DeviceID, entry.Headers, 3)
+	if err != nil {
+		return nil, "", fmt.Errorf("下载视频失败: %w", err)
+	}
+	defer body.Close()
+	data, err := io.ReadAll(body)
+	if err != nil {
+		return nil, "", fmt.Errorf("读取视频失败: %w", err)
+	}
+
+	contentKey, err := DecodeSpadeKey(spadeA)
+	if err != nil {
+		return nil, "", fmt.Errorf("解密视频失败: %w", err)
+	}
+	if err := DecryptCENCMP4(data, contentKey); err != nil {
+		return nil, "", fmt.Errorf("解密视频失败: %w", err)
+	}
+
+	// 写入磁盘缓存（临时文件 + rename 原子替换；失败不影响本次返回）
+	if p := videoCachePath(key); p != "" {
+		if err := os.MkdirAll(filepath.Dir(p), 0755); err == nil {
+			if tmp, err := os.CreateTemp(filepath.Dir(p), ".tmp-*"); err == nil {
+				if _, werr := tmp.Write(data); werr == nil {
+					tmp.Close()
+					if err := os.Rename(tmp.Name(), p); err != nil {
+						os.Remove(tmp.Name())
+					}
+				} else {
+					tmp.Close()
+					os.Remove(tmp.Name())
+				}
+			}
+		}
+	}
+	return bytes.NewReader(data), "video/mp4", nil
+}
+
+// CleanupVideoCache 清理磁盘视频缓存中 mtime 过早的文件，挂接在缓存定期清理任务中
+func CleanupVideoCache() {
+	cfg := config.GetAppConfig()
+	if cfg == nil || !cfg.Fanqie.Video.CacheEnabled {
+		return
+	}
+	dir := cfg.Fanqie.Video.CachePath
+	entries, err := os.ReadDir(dir)
+	if err != nil {
+		return // 目录不存在等：无缓存可清
+	}
+	const maxAge = 7 * 24 * time.Hour // ponytail: 固定 7 天，需要更长保留时改配置语义
+	cutoff := time.Now().Add(-maxAge)
+	removed := 0
+	for _, e := range entries {
+		info, err := e.Info()
+		if err != nil || info.IsDir() {
+			continue
+		}
+		if info.ModTime().Before(cutoff) {
+			if os.Remove(filepath.Join(dir, e.Name())) == nil {
+				removed++
+			}
+		}
+	}
+	if removed > 0 {
+		videoLogger.Info(fmt.Sprintf("已清理 %d 个过期视频缓存文件", removed))
+	}
+}
+

internal/fqapi/video_decrypt.go

@@ -0,0 +1,360 @@
+package fqapi
+
+import (
+	"bytes"
+	"crypto/aes"
+	"crypto/cipher"
+	"encoding/base64"
+	"encoding/binary"
+	"fmt"
+)
+
+// ============ SpadeA（黑桃A）PlayAuth 解码 ============
+//
+// 番茄短剧/汽水音乐同源的本地 DRM：video_model 每个清晰度的 spade_a
+// （PlayAuth）经混淆变换直接还原 16 字节 AES-128 内容密钥（32 位 hex 字符串）。
+// 算法逆向自 SodaMusic v3.5.1（qishui-decrypt-tool），与番茄短剧样本实测一致。
+
+func bitCount32(v uint32) int {
+	c := v
+	c -= (c >> 1) & 0x55555555
+	c = (c & 0x33333333) + ((c >> 2) & 0x33333333)
+	return int(((c + (c>>4)) & 0x0f0f0f0f) * 0x01010101 >> 24)
+}
+
+func decodeBase36Byte(v byte) int {
+	switch {
+	case v >= '0' && v <= '9':
+		return int(v - '0')
+	case v >= 'a' && v <= 'z':
+		return int(v-'a') + 10
+	}
+	return 0xff
+}
+
+// decodeSpadeInner 逐字节去混淆：与前一字节异或后减去索引 popcount 与常数
+func decodeSpadeInner(data []byte) []byte {
+	result := make([]byte, len(data))
+	buff := append([]byte{0xfa, 0x55}, data...)
+	for i := 0; i < len(data); i++ {
+		raw := int(data[i]^buff[i]) - bitCount32(uint32(i)) - 21
+		if raw >= 0 {
+			result[i] = byte(raw)
+		} else {
+			result[i] = byte(((raw % 255) + 255) % 255)
+		}
+	}
+	return result
+}
+
+// DecodeSpadeKey 从 spade_a（PlayAuth base64）解出 16 字节 AES 内容密钥
+func DecodeSpadeKey(playAuthB64 string) ([]byte, error) {
+	raw, err := base64.StdEncoding.DecodeString(playAuthB64)
+	if err != nil {
+		return nil, fmt.Errorf("spade_a base64 解码失败: %w", err)
+	}
+	if len(raw) < 4 {
+		return nil, fmt.Errorf("spade_a 长度不足: %d", len(raw))
+	}
+	padding := int(raw[0]^raw[1]^raw[2]) - 48
+	if padding < 0 || padding >= len(raw)-3 {
+		return nil, fmt.Errorf("spade_a padding 非法: %d", padding)
+	}
+	body := raw[1 : len(raw)-padding]
+	tmp := decodeSpadeInner(body)
+	keyLen := decodeBase36Byte(tmp[0])
+	if keyLen == 0xff {
+		return nil, fmt.Errorf("spade_a key 长度字符非法: %q", tmp[0])
+	}
+	end := len(body) - keyLen
+	if end < 1 || end > len(tmp) {
+		return nil, fmt.Errorf("spade_a key 范围非法: end=%d len=%d", end, len(tmp))
+	}
+	keyHex := string(tmp[1:end])
+	if len(keyHex) != 32 {
+		return nil, fmt.Errorf("spade_a key 长度异常: %d", len(keyHex))
+	}
+	key := make([]byte, 16)
+	for i := 0; i < 16; i++ {
+		if _, err := fmt.Sscanf(keyHex[i*2:i*2+2], "%02x", &key[i]); err != nil {
+			return nil, fmt.Errorf("spade_a key hex 非法: %s", keyHex)
+		}
+	}
+	return key, nil
+}
+
+// ============ CENC (cenc-aes-ctr) MP4 解密 ============
+//
+// 容器为标准 CENC MP4：moov 明文；加密 sample entry（encv/enca）+ senc box
+// （version 0，每个 sample 8 字节 IV，整样本 AES-128-CTR，无 subsample）。
+// 解密后把 entry 类型改回原始 codec（sinf/frma 指示），得到可播放文件。
+
+type mp4Box struct {
+	typ         string
+	contentStar int
+	end         int
+}
+
+// walkBoxes 迭代 [start,end) 内的顶层 box，fn 返回 false 时停止迭代
+func walkBoxes(data []byte, start, end int, fn func(mp4Box) bool) error {
+	p := start
+	for p+8 <= end {
+		size := int(binary.BigEndian.Uint32(data[p : p+4]))
+		typ := string(data[p+4 : p+8])
+		if size == 1 { // largesize
+			if p+16 > end {
+				return fmt.Errorf("box %s largesize 越界", typ)
+			}
+			size = int(binary.BigEndian.Uint64(data[p+8 : p+16]))
+			// ponytail: >2GB 文件不支持，截断风险可接受
+			if size > len(data) {
+				return fmt.Errorf("box %s 过大", typ)
+			}
+		}
+		if size < 8 || p+size > end {
+			return fmt.Errorf("box %s 尺寸非法 size=%d at %d", typ, size, p)
+		}
+		if !fn(mp4Box{typ: typ, contentStar: p + 8, end: p + size}) {
+			return nil
+		}
+		p += size
+	}
+	return nil
+}
+
+// DecryptCENCMP4 原地解密 CENC 加密的 MP4 字节并修复 stsd entry 类型。
+// 仅支持 senc version 0 + 无 subsample 标志（番茄实测形态），其他形态返回错误。
+func DecryptCENCMP4(data []byte, key []byte) error {
+	block, err := aes.NewCipher(key)
+	if err != nil {
+		return fmt.Errorf("内容密钥非法: %w", err)
+	}
+
+	decryptStream := func(ct []byte, iv8 []byte) error {
+		if len(iv8) != 8 {
+			return fmt.Errorf("senc IV 长度异常: %d", len(iv8))
+		}
+		iv := make([]byte, 16)
+		copy(iv, iv8) // 8 字节 IV 置于高位，低 8 字节为块计数器（CENC 标准）
+		cipher.NewCTR(block, iv).XORKeyStream(ct, ct)
+		return nil
+	}
+
+	// 找 moov 并遍历其下所有 trak，逐 trak 解密
+	var trakErr error
+	foundMoov := false
+	if err := walkBoxes(data, 0, len(data), func(b mp4Box) bool {
+		if b.typ != "moov" {
+			return true
+		}
+		foundMoov = true
+		_ = walkBoxes(data, b.contentStar, b.end, func(trak mp4Box) bool {
+			if trak.typ != "trak" {
+				return true
+			}
+			if err := decryptTrak(data, trak, decryptStream); err != nil {
+				trakErr = err
+				return false
+			}
+			return true
+		})
+		return false
+	}); err != nil {
+		return err
+	}
+	if !foundMoov {
+		return fmt.Errorf("moov box 未找到")
+	}
+	return trakErr
+}
+
+// decryptTrak 处理单个 trak：解析 sample 表 + senc，逐样本解密，修补 stsd
+func decryptTrak(data []byte, trak mp4Box, decryptStream func([]byte, []byte) error) error {
+	// 定位 mdia→minf→stbl
+	stbl, err := findBox(data, trak, "mdia", "minf", "stbl")
+	if err != nil || stbl == nil {
+		return err // 无 stbl 的 trak 跳过
+	}
+
+	var (
+		sizes         []int
+		chunkOffsets  []int
+		stscEntries   [][2]int // {first_chunk, samples_per_chunk}
+		ivs           [][]byte
+		stsd          *mp4Box
+		haveSizes     bool
+		haveOffsets   bool
+		haveStsc      bool
+		parseErr      error
+	)
+
+	if err := walkBoxes(data, stbl.contentStar, stbl.end, func(b mp4Box) bool {
+		switch b.typ {
+		case "stsd":
+			stsd = &b
+		case "stsz":
+			constSize := int(binary.BigEndian.Uint32(data[b.contentStar+4 : b.contentStar+8]))
+			count := int(binary.BigEndian.Uint32(data[b.contentStar+8 : b.contentStar+12]))
+			if constSize != 0 {
+				for i := 0; i < count; i++ {
+					sizes = append(sizes, constSize)
+				}
+			} else {
+				sizes = make([]int, count)
+				for i := 0; i < count; i++ {
+					sizes[i] = int(binary.BigEndian.Uint32(data[b.contentStar+12+i*4 : b.contentStar+16+i*4]))
+				}
+			}
+			haveSizes = true
+		case "stco":
+			count := int(binary.BigEndian.Uint32(data[b.contentStar+4 : b.contentStar+8]))
+			for i := 0; i < count; i++ {
+				chunkOffsets = append(chunkOffsets, int(binary.BigEndian.Uint32(data[b.contentStar+8+i*4:b.contentStar+12+i*4])))
+			}
+			haveOffsets = true
+		case "co64":
+			count := int(binary.BigEndian.Uint32(data[b.contentStar+4 : b.contentStar+8]))
+			for i := 0; i < count; i++ {
+				v := binary.BigEndian.Uint64(data[b.contentStar+8+i*8 : b.contentStar+16+i*8])
+				if v > uint64(len(data)) {
+					parseErr = fmt.Errorf("co64 偏移越界")
+					return false
+				}
+				chunkOffsets = append(chunkOffsets, int(v))
+			}
+			haveOffsets = true
+		case "stsc":
+			count := int(binary.BigEndian.Uint32(data[b.contentStar+4 : b.contentStar+8]))
+			for i := 0; i < count; i++ {
+				first := int(binary.BigEndian.Uint32(data[b.contentStar+8+i*12 : b.contentStar+12+i*12]))
+				spc := int(binary.BigEndian.Uint32(data[b.contentStar+12+i*12 : b.contentStar+16+i*12]))
+				stscEntries = append(stscEntries, [2]int{first, spc})
+			}
+			haveStsc = true
+		case "senc":
+			verFlags := binary.BigEndian.Uint32(data[b.contentStar : b.contentStar+4])
+			if verFlags>>24 != 0 {
+				parseErr = fmt.Errorf("senc version %d 不支持", verFlags>>24)
+				return false
+			}
+			if verFlags&0b10 != 0 {
+				parseErr = fmt.Errorf("senc subsample 加密模式不支持")
+				return false
+			}
+			count := int(binary.BigEndian.Uint32(data[b.contentStar+4 : b.contentStar+8]))
+			p := b.contentStar + 8
+			if p+8*count > b.end {
+				parseErr = fmt.Errorf("senc IV 表越界")
+				return false
+			}
+			for i := 0; i < count; i++ {
+				ivs = append(ivs, data[p+8*i:p+8*i+8])
+			}
+		}
+		return true
+	}); err != nil {
+		return fmt.Errorf("stbl 解析失败: %w", err)
+	}
+	if parseErr != nil {
+		return parseErr
+	}
+
+	if len(ivs) == 0 {
+		return nil // 本 trak 未加密
+	}
+	if !haveSizes || !haveOffsets || !haveStsc {
+		return fmt.Errorf("sample 表不完整（stsz=%v stco=%v stsc=%v）", haveSizes, haveOffsets, haveStsc)
+	}
+
+	// stsc+stco+stsz 重建每样本绝对偏移（标准 sample table 遍历）
+	sampleIdx := 0
+	for ci, off := range chunkOffsets {
+		spc := stscEntries[len(stscEntries)-1][1]
+		for _, e := range stscEntries {
+			if e[0] <= ci+1 {
+				spc = e[1]
+			} else {
+				break
+			}
+		}
+		pos := off
+		for s := 0; s < spc && sampleIdx < len(sizes); s++ {
+			size := sizes[sampleIdx]
+			if sampleIdx >= len(ivs) {
+				break
+			}
+			if pos+size > len(data) {
+				return fmt.Errorf("sample %d 越界 pos=%d size=%d", sampleIdx, pos, size)
+			}
+			if err := decryptStream(data[pos:pos+size], ivs[sampleIdx]); err != nil {
+				return err
+			}
+			pos += size
+			sampleIdx++
+		}
+	}
+
+	if stsd != nil {
+		patchStsdEntry(data, *stsd)
+	}
+	return nil
+}
+
+// findBox 沿 path 逐层查找唯一子 box；任意一层缺失返回 (nil, nil)
+func findBox(data []byte, parent mp4Box, path ...string) (*mp4Box, error) {
+	cur := parent
+	for _, name := range path {
+		var next *mp4Box
+		if err := walkBoxes(data, cur.contentStar, cur.end, func(b mp4Box) bool {
+			if b.typ == name {
+				next = &b
+				return false
+			}
+			return true
+		}); err != nil {
+			return nil, err
+		}
+		if next == nil {
+			return nil, nil
+		}
+		cur = *next
+	}
+	return &cur, nil
+}
+
+// patchStsdEntry 把加密 sample entry（encv/enca）的类型改回 sinf/frma 指示的原始 codec。
+// 番茄实测单 entry；entry 头部长度因音/视频而异，直接在 entry 字节里定位 "sinf"。
+func patchStsdEntry(data []byte, stsd mp4Box) {
+	entryCount := int(binary.BigEndian.Uint32(data[stsd.contentStar+4 : stsd.contentStar+8]))
+	if entryCount != 1 {
+		return // ponytail: 多 entry 形态按需扩展
+	}
+	entryStart := stsd.contentStar + 8
+	entryEnd := stsd.end
+
+	// 在 entry 内定位 "sinf"（box 类型魔数），再验证其 box 头合法性
+	sinfOff := bytes.Index(data[entryStart:entryEnd], []byte("sinf"))
+	for sinfOff >= 0 {
+		boxStart := entryStart + sinfOff - 4 // size 字段起点
+		if boxStart >= entryStart+8 {
+			size := int(binary.BigEndian.Uint32(data[boxStart : boxStart+4]))
+			if size >= 12 && boxStart+size <= entryEnd {
+				sinfContent, sinfEnd := boxStart+8, boxStart+size
+				frmaOff := bytes.Index(data[sinfContent:sinfEnd], []byte("frma"))
+				if frmaOff >= 0 {
+					frmaContent := sinfContent + frmaOff + 4
+					if frmaContent+4 <= sinfEnd {
+						// entry 类型字段在 box 头的 type 位置（entryStart+4）
+						copy(data[entryStart+4:entryStart+8], data[frmaContent:frmaContent+4])
+						return
+					}
+				}
+			}
+		}
+		next := bytes.Index(data[entryStart+sinfOff+1:entryEnd], []byte("sinf"))
+		if next < 0 {
+			return
+		}
+		sinfOff = sinfOff + 1 + next
+	}
+}

internal/fqapi/videodecrypt_test.go

@@ -0,0 +1,178 @@
+package fqapi
+
+import (
+	"crypto/aes"
+	"crypto/cipher"
+	"encoding/binary"
+	"bytes"
+	"encoding/base64"
+	"encoding/hex"
+	"io"
+	"os"
+	"strings"
+	"testing"
+)
+
+// 番茄短剧真实样本（video_model video_1..4 共用同一 spade_a）
+const testSpadeA = "kbwfwFiKI8RuvCnHV4ss9lK6HMFmvS/2f7wv7H+mAfRRvxmXlw=="
+
+func TestDecodeSpadeKey(t *testing.T) {
+	key, err := DecodeSpadeKey(testSpadeA)
+	if err != nil {
+		t.Fatal(err)
+	}
+	want := "4f04d75b0df5cee67dbe13738872e965"
+	if got := hex.EncodeToString(key); got != want {
+		t.Fatalf("key mismatch: got %s want %s", got, want)
+	}
+}
+
+// 端到端：下载真实 360p 视频 → DecryptCENCMP4 → 输出文件（ffprobe 验证）
+func TestDecryptRealVideo(t *testing.T) {
+	mainURLB64 := os.Getenv("FQ_VIDEO_URL")
+	spadeA := strings.TrimSpace(os.Getenv("FQ_VIDEO_SPADE"))
+	if mainURLB64 == "" || spadeA == "" {
+		t.Skip("need FQ_VIDEO_URL (main_url base64) and FQ_VIDEO_SPADE")
+	}
+	url, err := base64.StdEncoding.DecodeString(mainURLB64)
+	if err != nil {
+		t.Fatal(err)
+	}
+	body, _, err := downloadMedia(string(bytes.TrimSpace(url)), "", map[string]string{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer body.Close()
+	data, err := io.ReadAll(body)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Logf("downloaded %d bytes", len(data))
+
+	key, err := DecodeSpadeKey(spadeA)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Logf("key=%x", key)
+	if err := DecryptCENCMP4(data, key); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile("/tmp/video_decrypted.mp4", data, 0644); err != nil {
+		t.Fatal(err)
+	}
+	t.Log("written /tmp/video_decrypted.mp4")
+}
+
+// ---- 合成 CENC MP4 单元测试：加密 → 解密 → 比对明文 ----
+
+func box(typ string, payload ...[]byte) []byte {
+	var body []byte
+	for _, p := range payload {
+		body = append(body, p...)
+	}
+	b := make([]byte, 8+len(body))
+	binary.BigEndian.PutUint32(b[:4], uint32(len(b)))
+	copy(b[4:8], typ)
+	copy(b[8:], body)
+	return b
+}
+
+func u32(v uint32) []byte { b := make([]byte, 4); binary.BigEndian.PutUint32(b, v); return b }
+
+func TestDecryptCENCMP4Synthetic(t *testing.T) {
+	key := []byte("0123456789abcdef")
+	plain1 := []byte("HELLO_CENC_SAMPLE_1_PADPADP")
+	plain2 := []byte("SECOND_SAMPLE")
+	plain3 := []byte("THIRD")
+
+	enc := func(pt []byte, iv8 []byte) []byte {
+		iv := make([]byte, 16)
+		copy(iv, iv8)
+		block, _ := aes.NewCipher(key)
+		ct := make([]byte, len(pt))
+		cipher.NewCTR(block, iv).XORKeyStream(ct, pt)
+		return ct
+	}
+	iv1 := []byte{1, 2, 3, 4, 5, 6, 7, 8}
+	iv2 := []byte{8, 7, 6, 5, 4, 3, 2, 1}
+	iv3 := []byte{0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF, 0x11, 0x22}
+	ct1, ct2, ct3 := enc(plain1, iv1), enc(plain2, iv2), enc(plain3, iv3)
+
+	// buildFile(off1, off2)：chunk 绝对偏移写入 stco；偏移依赖 moov 长度，先占位测长再重建
+	buildFile := func(off1, off2 uint32) []byte {
+		entry := box("enca", make([]byte, 8), box("sinf", box("frma", []byte("mp4a"))))
+		stsd := box("stsd", u32(0), u32(1), entry)
+		stsz := box("stsz", u32(0), u32(0), u32(3), u32(uint32(len(plain1))), u32(uint32(len(plain2))), u32(uint32(len(plain3))))
+		stsc := box("stsc", u32(0), u32(2),
+			u32(1), u32(2), u32(1), // entry1: chunk1 起，每 chunk 2 样本
+			u32(2), u32(1), u32(1)) // entry2: chunk2 起，每 chunk 1 样本
+		stco := box("stco", u32(0), u32(2), u32(off1), u32(off2))
+		sencBody := append(append(append(append(u32(0), u32(3)...), iv1...), iv2...), iv3...)
+		senc := box("senc", sencBody)
+		moov := box("moov", box("trak", box("mdia", box("minf", box("stbl", stsd, stsz, stsc, stco, senc)))))
+		ftyp := box("ftyp", []byte("isom"))
+		return append(append(ftyp, moov...), box("mdat", ct1, ct2, ct3)...)
+	}
+
+	// 占位构造测 moov 总长，得到真实 chunk 偏移后重建
+	probe := buildFile(0, 0)
+	chunk1Off := uint32(len(probe) - len(ct1) - len(ct2) - len(ct3))
+	chunk2Off := chunk1Off + uint32(len(ct1)+len(ct2))
+	data := buildFile(chunk1Off, chunk2Off)
+
+	if err := DecryptCENCMP4(data, key); err != nil {
+		t.Fatal(err)
+	}
+	if got := data[chunk1Off : chunk1Off+uint32(len(plain1))]; string(got) != string(plain1) {
+		t.Errorf("sample1 解密不符: %q", got)
+	}
+	s2 := chunk1Off + uint32(len(plain1))
+	if got := data[s2 : s2+uint32(len(plain2))]; string(got) != string(plain2) {
+		t.Errorf("sample2 解密不符: %q", got)
+	}
+	if got := data[chunk2Off : chunk2Off+uint32(len(plain3))]; string(got) != string(plain3) {
+		t.Errorf("sample3 解密不符: %q", got)
+	}
+	// stsd entry 类型应被 patch 为 frma 指示的 mp4a（原 enca 四字已不存在）
+	if bytes.Index(data, []byte("enca")) >= 0 || bytes.Index(data, []byte("mp4a")) < 0 {
+		t.Error("stsd entry 类型未修复为 mp4a")
+	}
+}
+
+// 清晰度过滤：按 definition 与档位 key 均可命中；无匹配返回空列表由上层报错
+func TestDecodeVideoModelQualityFilter(t *testing.T) {
+	vm := `{"video_id":"v123","video_duration":1.5,"video_list":{
+		"video_1":{"definition":"360p","vtype":"mp4","main_url":"` + base64.StdEncoding.EncodeToString([]byte("https://a/360")) + `"},
+		"video_4":{"definition":"720p","vtype":"mp4","main_url":"` + base64.StdEncoding.EncodeToString([]byte("https://a/720")) + `"}}}`
+	got := decodeVideoModelAsJSON(vm, "url", "", "720p").(map[string]interface{})
+	vl := got["video_list"].(map[string]interface{})
+	if len(vl) != 1 || vl["video_4"] == nil {
+		t.Fatalf("definition 过滤失败: %v", vl)
+	}
+	got = decodeVideoModelAsJSON(vm, "url", "", "VIDEO_1").(map[string]interface{})
+	vl = got["video_list"].(map[string]interface{})
+	if len(vl) != 1 || vl["video_1"] == nil {
+		t.Fatalf("档位key过滤失败: %v", vl)
+	}
+	if u := vl["video_1"].(map[string]interface{})["main_url"].(string); u != "https://a/360" {
+		t.Fatalf("main_url 未解码: %s", u)
+	}
+	got = decodeVideoModelAsJSON(vm, "url", "", "1080p").(map[string]interface{})
+	if len(got["video_list"].(map[string]interface{})) != 0 {
+		t.Fatal("无匹配应返回空列表")
+	}
+	// max 取最高档（vheight 缺失时按 definition 数字比较）
+	got = decodeVideoModelAsJSON(vm, "url", "", "max").(map[string]interface{})
+	vl = got["video_list"].(map[string]interface{})
+	if len(vl) != 1 || vl["video_4"] == nil {
+		t.Fatalf("max 应只保留最高档: %v", vl)
+	}
+	// vheight 存在时优先按 vheight
+	vm2 := `{"video_list":{
+		"video_1":{"definition":"360p","vwidth":360,"vheight":640},
+		"video_2":{"definition":"540p","vwidth":540,"vheight":960}}}`
+	got = decodeVideoModelAsJSON(vm2, "url", "", "max").(map[string]interface{})
+	if len(got["video_list"].(map[string]interface{})) != 1 || got["video_list"].(map[string]interface{})["video_2"] == nil {
+		t.Fatal("max 应按 vheight 取 video_2")
+	}
+}

internal/handlers/book.go

@@ -103,3 +103,74 @@ func HandleMultiDetail(w http.ResponseWriter, r *http.Request) {
 
 	fmt.Fprint(w, result)
 }
+
+// HandleRank 榜单处理（推荐/完结/热搜/黑马/爆更榜，免签名接口）
+func HandleRank(w http.ResponseWriter, r *http.Request) {
+	incrementStat("total", "category")
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+
+	sideType, err := parseIntParam(r.URL.Query().Get("side_type"), "side_type")
+	if err != nil {
+		respondError(w, err.Error(), true)
+		return
+	}
+	page, err := parseIntParam(r.URL.Query().Get("page"), "page")
+	if err != nil {
+		respondError(w, err.Error(), true)
+		return
+	}
+
+	result, err := fqapi.HandleGetRank(sideType, page)
+	if err != nil {
+		respondError(w, "获取榜单失败: "+err.Error(), false)
+		return
+	}
+
+	fmt.Fprint(w, result)
+}
+
+// HandleBookshelf 书架处理（需登录 sessionid）
+func HandleBookshelf(w http.ResponseWriter, r *http.Request) {
+	incrementStat("total", "category")
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+
+	params, err := validateParams(r, "sessionid")
+	if err != nil {
+		respondError(w, err.Error(), true)
+		return
+	}
+
+	result, err := fqapi.HandleBookshelf(params["sessionid"], r.URL.Query().Get("group"))
+	if err != nil {
+		respondError(w, "获取书架失败: "+err.Error(), false)
+		return
+	}
+
+	fmt.Fprint(w, result)
+}
+
+// HandleReadHistory 阅读历史处理（需登录 sessionid）
+func HandleReadHistory(w http.ResponseWriter, r *http.Request) {
+	incrementStat("total", "category")
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+
+	params, err := validateParams(r, "sessionid")
+	if err != nil {
+		respondError(w, err.Error(), true)
+		return
+	}
+
+	offset, err := parseIntParam(r.URL.Query().Get("offset"), "offset")
+	if err != nil {
+		respondError(w, err.Error(), true)
+		return
+	}
+
+	result, err := fqapi.HandleReadHistory(params["sessionid"], offset)
+	if err != nil {
+		respondError(w, "获取阅读历史失败: "+err.Error(), false)
+		return
+	}
+
+	fmt.Fprint(w, result)
+}

internal/handlers/category.go

@@ -32,8 +32,10 @@ func HandleCategoryLanding(w http.ResponseWriter, r *http.Request) {
 	wordNumber := r.URL.Query().Get("word_number")
 	bookStatus := r.URL.Query().Get("book_status")
 	sortBy := r.URL.Query().Get("sort_by")
+	// 新版分类标签自带的筛选项（见 /category-front 返回的 category_landpage_url 参数）
+	selectedItems := r.URL.Query().Get("selected_items")
 
-	result, err := fqapi.HandleCategoryLanding(categoryID, offset, wordNumber, bookStatus, sortBy)
+	result, err := fqapi.HandleCategoryLanding(categoryID, offset, wordNumber, bookStatus, sortBy, selectedItems)
 	if err != nil {
 		respondError(w, "获取分类详情失败: "+err.Error(), false)
 		return

internal/handlers/common.go

@@ -270,7 +270,8 @@ func LogRequestMiddleware(handler http.HandlerFunc) http.HandlerFunc {
 	}
 }
 
-// decodedQuery 重组解码后的查询串（keyword=%E6%B5%8B → keyword=测），日志可读
+// decodedQuery 重组解码后的查询串（keyword=%E6%B5%8B → keyword=测），日志可读；
+// key 参数值脱敏（访问密钥不落日志）
 // ponytail: map 遍历乱序、%26 解码后与分隔符同名 —— 展示用途可接受
 func decodedQuery(r *http.Request) string {
 	vals := r.URL.Query() // 已解码
@@ -280,6 +281,9 @@ func decodedQuery(r *http.Request) string {
 	parts := make([]string, 0, len(vals))
 	for k, vs := range vals {
 		for _, v := range vs {
+			if strings.EqualFold(k, "key") && v != "" {
+				v = "***"
+			}
 			parts = append(parts, k+"="+v)
 		}
 	}

internal/handlers/content.go

@@ -124,23 +124,17 @@ func addReviewToContent(jsonResult, itemID string, r *http.Request) string {
 		}
 	}
 
-	// 获取基础 URL
+	// 获取基础 URL（反代场景识别 X-Forwarded-Proto，避免生成 http:// 被 301）
 	cfg := config.GetConfig()
 	baseURL := ""
-	if cfg != nil {
+	if r.Host != "" {
+		baseURL = externalBaseURL(r)
+	} else if cfg != nil {
 		host := cfg.Server.Host
 		if host == "0.0.0.0" {
 			host = "localhost"
 		}
-		port := cfg.Server.Port
+		baseURL = "http://" + host + ":" + cfg.Server.Port
-		scheme := "http"
-
-		// 检查是否来自外部请求
-		if r.Host != "" {
-			baseURL = scheme + "://" + r.Host
-		} else {
-			baseURL = scheme + "://" + host + ":" + port
-		}
 	}
 
 	// 生成带段评标记的内容

internal/handlers/media.go

@@ -7,6 +7,7 @@ import (
 	"io"
 	"net/http"
 	"strings"
+	"time"
 )
 
 // HandleAudio 音频处理
@@ -75,7 +76,9 @@ func HandleVideo(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	result, err := fqapi.HandleVideo(params["item_ids"])
+	output := r.URL.Query().Get("output")
+	quality := r.URL.Query().Get("quality")
+	result, err := fqapi.HandleVideo(params["item_ids"], output, quality)
 	if err != nil {
 		respondError(w, "获取视频失败: "+err.Error(), false)
 		return
@@ -84,6 +87,30 @@ func HandleVideo(w http.ResponseWriter, r *http.Request) {
 	fmt.Fprint(w, result)
 }
 
+// HandleVideoProxy 视频解密代理处理（磁盘缓存优先；http.ServeContent 支持 Range/seek/HEAD，
+// 播放器拖动进度条时按需分片返回）
+func HandleVideoProxy(w http.ResponseWriter, r *http.Request) {
+	incrementStat("total", "video")
+
+	path := r.URL.Path
+	key := strings.TrimPrefix(path, "/video/proxy/")
+	if key == "" || key == path {
+		http.Error(w, "缺少视频key", http.StatusBadRequest)
+		return
+	}
+
+	content, contentType, err := fqapi.HandleVideoProxy(key)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+	if closer, ok := content.(io.Closer); ok {
+		defer closer.Close()
+	}
+	w.Header().Set("Content-Type", contentType)
+	http.ServeContent(w, r, key+".mp4", time.Time{}, content)
+}
+
 // HandleManga 漫画处理
 func HandleManga(w http.ResponseWriter, r *http.Request) {
 	incrementStat("total", "manga")

internal/handlers/review.go

@@ -12,6 +12,16 @@ import (
 	"time"
 )
 
+// externalBaseURL 取外部可访问的基础 URL（nginx 反代下识别 X-Forwarded-Proto，
+// 避免生成 http:// 链接被 301，弹窗 WebView 内 fetch 对 301 处理不稳）
+func externalBaseURL(r *http.Request) string {
+	scheme := "http"
+	if p := r.Header.Get("X-Forwarded-Proto"); p != "" {
+		scheme = p
+	}
+	return scheme + "://" + r.Host
+}
+
 // validateParams 验证必需参数
 func validateParams(r *http.Request, required ...string) (map[string]string, error) {
 	params := make(map[string]string)
@@ -207,7 +217,7 @@ func HandleReviewHTML(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "text/html; charset=utf-8")
 	w.WriteHeader(http.StatusOK)
 
-	html := generateReviewHTML(data, params["item_id"], bookID, para, page, pageSize, sort)
+	html := generateReviewHTML(r, data, params["item_id"], bookID, para, page, pageSize, sort)
 	fmt.Fprint(w, html)
 }
 
@@ -318,6 +328,7 @@ var reviewTmpl = template.Must(template.New("review").Parse(reviewHTML))
 // reviewPageData 评论页模板数据
 type reviewPageData struct {
 	ItemID, BookID         string
+	BaseURL                string
 	ParaPlus1, Para, Sort  int
 	Total, NextOffset      int
 	PageSize, CommentCount int
@@ -327,7 +338,7 @@ type reviewPageData struct {
 }
 
 // generateReviewHTML 生成评论 HTML 页面
-func generateReviewHTML(data map[string]interface{}, itemID, bookID string, para, page, pageSize, sort int) string {
+func generateReviewHTML(r *http.Request, data map[string]interface{}, itemID, bookID string, para, page, pageSize, sort int) string {
 	total := 0
 	hasMore := false
 	nextOffset := 0
@@ -383,6 +394,7 @@ func generateReviewHTML(data map[string]interface{}, itemID, bookID string, para
 	var b strings.Builder
 	if err := reviewTmpl.Execute(&b, reviewPageData{
 		ItemID: itemID, BookID: bookID,
+		BaseURL:   externalBaseURL(r),
 		ParaPlus1: para + 1, Para: para, Sort: sort,
 		Total: total, NextOffset: nextOffset,
 		PageSize: pageSize, CommentCount: len(pageComments),

internal/handlers/templates/review.html

@@ -49,25 +49,50 @@
             box-sizing: border-box;
             font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
         }
+        html, body { height: 100%; }
         body {
             background-color: var(--bg-primary);
             color: var(--text-primary);
-            padding: 15px;
             max-width: 600px;
             margin: 0 auto;
+            display: flex;
+            flex-direction: column;
+            overflow: hidden;
             transition: background-color 0.3s ease, color 0.3s ease;
         }
         .header {
+            flex-shrink: 0;
             display: flex;
             justify-content: space-between;
             align-items: center;
-            margin-bottom: 20px;
+            padding: 10px 15px 12px;
-            padding: 10px 15px;
             background: var(--bg-secondary);
-            border-radius: 12px;
+            border-radius: 20px 20px 0 0;
+            border-bottom: 1px solid var(--border-color);
             box-shadow: 0 2px 8px var(--shadow);
+            position: relative;
+            z-index: 10;
             transition: background-color 0.3s ease;
         }
+        /* BottomSheet 顶部拖拽把手 */
+        .header::before {
+            content: '';
+            position: absolute;
+            top: 6px;
+            left: 50%;
+            transform: translateX(-50%);
+            width: 36px;
+            height: 4px;
+            border-radius: 2px;
+            background: var(--border-color);
+        }
+        #comment-list {
+            flex: 1;
+            overflow-y: auto;
+            -webkit-overflow-scrolling: touch;
+            padding: 15px;
+            overscroll-behavior: contain;
+        }
         .header h1 {
             font-size: 18px;
             color: var(--text-primary);
@@ -333,8 +358,8 @@
             <i class="fas fa-book-open" style="color: var(--text-tertiary); font-size: 16px; margin: 0 10px;"></i>
         </span>
         <div class="sort-tabs">
-            <div class="sort-tab{{if eq .Sort 1}} active{{end}}" onclick="switchSort(1)">最热</div>
+            <div class="sort-tab{{if eq .Sort 1}} active{{end}}" onclick="switchSort(1, this)">最热</div>
-            <div class="sort-tab{{if eq .Sort 3}} active{{end}}" onclick="switchSort(3)">最新</div>
+            <div class="sort-tab{{if eq .Sort 3}} active{{end}}" onclick="switchSort(3, this)">最新</div>
         </div>
     </div>
     <div id="comment-list">
@@ -370,6 +395,8 @@
         const bookID = '{{.BookID}}';
         const para = {{.Para}};
         let currentSort = {{.Sort}};
+        // 服务端注入的绝对地址：弹窗 WebView(loadDataWithBaseURL) 中相对路径解析不可靠
+        const API_BASE = '{{.BaseURL}}';
     
         const commentList = document.getElementById('comment-list');
         const imageViewer = document.getElementById('imageViewer');
@@ -380,7 +407,7 @@
         // 已加载回复的评论
         const loadedReplies = new Set();
         
-        // URL 构建
+        // URL 构建（绝对地址，兼容弹窗 WebView）
         function buildReviewURL(params) {
             const baseParams = {
                 item_id: itemID,
@@ -388,7 +415,7 @@
                 para: para
             };
             const query = new URLSearchParams({...baseParams, ...params});
-            return '/review?' + query.toString();
+            return API_BASE + '/review?' + query.toString();
         }
         
         // 时间格式化
@@ -429,11 +456,11 @@
             };
         }
         
-        // 滚动信息获取
+        // 滚动信息获取（评论区为独立滚动容器）
         function getScrollInfo() {
-            const scrollTop = window.pageYOffset || document.documentElement.scrollTop;
+            const scrollTop = commentList.scrollTop;
-            const scrollHeight = document.documentElement.scrollHeight;
+            const scrollHeight = commentList.scrollHeight;
-            const clientHeight = document.documentElement.clientHeight;
+            const clientHeight = commentList.clientHeight;
             return {
                 scrollTop,
                 scrollHeight,
@@ -443,11 +470,11 @@
         }
         
         // 切换排序
-        async function switchSort(newSort) {
+        async function switchSort(newSort, tab) {
             if (currentSort === newSort) return;
 
-            document.querySelectorAll('.sort-tab').forEach(tab => tab.classList.remove('active'));
+            document.querySelectorAll('.sort-tab').forEach(t => t.classList.remove('active'));
-            event.target.closest('.sort-tab').classList.add('active');
+            if (tab) tab.classList.add('active');
             
             commentList.innerHTML = LOADING_HTML;
             
@@ -479,7 +506,7 @@
                     }
                     
                     loadedReplies.clear();
-                    window.scrollTo({ top: 0, behavior: 'smooth' });
+                    commentList.scrollTo({ top: 0, behavior: 'smooth' });
                 } else {
                     commentList.innerHTML = '<div class="empty">加载失败，请重试</div>';
                     commentIndex = 0;
@@ -751,13 +778,13 @@
         
         // 回到顶部
         function scrollToTop() {
-            window.scrollTo({
+            commentList.scrollTo({
                 top: 0,
                 behavior: 'smooth'
             });
         }
 
-        // 滚动监听
+        // 滚动监听（挂在评论容器上，顶栏固定不参与滚动）
         const handleScroll = debounce(() => {
             const scroll = getScrollInfo();
 
@@ -770,6 +797,6 @@
             }
         }, 100);
 
-        window.addEventListener('scroll', handleScroll, { passive: true });
+        commentList.addEventListener('scroll', handleScroll, { passive: true });
     </script>
 </body>

openapi.yaml

@@ -577,6 +577,7 @@ paths:
       summary: 获取漫画内容
       description: |
         返回漫画章节内容,图片经解密处理。
+        设备池签名路线全部失败时自动降级 wkbrowser 免签名兜底(直接返回原图直链,响应附 `source: wkbrowser`)。
         输出模式 `output` 优先于配置 `fanqie.manga.output_mode`:
         - `url`: 返回原始图片 URL 数组(不可用:链接 404 且内容加密,仅作上游原始信息展示)
         - `proxy`: 返回本地代理 URL(/manga/image/{item_id}/{index})——推荐,先调本接口再访问代理 URL(缓存 5 分钟)
@@ -710,6 +711,10 @@ paths:
           in: query
           description: 排序方式,透传上游(0=默认)
           schema: { type: integer, default: 0 }
+        - name: selected_items
+          in: query
+          description: 新版分类标签自带筛选项(从 /category-front 返回的 category_landpage_url 参数中获取),透传上游
+          schema: { type: string }
       responses:
         "200":
           description: 分类书籍列表(上游转发)
@@ -721,6 +726,85 @@ paths:
           $ref: "#/components/responses/BadRequest"
         "500":
           $ref: "#/components/responses/ServerError"
+  /rank:
+    get:
+      tags: [榜单与个人数据]
+      summary: 获取书籍榜单
+      description: 免签名接口,支持五种榜单,每页 20 本,短缓存 10 分钟。
+      operationId: getRank
+      parameters:
+        - name: side_type
+          in: query
+          description: 榜单类型
+          schema:
+            type: integer
+            default: 10
+            enum: [10, 11, 12, 13, 15]
+            x-enum-varnames: [推荐榜, 完结榜, 热搜榜, 黑马榜, 爆更榜]
+        - name: page
+          in: query
+          description: 页码,从 1 起
+          schema: { type: integer, default: 1, minimum: 1 }
+      responses:
+        "200":
+          description: 榜单书籍列表(上游转发,data.result 为书籍数组)
+          content:
+            application/json:
+              schema: { $ref: "#/components/schemas/UpstreamResponse" }
+        "500":
+          $ref: "#/components/responses/ServerError"
+  /bookshelf:
+    get:
+      tags: [榜单与个人数据]
+      summary: 获取我的书架
+      description: 需要番茄网页版登录态;每本书合并详情数据并附带 group_name。个人动态数据不缓存。
+      operationId: getBookshelf
+      parameters:
+        - name: sessionid
+          in: query
+          required: true
+          description: 番茄网页版(fanqienovel.com)登录后的 Cookie sessionid
+          schema: { type: string }
+        - name: group
+          in: query
+          description: 按分组过滤,为空返回全部
+          schema: { type: string }
+      responses:
+        "200":
+          description: 书架书籍列表(data 为数组,每项含书籍详情 + group_name)
+          content:
+            application/json:
+              schema: { $ref: "#/components/schemas/UpstreamResponse" }
+        "400":
+          $ref: "#/components/responses/BadRequest"
+        "500":
+          $ref: "#/components/responses/ServerError"
+  /read-history:
+    get:
+      tags: [榜单与个人数据]
+      summary: 获取阅读历史
+      description: 需要番茄网页版登录态;每页 20 条,每项合并书籍详情并保留原始记录(含阅读进度)于 history 字段。个人动态数据不缓存。
+      operationId: getReadHistory
+      parameters:
+        - name: sessionid
+          in: query
+          required: true
+          description: 番茄网页版(fanqienovel.com)登录后的 Cookie sessionid
+          schema: { type: string }
+        - name: offset
+          in: query
+          description: 偏移量,默认 0,每页 20 条
+          schema: { type: integer, default: 0, minimum: 0 }
+      responses:
+        "200":
+          description: 阅读历史列表(data 为数组)
+          content:
+            application/json:
+              schema: { $ref: "#/components/schemas/UpstreamResponse" }
+        "400":
+          $ref: "#/components/responses/BadRequest"
+        "500":
+          $ref: "#/components/responses/ServerError"
   /emoji/{file}:
     get:
       tags: [静态资源]