✨ feat(bookSource): 聚合书源适配阅读 app 并完善评论体验

- 聚合书源取代早期书源版本:发现页筛选宫格/分类宫格、x:t:m:d: 前缀搜索、
  fqtab 类型随书切换、段评气泡(内置六种样式可配);showCmt 能力检测,魔改版
  原地弹窗(点遮罩关闭)、官方阅读降级 startBrowser;jsLib 不引用规则变量,
  searchUrl 修正编码与作用域
- 评论页:注入绝对 API_BASE,修复弹窗 WebView 内切换排序/懒加载失败;
  externalBaseURL 识别 X-Forwarded-Proto,气泡 ident 不再硬编码 http;
  顶栏固定(拖拽把手)+评论区独立滚动
- 部署:证书方案从 certbot 迁移到 acme.sh(CERT_DIR 可配置);新增服务生命
  周期参数 --stop/--start/--no-restart/--no-autostart;--clean 一键清理全部
  部署内容(服务/nginx/二进制/证书,含 certbot 残留),acme.sh 定位抽为
  find_acme_sh 供 init/clean 共用
- 忽略 .codegraph 本地索引目录
This commit is contained in:
chenxin committed 2026-10-10 13:30:41 +08:00
1 parent 49d0a371fb
commit 0948ed594c
7 files changed
+353 -74

No files matched your search

