From f9b248fd07f43eedd02e24bd0bb1f00c9987cfc5 Mon Sep 17 00:00:00 2001 From: 3970260761 <3970260761@qq.com> Date: Sat, 7 Nov 2026 00:52:08 +0800 Subject: [PATCH] =?UTF-8?q?v-fixed44-hub-r2:=20=E5=85=AC=E5=91=8A=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E5=8F=AF=E6=8C=89ID=E5=B1=8F=E8=94=BD/=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E8=A6=86=E7=9B=96(announcement.json),=20=E4=B8=8B?= =?UTF-8?q?=E7=BA=BF=E6=97=A7=E5=85=AC=E5=91=8A;=20=E4=BB=85is=5Fpopup=3D1?= =?UTF-8?q?=E6=89=8D=E5=BC=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 14 ++++++++++++++ license-hub.js | 23 +++++++++++++++++++++-- public-live/announcement.json | 5 +++++ 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 public-live/announcement.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 063a32a..e3c33d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,20 @@ 格式参考本机发版惯例:按日期分条,`🐛修复` / `✨新功能`。 +## v-fixed44-hub-r2 (2026-11-07) + +### ✨ 新功能 +- 📢 公告弹窗可按 ID 屏蔽 / 本地覆盖:`public-live/announcement.json` + ```json + { "block_ids": [13], "override": { "enabled": true, "title": "标题", "content": "正文", "is_popup": 1 } } + ``` + `block_ids` 里的公告不再显示;`override` 填了就用它当弹窗内容;文件热改即生效(无需重启容器)。 + 默认写入 `block_ids: [13]`,即下线旧的「所有资源免费观看,请勿信片中的广告!」公告弹窗。 + +### 🐛 修复 +- 🔔 只有 `is_popup=1` 的公告才弹窗;此前会把列表里第一条普通公告也当作弹窗弹出。 +- 🔁 授权中心返回空公告时正确清空弹窗(不再残留上一次结果)。 + ## v-fixed44 (2026-11-06) ### ✨ 新功能 diff --git a/license-hub.js b/license-hub.js index b4fa453..94b3edf 100644 --- a/license-hub.js +++ b/license-hub.js @@ -119,6 +119,16 @@ async function heartbeat() { } catch (e) { state.hub_ok = false; console.log("[LICENSE] heartbeat err " + String(e && e.message || e)); } } +// 本地公告控制:/app/announcement.json(可热改,无需重启) +// { "block_ids": [13], "override": { "enabled": true, "title": "...", "content": "...", "is_popup": 1 } } +function loadLocalAnnouncement() { + try { + const p = process.env.LOCAL_ANNOUNCEMENT_FILE || "/app/public/announcement.json"; + if (!FS.existsSync(p)) return null; + return JSON.parse(FS.readFileSync(p, "utf8")) || null; + } catch (e) { return null; } +} + async function fetchAnnouncements() { const ctl = new AbortController(); const tm = setTimeout(() => ctl.abort(), TIMEOUT); @@ -128,8 +138,17 @@ async function fetchAnnouncements() { const j = await r.json(); if (j && j.code === 200 && j.data) { const ok = (arr) => (Array.isArray(arr) ? arr.filter(x => x && (x.project_id == null || String(x.project_id) === PROJECT_ID)) : []); - state.announcements = ok(j.data.list); - state.popup = ok(j.data.popup)[0] || state.announcements[0] || null; // 授权中心返回空列表即覆盖为空 + const local = loadLocalAnnouncement() || {}; + const blockIds = Array.isArray(local.block_ids) ? local.block_ids.map(String) : []; + const keep = (arr) => ok(arr).filter(x => !blockIds.includes(String(x.id))); + state.announcements = keep(j.data.list); + const ov = local.override; + if (ov && ov.enabled !== false && (ov.title || ov.content)) { + state.popup = { id: "local", title: ov.title || "", content: ov.content || "", is_popup: ov.is_popup == null ? 1 : ov.is_popup, project_id: PROJECT_ID, local: true }; + } else { + const wantPopup = (x) => Number(x.is_popup) === 1; + state.popup = keep(j.data.popup).filter(wantPopup)[0] || state.announcements.filter(wantPopup)[0] || null; + } state.hub_ok = true; console.log("[LICENSE] announcements n=" + state.announcements.length + " popup=" + (state.popup ? String(state.popup.title || "").slice(0, 30) : "-")); } diff --git a/public-live/announcement.json b/public-live/announcement.json new file mode 100644 index 0000000..c071cd2 --- /dev/null +++ b/public-live/announcement.json @@ -0,0 +1,5 @@ +{ + "_说明": "站点公告控制:block_ids 里的公告ID不再显示;override 填写后会替换授权中心公告作为弹窗内容(enabled=false 可停用)", + "block_ids": [13], + "override": null +}