From c3f48094f3f4fae7c89528410d2a348dad4f304d Mon Sep 17 00:00:00 2001 From: jinghui Date: Sun, 15 Nov 2026 23:14:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8E=88=E6=9D=83=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BC=80=E5=85=B3=E4=B8=8Eper-tool=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E6=97=B6=E9=95=BF=EF=BC=88/admin/tools=E3=80=81/tool-?= =?UTF-8?q?config=E3=80=81trial=5Fminutes=5Fof=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 ++++ server.py | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 101 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b28bcf9..888b268 100644 --- a/README.md +++ b/README.md @@ -27,8 +27,14 @@ Docker 镜像内置:calibre(`ebook-convert`)、ffmpeg、Piper(本地 TTS | `/draft/load` | GET | 草稿读取:`?machine=&tool=`,无草稿返回 `data: null` | | `/draft/delete` | POST | 草稿删除:离开站点时清理,返回 `deleted: true/false` | +| `/admin/tools` | GET | 授权应用管理(需 `X-Admin-Token`):返回全部 18 个 slug 的 `visible`/`trial_minutes` + `default_trial` | +| `/admin/tools` | POST | 保存显示开关与试用时长:JSON `{tools: {slug: {visible, trial_minutes}}}`,合并写 `data/tool_config.json`(trial_minutes 限 1–1440 分钟) | +| `/tool-config` | GET | 公开配置:前台显示开关与试用时长(只回非默认项,缺省即默认),供前端菜单/定价/试用浮条消费 | `PROTECTED_TOOLS` 集合含 `face-swap`、`poster-maker`(海报前端门控),与前端 `license.ts` 双端同步。 + +`PROTECTED_TOOLS` 集合含 `face-swap`、`poster-maker`(海报前端门控),与前端 `license.ts` 双端同步。每日试用时长按功能覆盖默认 `TRIAL_MS_MIN`(`trial_allowed` 读 `tool_config.json` 的 `trial_minutes`,未配置走默认)。 + ## 环境变量(`.env`) ```bash diff --git a/server.py b/server.py index 95d6d6a..7009aab 100644 --- a/server.py +++ b/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", "")