+3 -1
View File
@@ -32,8 +32,10 @@ SRC_DIR="/root/code/novel/fanqie-go"
DOMAIN="fq.20010117.xyz" DOMAIN="fq.20010117.xyz"
# ---------- 证书 ---------- # ---------- 证书 ----------
# Certbot 申请证书的邮箱,用于接收过期提醒 # acme.sh 申请证书的邮箱,用于账户注册与过期提醒
CERT_EMAIL="you@example.com" CERT_EMAIL="you@example.com"
# 证书安装目录(acme.sh --install-cert 目标,nginx 配置从此处读取)
# CERT_DIR="/etc/nginx/ssl"
# ---------- 编译 ---------- # ---------- 编译 ----------
# BUILD_TARGET="./cmd/fanqie" # BUILD_TARGET="./cmd/fanqie"
+1
View File
@@ -57,3 +57,4 @@ fanqie-*
.env .env
.finesse/ .finesse/
fanqie.log fanqie.log
.codegraph/
+63
View File
@@ -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"
}
}
]
+221 -41
View File
@@ -7,6 +7,11 @@
# ./deploy.sh v1.2.0 # 编译 + 部署(指定版本) # ./deploy.sh v1.2.0 # 编译 + 部署(指定版本)
# ./deploy.sh v1.2.0 --init # 首次初始化(写 systemd/nginx 配置) # ./deploy.sh v1.2.0 --init # 首次初始化(写 systemd/nginx 配置)
# ./deploy.sh v1.2.0 --no-pull # 跳过 git pull # ./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 --build-only # 只编译,不部署
# ./deploy.sh --rollback # 交互式回滚到指定版本 # ./deploy.sh --rollback # 交互式回滚到指定版本
# ./deploy.sh --rollback v1.0.0 # 直接回滚到指定版本 # ./deploy.sh --rollback v1.0.0 # 直接回滚到指定版本
@@ -36,9 +41,11 @@ NGINX_CONF="${NGINX_CONF:-/etc/nginx/conf.d/${APP_NAME}.conf}"
APP_PORT="${APP_PORT:-40180}" # 程序监听端口 APP_PORT="${APP_PORT:-40180}" # 程序监听端口
DOMAIN="${DOMAIN:-fq.20010117.xyz}" # 域名 DOMAIN="${DOMAIN:-fq.20010117.xyz}" # 域名
CERT_EMAIL="${CERT_EMAIL:-admin@${DOMAIN}}" # 证书申请邮箱(过期提醒) 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 的包路径 BUILD_TARGET="${BUILD_TARGET:-./cmd/fanqie}" # go build 的包路径
ENV_FILE="${ENV_FILE:-${SRC_DIR}/.env}" # 应用环境变量(.env.example 为模板) ENV_FILE="${ENV_FILE:-${SRC_DIR}/.env}" # 应用环境变量(.env.example 为模板)
KEEP_VERSIONS="${KEEP_VERSIONS:-5}" # 保留最近几个版本 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' C_GREEN='\033[1;32m'; C_YELLOW='\033[1;33m'; C_RED='\033[1;31m'; C_BLUE='\033[1;34m'; C_RESET='\033[0m'
@@ -63,6 +70,11 @@ ROLLBACK_VERSION=""
LIST=false LIST=false
FORCE=false FORCE=false
SYNC_NGINX=false SYNC_NGINX=false
AUTO_START="${AUTO_START:-true}"
NO_RESTART=false
STOP=false
START=false
CLEAN=false
print_help() { print_help() {
cat <<EOF cat <<EOF
@@ -71,6 +83,12 @@ print_help() {
选项: 选项:
--init 首次初始化,写入 systemd 和 nginx 配置 --init 首次初始化,写入 systemd 和 nginx 配置
--no-pull 跳过 git pull --no-pull 跳过 git pull
--no-autostart 服务不设置开机自启(默认自启)
--no-restart 只部署不重启服务(自启设置仍会应用)
--stop 停止服务后退出
--start 启动服务后退出
--clean 清除本脚本部署的全部内容(服务/nginx/二进制/证书,含 certbot 残留;
保留 SRC_DIR 下的 .env/配置/数据库),之后重新 --init 即可
--build-only 只编译,不部署、不重启服务 --build-only 只编译,不部署、不重启服务
--force, -f 允许覆盖已存在的同名版本(默认报错退出) --force, -f 允许覆盖已存在的同名版本(默认报错退出)
--rollback [版本] 回滚到指定版本(不带版本号则交互式选择) --rollback [版本] 回滚到指定版本(不带版本号则交互式选择)
@@ -96,6 +114,11 @@ while [ $i -lt ${#ARGS[@]} ]; do
case "$arg" in case "$arg" in
--init) INIT=true ;; --init) INIT=true ;;
--no-pull) NO_PULL=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 ;; --build-only) BUILD_ONLY=true ;;
--rollback) --rollback)
ROLLBACK=true ROLLBACK=true
@@ -171,28 +194,61 @@ cleanup_old_versions() {
done 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"
}
# 应用开机自启设置(AUTO_START 由 --no-autostart / .deploy.env 决定)
apply_autostart() {
if [ "$AUTO_START" = true ]; then
$SUDO systemctl enable "${APP_NAME}" >/dev/null 2>&1 || true $SUDO systemctl enable "${APP_NAME}" >/dev/null 2>&1 || true
else 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" warn "服务 ${APP_NAME}.service 不存在,请先执行 $0 --init"
return 0 return 0
fi 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 if command -v nginx >/dev/null 2>&1; then
$SUDO systemctl reload nginx 2>/dev/null || $SUDO nginx -s reload 2>/dev/null || true $SUDO systemctl reload nginx 2>/dev/null || $SUDO nginx -s reload 2>/dev/null || true
fi fi
sleep 2
# 健康自检:确认服务真正响应,而非仅进程存活 # 健康自检:确认服务真正响应,而非仅进程存活
# 应用启动时初始化设备池(逐个注册设备)较慢,轮询等待就绪,最多 60s
if command -v curl >/dev/null 2>&1; then 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" log "健康检查通过: /healthz"
else else
err "健康检查失败: http://127.0.0.1:${APP_PORT}/healthz" err "健康检查失败: http://127.0.0.1:${APP_PORT}/healthz"
@@ -212,14 +268,12 @@ restart_and_verify() {
# 写入 nginx 配置(--init 与 --sync-nginx 共用的唯一模板来源) # 写入 nginx 配置(--init 与 --sync-nginx 共用的唯一模板来源)
# 模板自带完整 443/证书配置(证书存在时启用),不依赖签发工具注入——
# 这样 --sync-nginx 覆盖配置时不会丢失 HTTPS 段(注入式配置会被覆盖回 80-only)
write_nginx_conf() { write_nginx_conf() {
$SUDO tee "${NGINX_CONF}" >/dev/null <<NGINX_EOF # 反代 location(80 无证书时与 443 共用)
server { local proxy_locations
listen 80; proxy_locations=$(cat <<LOC_EOF
server_name ${DOMAIN};
access_log /var/log/nginx/${APP_NAME}.access.log;
error_log /var/log/nginx/${APP_NAME}.error.log;
# 视频解密代理:关闭缓冲,分片(Range/206)直通,避免 nginx 对大文件二次落盘 # 视频解密代理:关闭缓冲,分片(Range/206)直通,避免 nginx 对大文件二次落盘
location /video/proxy/ { location /video/proxy/ {
@@ -246,9 +300,66 @@ server {
proxy_read_timeout 300s; proxy_read_timeout 300s;
proxy_send_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 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 配置:备份 → 重写 → 校验 → 失败回滚 # 更新已部署服务器的 nginx 配置:备份 → 重写 → 校验 → 失败回滚
sync_nginx_conf() { sync_nginx_conf() {
local backup="" local backup=""
@@ -293,6 +404,79 @@ if [ "$SYNC_NGINX" = true ]; then
exit 0 exit 0
fi 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 对该域名的管理)"
echo " - certbot 残留: ${DOMAIN} 的证书、续期 timer 与 hook"
echo " (保留 ${SRC_DIR} 下的 .env / 配置 / 数据库;acme.sh 本体保留供重新部署使用)"
read -rp "确认清理?输入 yes 继续: " REPLY
[ "$REPLY" = "yes" ] || { info "已取消"; exit 0; }
# 服务
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 "已删除服务 ${APP_NAME}.service"
else
info "服务不存在,跳过"
fi
# nginx 配置(含 --sync-nginx 产生的 .bak.* 备份)
if [ -f "${NGINX_CONF}" ] || ls "${NGINX_CONF}".bak.* >/dev/null 2>&1; then
$SUDO rm -f "${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
fi
log "已删除 nginx 配置(含 .bak.* 备份)并重载"
fi
# 二进制与版本目录
$SUDO rm -rf "${BIN_DIR}"
log "已删除二进制目录: ${BIN_DIR}"
# 证书:移除 acme.sh 管理(--remove 不吊销,LE 证书自然过期)+ 删安装目录
ACME_SH="$(find_acme_sh)"
if [ -n "$ACME_SH" ]; then
$SUDO "$ACME_SH" --remove -d "${DOMAIN}" >/dev/null 2>&1 || true
fi
$SUDO rm -rf "${CERT_DIR}/${DOMAIN}"
log "已清除证书: ${CERT_DIR}/${DOMAIN}"
# certbot 残留(历史部署用 certbot 时遗留)
if command -v certbot &>/dev/null; then
$SUDO systemctl disable --now certbot.timer >/dev/null 2>&1 || true
$SUDO certbot delete --cert-name "${DOMAIN}" --non-interactive >/dev/null 2>&1 || true
fi
$SUDO rm -rf "/etc/letsencrypt/live/${DOMAIN}" "/etc/letsencrypt/archive/${DOMAIN}" \
"/etc/letsencrypt/renewal/${DOMAIN}.conf" \
"/etc/letsencrypt/renewal-hooks/deploy/reload-nginx.sh"
log "已清理 certbot 残留"
echo ""
log "✅ 清理完成。重新部署: $0 --init"
exit 0
fi
# ==================== --rollback ==================== # ==================== --rollback ====================
if [ "$ROLLBACK" = true ]; then if [ "$ROLLBACK" = true ]; then
if [ ! -d "${BIN_DIR}" ]; then if [ ! -d "${BIN_DIR}" ]; then
@@ -410,31 +594,27 @@ EOF
write_nginx_conf write_nginx_conf
# ---- 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 "证书已存在,跳过申请" 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}"
if $SUDO "$ACME_SH" --issue -d "${DOMAIN}" -w /var/www/html --server letsencrypt --keylength ec-256 -m "${CERT_EMAIL}" \
&& $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 fi
if command -v getenforce >/dev/null 2>&1 && [ "$(getenforce)" != "Disabled" ]; then if command -v getenforce >/dev/null 2>&1 && [ "$(getenforce)" != "Disabled" ]; then
+5 -11
View File
@@ -124,23 +124,17 @@ func addReviewToContent(jsonResult, itemID string, r *http.Request) string {
} }
} }
// 获取基础 URL // 获取基础 URL(反代场景识别 X-Forwarded-Proto,避免生成 http:// 被 301)
cfg := config.GetConfig() cfg := config.GetConfig()
baseURL := "" baseURL := ""
if cfg != nil { if r.Host != "" {
baseURL = externalBaseURL(r)
} else if cfg != nil {
host := cfg.Server.Host host := cfg.Server.Host
if host == "0.0.0.0" { if host == "0.0.0.0" {
host = "localhost" 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
}
} }
// 生成带段评标记的内容 // 生成带段评标记的内容
+14 -2
View File
@@ -12,6 +12,16 @@ import (
"time" "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 验证必需参数 // validateParams 验证必需参数
func validateParams(r *http.Request, required ...string) (map[string]string, error) { func validateParams(r *http.Request, required ...string) (map[string]string, error) {
params := make(map[string]string) 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.Header().Set("Content-Type", "text/html; charset=utf-8")
w.WriteHeader(http.StatusOK) 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) fmt.Fprint(w, html)
} }
@@ -318,6 +328,7 @@ var reviewTmpl = template.Must(template.New("review").Parse(reviewHTML))
// reviewPageData 评论页模板数据 // reviewPageData 评论页模板数据
type reviewPageData struct { type reviewPageData struct {
ItemID, BookID string ItemID, BookID string
BaseURL string
ParaPlus1, Para, Sort int ParaPlus1, Para, Sort int
Total, NextOffset int Total, NextOffset int
PageSize, CommentCount int PageSize, CommentCount int
@@ -327,7 +338,7 @@ type reviewPageData struct {
} }
// generateReviewHTML 生成评论 HTML 页面 // 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 total := 0
hasMore := false hasMore := false
nextOffset := 0 nextOffset := 0
@@ -383,6 +394,7 @@ func generateReviewHTML(data map[string]interface{}, itemID, bookID string, para
var b strings.Builder var b strings.Builder
if err := reviewTmpl.Execute(&b, reviewPageData{ if err := reviewTmpl.Execute(&b, reviewPageData{
ItemID: itemID, BookID: bookID, ItemID: itemID, BookID: bookID,
BaseURL: externalBaseURL(r),
ParaPlus1: para + 1, Para: para, Sort: sort, ParaPlus1: para + 1, Para: para, Sort: sort,
Total: total, NextOffset: nextOffset, Total: total, NextOffset: nextOffset,
PageSize: pageSize, CommentCount: len(pageComments), PageSize: pageSize, CommentCount: len(pageComments),
+46 -19
View File
@@ -49,25 +49,50 @@
box-sizing: border-box; box-sizing: border-box;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
} }
html, body { height: 100%; }
body { body {
background-color: var(--bg-primary); background-color: var(--bg-primary);
color: var(--text-primary); color: var(--text-primary);
padding: 15px;
max-width: 600px; max-width: 600px;
margin: 0 auto; margin: 0 auto;
display: flex;
flex-direction: column;
overflow: hidden;
transition: background-color 0.3s ease, color 0.3s ease; transition: background-color 0.3s ease, color 0.3s ease;
} }
.header { .header {
flex-shrink: 0;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin-bottom: 20px; padding: 10px 15px 12px;
padding: 10px 15px;
background: var(--bg-secondary); 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); box-shadow: 0 2px 8px var(--shadow);
position: relative;
z-index: 10;
transition: background-color 0.3s ease; 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 { .header h1 {
font-size: 18px; font-size: 18px;
color: var(--text-primary); 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> <i class="fas fa-book-open" style="color: var(--text-tertiary); font-size: 16px; margin: 0 10px;"></i>
</span> </span>
<div class="sort-tabs"> <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> </div>
<div id="comment-list"> <div id="comment-list">
@@ -370,6 +395,8 @@
const bookID = '{{.BookID}}'; const bookID = '{{.BookID}}';
const para = {{.Para}}; const para = {{.Para}};
let currentSort = {{.Sort}}; let currentSort = {{.Sort}};
// 服务端注入的绝对地址:弹窗 WebView(loadDataWithBaseURL) 中相对路径解析不可靠
const API_BASE = '{{.BaseURL}}';
const commentList = document.getElementById('comment-list'); const commentList = document.getElementById('comment-list');
const imageViewer = document.getElementById('imageViewer'); const imageViewer = document.getElementById('imageViewer');
@@ -380,7 +407,7 @@
// 已加载回复的评论 // 已加载回复的评论
const loadedReplies = new Set(); const loadedReplies = new Set();
// URL 构建 // URL 构建(绝对地址,兼容弹窗 WebView)
function buildReviewURL(params) { function buildReviewURL(params) {
const baseParams = { const baseParams = {
item_id: itemID, item_id: itemID,
@@ -388,7 +415,7 @@
para: para para: para
}; };
const query = new URLSearchParams({...baseParams, ...params}); const query = new URLSearchParams({...baseParams, ...params});
return '/review?' + query.toString(); return API_BASE + '/review?' + query.toString();
} }
// 时间格式化 // 时间格式化
@@ -429,11 +456,11 @@
}; };
} }
// 滚动信息获取 // 滚动信息获取(评论区为独立滚动容器)
function getScrollInfo() { 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 { return {
scrollTop, scrollTop,
scrollHeight, scrollHeight,
@@ -443,11 +470,11 @@
} }
// 切换排序 // 切换排序
async function switchSort(newSort) { async function switchSort(newSort, tab) {
if (currentSort === newSort) return; 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; commentList.innerHTML = LOADING_HTML;
@@ -479,7 +506,7 @@
} }
loadedReplies.clear(); loadedReplies.clear();
window.scrollTo({ top: 0, behavior: 'smooth' }); commentList.scrollTo({ top: 0, behavior: 'smooth' });
} else { } else {
commentList.innerHTML = '<div class="empty">加载失败,请重试</div>'; commentList.innerHTML = '<div class="empty">加载失败,请重试</div>';
commentIndex = 0; commentIndex = 0;
@@ -751,13 +778,13 @@
// 回到顶部 // 回到顶部
function scrollToTop() { function scrollToTop() {
window.scrollTo({ commentList.scrollTo({
top: 0, top: 0,
behavior: 'smooth' behavior: 'smooth'
}); });
} }
// 滚动监听 // 滚动监听(挂在评论容器上,顶栏固定不参与滚动)
const handleScroll = debounce(() => { const handleScroll = debounce(() => {
const scroll = getScrollInfo(); const scroll = getScrollInfo();
@@ -770,6 +797,6 @@
} }
}, 100); }, 100);
window.addEventListener('scroll', handleScroll, { passive: true }); commentList.addEventListener('scroll', handleScroll, { passive: true });
</script> </script>
</body> </body>