From cb588071bdcb099656b512fbf10b3c3d2d065046 Mon Sep 17 00:00:00 2001 From: jinghui Date: Sun, 15 Nov 2026 23:14:21 +0800 Subject: [PATCH] =?UTF-8?q?feat(admin):=20=E6=8E=88=E6=9D=83=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E7=AE=A1=E7=90=86=E9=A1=B5=E2=80=94=E2=80=94=E5=89=8D?= =?UTF-8?q?=E5=8F=B0=E6=98=BE=E7=A4=BA=E5=BC=80=E5=85=B3+=E6=8C=89?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=AF=95=E7=94=A8=E6=97=B6=E9=95=BF=EF=BC=9B?= =?UTF-8?q?=E8=A1=A5=E6=B3=A8=E5=86=8CAI=E6=97=A0=E7=97=95=E6=94=B9?= =?UTF-8?q?=E5=AD=97=EF=BC=88=E4=BB=98=E8=B4=B9=E6=95=B015=E2=86=9216?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 10 ++ docker/it-tools-relay/server.py | 118 ++++++++++++++++++++++- src/components/CollapsibleToolMenu.vue | 8 +- src/pages/Admin.page.vue | 124 ++++++++++++++++++++++++- src/pages/Buy.page.vue | 7 +- src/pages/Home.page.vue | 8 +- src/pages/Pricing.page.vue | 4 +- src/tools/license/LicenseGate.vue | 21 +++-- src/tools/license/license.ts | 62 ++++++++++++- 9 files changed, 337 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 498f712..770acb6 100644 --- a/README.md +++ b/README.md @@ -145,6 +145,16 @@ - **安全**:缩略图与下载走统一 `/relay/admin/file?path=…&token=…` 路由(``/`` 无法携带 header,鉴权走 query token,与 header 双通道校验);路径白名单限定 `users/`、`gen_images/`、`mcp_files/` 三棵子树 + realpath 校验,防目录穿越;无 token 请求 403。 - 服务端按 mtime 全局排序后切片分页,每项附带 `source`(user/gen/mcp)、`file_type`、`is_image`、相对 `path` 字段。 +### 管理后台·授权应用管理(2026.11 新增) + +管理后台新增「🧩 授权应用」页,全部 18 个授权应用集中管控: + +- **前台显示开关**:每个授权应用一键「显示/隐藏」;隐藏后从左侧菜单、收藏夹、定价页、首页推荐同步消失(保存后前台刷新生效),直连地址与试用逻辑不受影响。 +- **每日免费试用时长**:按功能独立设置 1–1440 分钟(默认 30 分钟/天),保存后 relay 门禁与前端试用浮条同时生效(实测 5 分钟档:4 分 59 秒放行、5 分 01 秒拦截)。 +- **入口类型标注**:`页面` 类可切换显示;`API` 类(截图问答、视频字幕提取)仅服务端门禁、无前台页面,开关置灰禁用。 +- 配置落盘 relay `data/tool_config.json`;公开端点 `GET /relay/tool-config` 只回非默认项,前端带 localStorage 缓存兜底,拉取失败静默回落、不阻断功能。 +- 顺带修复:`AI 无痕改字`(`/ai-text-edit`)此前 relay 已门禁但前端授权清单漏注册,现已补入定价页自动上架(付费功能数 15 → 16,浮条/购买页数量动态化,不再写死 13)。 + ## 优势 - **一次激活,全站通用**:输入一次卡密,全部授权功能解锁,无需逐个购买 diff --git a/docker/it-tools-relay/server.py b/docker/it-tools-relay/server.py index d34f23b..7009aab 100644 --- a/docker/it-tools-relay/server.py +++ b/docker/it-tools-relay/server.py @@ -184,6 +184,44 @@ def _today_start(now_ms: int) -> int: return (now_ms + TZ_OFFSET_MS) // DAY_MS * DAY_MS - TZ_OFFSET_MS + +# ---------- 授权应用配置:前台显示开关 + 每工具每日试用时长(管理后台可改) ---------- +def _tool_cfg_path() -> str: + return os.path.join(DATA_DIR, "tool_config.json") + +def _load_tool_cfg() -> dict: + try: + with open(_tool_cfg_path(), encoding="utf-8") as f: + d = json.load(f) + return d if isinstance(d, dict) else {} + except Exception: + return {} + +def _save_tool_cfg(cfg: dict) -> None: + with open(_tool_cfg_path(), "w", encoding="utf-8") as f: + json.dump(cfg, f, ensure_ascii=False, indent=2) + +def _cfg_int(d: dict, key: str, default: int) -> int: + try: + n = int(d.get(key)) + return n if 1 <= n <= 1440 else default + except Exception: + return default + +def tool_visible(tool: str) -> bool: + """前台是否显示该应用(管理后台开关;默认显示)""" + v = _load_tool_cfg().get("visible") + if isinstance(v, dict): + return bool(v.get(tool, True)) + return True + +def trial_minutes_of(tool: str) -> int: + """该应用每日免费试用时长(分钟,默认 TRIAL_MS_MIN)""" + t = _load_tool_cfg().get("trial_minutes") + if isinstance(t, dict): + return _cfg_int(t, tool, TRIAL_MS // 60000) + return TRIAL_MS // 60000 + def trial_allowed(machine: str, tool: str) -> bool: key = f"{machine}|{tool}" now_ms = int(time.time() * 1000) @@ -197,7 +235,7 @@ def trial_allowed(machine: str, tool: str) -> bool: trials[key] = now_ms _save_trials(trials) return True - return (now_ms - start) < TRIAL_MS + return (now_ms - start) < trial_minutes_of(tool) * 60 * 1000 # ---------- AI 生图页:每日免费次数(未授权;北京时间 0 点重置,自带 KEY 不计次) ---------- @@ -1750,6 +1788,44 @@ def admin_api(method: str, sub: str, payload: dict, handler): _save_feedback(items) return 200, {"code": 200, "message": "ok"} + # ---- 授权应用管理:显示开关 + 每工具试用时长 ---- + if method == "GET" and sub == "/tools": + cfg = _load_tool_cfg() + vis = cfg.get("visible") if isinstance(cfg.get("visible"), dict) else {} + tr = cfg.get("trial_minutes") if isinstance(cfg.get("trial_minutes"), dict) else {} + dflt = TRIAL_MS // 60000 + tools = [] + for t in sorted(PROTECTED_TOOLS): + tools.append({"slug": t, "visible": bool(vis.get(t, True)), + "trial_minutes": _cfg_int(tr, t, dflt)}) + return 200, {"code": 200, "message": "ok", + "data": {"tools": tools, "default_trial": dflt}} + + if method == "POST" and sub == "/tools": + upd = payload.get("tools") + if not isinstance(upd, dict) or not upd: + return 400, {"code": 400, "message": "缺少 tools 配置"} + cfg = _load_tool_cfg() + vis = cfg.get("visible") if isinstance(cfg.get("visible"), dict) else {} + tr = cfg.get("trial_minutes") if isinstance(cfg.get("trial_minutes"), dict) else {} + dflt = TRIAL_MS // 60000 + applied = 0 + for slug, item in upd.items(): + if slug not in PROTECTED_TOOLS or not isinstance(item, dict): + continue + if "visible" in item: + vis[slug] = bool(item["visible"]) + if "trial_minutes" in item: + tr[slug] = _cfg_int(item, "trial_minutes", dflt) + applied += 1 + if applied == 0: + return 400, {"code": 400, "message": "没有有效的应用配置"} + try: + _save_tool_cfg({"visible": vis, "trial_minutes": tr}) + except Exception as e: + return 500, {"code": 500, "message": f"保存失败:{e}"} + return 200, {"code": 200, "message": "已保存", "data": {"applied": applied}} + if method == "GET" and sub == "/storage": total = _dir_size(USERS_ROOT) if os.path.isdir(USERS_ROOT) else 0 if os.path.isdir(os.path.join(DATA_DIR, "gen_images")): @@ -2519,6 +2595,24 @@ class Handler(BaseHTTPRequestHandler): self._reply(status, json.dumps(body, ensure_ascii=False).encode("utf-8"), "application/json") return + if parsed.path == "/tool-config": + # 公开:前台显示开关与试用时长(只回非默认项,缺省即默认) + cfg = _load_tool_cfg() + dflt = TRIAL_MS // 60000 + vis = cfg.get("visible") if isinstance(cfg.get("visible"), dict) else {} + tr = cfg.get("trial_minutes") if isinstance(cfg.get("trial_minutes"), dict) else {} + hidden = {k: False for k, v in vis.items() if k in PROTECTED_TOOLS and v is False} + custom = {} + for k in PROTECTED_TOOLS: + n = _cfg_int(tr, k, dflt) + if n != dflt: + custom[k] = n + self._reply(200, json.dumps({"code": 200, "message": "ok", "data": { + "defaults": {"visible": True, "trial_minutes": dflt}, + "visible": hidden, "trial_minutes": custom, + }}, ensure_ascii=False).encode("utf-8"), "application/json") + return + if parsed.path == "/check": machine = self.headers.get("X-Machine-Id", "") tool = self.headers.get("X-Tool", "") @@ -3989,7 +4083,17 @@ class Handler(BaseHTTPRequestHandler): items.append({"ts": int(h.get("ts") or 0), "bytes": b}) except (OSError, ValueError): items = [] - self._reply(200, json.dumps({"code": 200, "message": "ok", "data": {"items": items}}, ensure_ascii=False).encode("utf-8"), "application/json") + # 当前草稿(draft 文件)的时间戳:>0 表示草稿仍在,历史列表首项若同 ts + # 才有资格标「当前草稿」徽标(丢弃后 draft 删除、hist 保留,此时 curTs=0 不标) + cur_ts = 0 + if os.path.isfile(path): + try: + with open(path, "r", encoding="utf-8") as f: + rec = json.load(f) + cur_ts = int(rec.get("ts") or 0) + except (OSError, ValueError, TypeError): + cur_ts = 0 + self._reply(200, json.dumps({"code": 200, "message": "ok", "data": {"items": items, "curTs": cur_ts}}, ensure_ascii=False).encode("utf-8"), "application/json") def _handle_draft_delete(self): payload = self._read_payload() @@ -4108,7 +4212,15 @@ class Handler(BaseHTTPRequestHandler): self.send_header("Content-Length", str(len(raw))) self.send_header("Cache-Control", "private, max-age=86400") if dl == "1": - self.send_header("Content-Disposition", f'attachment; filename="{iid}{ext}"') + # 下载名:?name= 优先(UTF-8 文件名,浏览器全部支持 filename*),缺省用磁盘名 + nm = str((qs.get("name") or [""])[0] or "") + nm = os.path.basename(nm.replace("\\", "/")).strip()[:180] + nm = re.sub(r'[\x00-\x1f\x7f"]', "", nm) + if nm and nm not in (".", ".."): + self.send_header("Content-Disposition", + "attachment; filename*=UTF-8''" + parse.quote(nm)) + else: + self.send_header("Content-Disposition", f'attachment; filename="{iid}{ext}"') self.end_headers() try: self.wfile.write(raw) diff --git a/src/components/CollapsibleToolMenu.vue b/src/components/CollapsibleToolMenu.vue index 167a90e..9ed3ef9 100644 --- a/src/components/CollapsibleToolMenu.vue +++ b/src/components/CollapsibleToolMenu.vue @@ -4,7 +4,7 @@ import { useThemeVars } from 'naive-ui'; import { RouterLink, useRoute, useRouter } from 'vue-router'; import MenuIconItem from './MenuIconItem.vue'; import type { Tool, ToolCategory } from '@/tools/tools.types'; -import { PROTECTED_TOOLS } from '@/tools/license/license'; +import { PROTECTED_TOOLS, toolVisible } from '@/tools/license/license'; const props = withDefaults(defineProps<{ toolsByCategory?: ToolCategory[]; favoriteCategory?: ToolCategory | null }>(), { toolsByCategory: () => [], favoriteCategory: null }); const { toolsByCategory } = toRefs(props); @@ -75,6 +75,7 @@ const menuOptions = computed(() => { .map(({ name, components }) => ({ name, components: components.filter((tool) => { + if (!toolVisible(tool.path)) return false; // 管理后台关闭显示的应用:菜单隐藏 if (tool.path in PROTECTED_TOOLS) { if (!paidPaths.has(tool.path)) { paidPaths.add(tool.path); @@ -99,8 +100,9 @@ const menuOptions = computed(() => { const options = []; // favorites first, shown as-is (user shortcuts must stay visible) - if (props.favoriteCategory && props.favoriteCategory.components.length > 0) { - options.push(toOption(props.favoriteCategory.name, props.favoriteCategory.components)); + const favComps = (props.favoriteCategory?.components ?? []).filter(t => toolVisible(t.path)); + if (props.favoriteCategory && favComps.length > 0) { + options.push(toOption(props.favoriteCategory.name, favComps)); } if (paidTools.length > 0) { options.push(toOption(PAID_GROUP_NAME, paidTools)); diff --git a/src/pages/Admin.page.vue b/src/pages/Admin.page.vue index 9df5cb5..40ac400 100644 --- a/src/pages/Admin.page.vue +++ b/src/pages/Admin.page.vue @@ -519,12 +519,77 @@ function recoMove(i: number, d: -1 | 1) { reco.value.splice(j, 0, it); } -const tab = ref<'overview' | 'files' | 'usage' | 'mcp' | 'storage' | 'reco' | 'feedback'>('overview'); +// ============ 授权应用(前台显示开关 + 每日试用时长) ============ +/** relay PROTECTED_TOOLS 全量 18 项:中文名与入口类型(page=有前台页面可隐藏;api=纯服务端门禁) */ +const TOOL_META: Record = { + translator: { name: '在线翻译', kind: 'page' }, + 'image-ocr': { name: '图片OCR文字识别', kind: 'page' }, + 'pdf-ocr': { name: 'PDF文字识别', kind: 'page' }, + 'ai-retouch': { name: 'AI修图', kind: 'page' }, + 'doc-convert': { name: '文档格式转换', kind: 'page' }, + 'image-tools': { name: '图片工具', kind: 'page' }, + 'pdf-tools': { name: 'PDF工具', kind: 'page' }, + 'video-tools': { name: '视频工具', kind: 'page' }, + 'audio-tools': { name: '音频工具', kind: 'page' }, + 'text-to-image': { name: '文字生成图片', kind: 'page' }, + 'ai-image-tools': { name: 'AI图片实验室', kind: 'page' }, + copywriting: { name: '文案工具箱', kind: 'page' }, + 'screenshot-qa': { name: '截图问答', kind: 'api' }, + 'video-subtitle': { name: '视频字幕提取', kind: 'api' }, + 'ai-gen': { name: 'AI 生图', kind: 'page' }, + 'ai-text-edit': { name: 'AI 无痕改字', kind: 'page' }, + 'face-swap': { name: 'AI换脸', kind: 'page' }, + 'poster-maker': { name: 'AI海报生成', kind: 'page' }, +}; +const toolsList = ref<{ slug: string; visible: boolean; trial_minutes: number }[]>([]); +const toolsDefaultTrial = ref(30); +const toolsSaving = ref(false); +const toolsMsg = ref(''); + +async function loadTools() { + toolsMsg.value = ''; + try { + const b = await api('/admin/tools'); + if (b?.code === 200) { + toolsList.value = b.data.tools; + toolsDefaultTrial.value = b.data.default_trial; + } else { + toolsMsg.value = b?.message || '加载失败'; + } + } catch (e: any) { + toolsMsg.value = e?.message || '加载失败'; + } +} + +async function saveTools() { + toolsSaving.value = true; + toolsMsg.value = ''; + try { + const body: Record = {}; + for (const t of toolsList.value) { + const m = Math.min(1440, Math.max(1, Math.round(Number(t.trial_minutes) || toolsDefaultTrial.value))); + body[t.slug] = { visible: t.visible, trial_minutes: m }; + } + const b = await api('/admin/tools', { method: 'POST', body: JSON.stringify({ tools: body }) }); + if (b?.code === 200) { + toolsMsg.value = '已保存,前台页面刷新后生效'; + await loadTools(); + } else { + toolsMsg.value = b?.message || '保存失败'; + } + } catch (e: any) { + toolsMsg.value = e?.message || '保存失败'; + } finally { + toolsSaving.value = false; + } +} + +const tab = ref<'overview' | 'files' | 'usage' | 'mcp' | 'storage' | 'reco' | 'feedback' | 'tools'>('overview'); // 在线人数 30s 自动刷新(切走用量页签即停) let usageTimer: ReturnType | null = null; -function switchTab(id: 'overview' | 'files' | 'usage' | 'mcp' | 'storage' | 'reco' | 'feedback') { +function switchTab(id: 'overview' | 'files' | 'usage' | 'mcp' | 'storage' | 'reco' | 'feedback' | 'tools') { if (usageTimer) { clearInterval(usageTimer); usageTimer = null; @@ -543,6 +608,9 @@ function switchTab(id: 'overview' | 'files' | 'usage' | 'mcp' | 'storage' | 'rec if (id === 'mcp') { loadMcpUsage(); } + if (id === 'tools') { + loadTools(); + } if (id === 'storage') { loadStorage(); } @@ -580,6 +648,7 @@ function switchTab(id: 'overview' | 'files' | 'usage' | 'mcp' | 'storage' | 'rec
📊 总览与用户
📁 文件管理
+
🧩 授权应用
📈 使用统计
🤖 MCP 调用
💾 存储设置
@@ -717,6 +786,45 @@ function switchTab(id: 'overview' | 'files' | 'usage' | 'mcp' | 'storage' | 'rec + + +