diff --git a/.gitignore b/.gitignore index 24a7d22..abc4ca1 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,7 @@ _shots/ # 原始私有素材与原站导出(协作仓只保留脱敏副本) raw/ backup/ + +# Python 缓存 +__pycache__/ +*.pyc diff --git a/README.md b/README.md index 32f0fb0..e03547a 100644 --- a/README.md +++ b/README.md @@ -16,3 +16,5 @@ > 看后端请从 **`backend/他应该知道的.md`** 开始读(生意背景 / 机器约束 / 数据边界 / 术语表), > 再进 `backend/README.md` 和两份交接说明。 > 写回执照 **`backend/回执模板.md`** 填。 + +- **内容后台**(2026-10-05):网站展示内容在网页后台里改 —— 设计与安全规则见 `内容后台设计.md`,部署见 `交接文档-2026-10.md` 7.1b。 diff --git a/backend/backend-site/admin.py b/backend/backend-site/admin.py index bce1880..94c5074 100644 --- a/backend/backend-site/admin.py +++ b/backend/backend-site/admin.py @@ -15,6 +15,12 @@ python3 admin.py sweep 清理超过保留期的成品 python3 admin.py stat 概览 python3 admin.py db [check|backup|export [目录]] 数据库:体检 / 热备份 / 导回旧版 JSON + python3 admin.py user list 内容后台:有哪些账号、最近登录 + python3 admin.py user add <用户名> [--email 邮箱] [--temp] 建账号(密码隐藏输入两遍;--temp = 发临时密码、首次登录必须改) + python3 admin.py user passwd <账号> 直接设新密码(这个账号所有会话作废) + python3 admin.py user reset <账号> [--to-admin] 忘了密码:会话全作废 → 临时密码 → 下次登录必须改 + python3 admin.py user disable|enable <账号> 停用 / 启用(停用时会话全作废) + python3 admin.py user sessions <账号> [--revoke-all] 在哪些设备登录着 / 全部踢掉 python3 admin.py audit [行数] 看兑换码失败/被拒记录 """ import csv, json, os, shutil, sys, time @@ -288,6 +294,71 @@ def cmd_db(argv): print("用法:admin.py db [check|backup|export [目录]]") +def cmd_user(argv): + """内容后台的账号(2026-10-05)。账号只能在服务器上用命令行建 —— 网页上没有注册入口。""" + import getpass + from datetime import datetime as _dt + sub, rest = (argv[0] if argv else "list"), argv[1:] + C = S.CMS + fmt = lambda ts: _dt.fromtimestamp(ts).strftime("%Y-%m-%d %H:%M") if ts else "从没登录过" + + def ask_pw(): + a = getpass.getpass("新密码(至少 %d 位):" % S.cms.MIN_PW) + if getpass.getpass("再输一遍:") != a: + sys.exit("两次输的不一样") + p = S.cms.pw_problem(a) + if p: + sys.exit(p) + return a + try: + if sub == "list": + for u in C.users(): + print("%-16s %-28s %s%s 最近登录 %s(%s) 登录着 %d 台" % ( + u["user"], u["email"] or "-", "【待改密】" if u["must_change"] else "", "【已停用】" if u["disabled"] else "", + fmt(u["last_login"]), u["last_ip"] or "-", u["sessions"])) + elif sub == "add" and rest: + email = rest[rest.index("--email") + 1] if "--email" in rest else None + import re as _re # 先校验,再问密码(不然填了半天密码才告诉你用户名不行) + if not _re.match(r"^[A-Za-z0-9_.-]{2,32}$", rest[0]): + sys.exit("用户名只能是 2–32 位字母、数字、点、横线、下划线") + if C.user_row(rest[0]) or (email and C.user_row(email)): + sys.exit("用户名或邮箱已经有人用了") + if "--temp" in rest: + import secrets as _sec + pw = _sec.token_urlsafe(9) + C.user_add(rest[0], pw, email, must_change=True) + print("建好了。临时密码:%s\n(只显示这一次;他第一次登录必须改密码)" % pw) + else: + C.user_add(rest[0], ask_pw(), email) + print("建好了:%s" % rest[0]) + elif sub == "passwd" and rest: + name = C.user_set_password(rest[0], ask_pw()) + C.audit("命令行", "-", "设了 %s 的新密码(所有会话已作废)" % name) + print("改好了;%s 所有登录着的设备都已退出" % name) + elif sub == "reset" and rest: + tmp = C.user_reset(rest[0], to_admin="--to-admin" in rest) + print("重置好了。临时密码:%s\n所有会话已作废;下次登录必须改密码。(临时密码只显示这一次)" % tmp) + elif sub in ("disable", "enable") and rest: + C.user_disable(rest[0], off=(sub == "disable")) + print("已%s:%s" % ("停用" if sub == "disable" else "启用", rest[0])) + elif sub == "sessions" and rest: + if "--revoke-all" in rest: + print("踢掉了 %d 个会话" % C.revoke_all(rest[0])) + else: + r = C.user_row(rest[0]) + if not r: + sys.exit("没有这个账号") + rows = C.sessions_of(r[0]) + if not rows: + print("(没有登录着的设备)") + for s in rows: + print("%s 最近 %s %s %s%s" % (s["id"], fmt(s["last"]), s["ip"], (s["ua"] or "")[:50], " 记住我" if s["remember"] else "")) + else: + print(__doc__) + except S.cms.Bad as e: + sys.exit(str(e)) + + def cmd_calls(argv): rows = S.STORE.calls() # 数据库 calls 表(2026-10-05 起;calls.jsonl 只是给手机通知的副本) if not rows: @@ -553,7 +624,7 @@ def cmd_gift(argv): CMDS = {"gen": cmd_gen, "codes": cmd_codes, "ls": cmd_ls, "show": cmd_show, "gift": cmd_gift, "price": cmd_price, - "retry": cmd_retry, "calls": cmd_calls, "db": cmd_db, "sweep": cmd_sweep, "stat": cmd_stat, + "retry": cmd_retry, "calls": cmd_calls, "db": cmd_db, "user": cmd_user, "sweep": cmd_sweep, "stat": cmd_stat, "audit": cmd_audit, "activate": cmd_activate, "pending": cmd_pending, "edit": cmd_edit} diff --git a/backend/backend-site/cms.py b/backend/backend-site/cms.py new file mode 100644 index 0000000..8ecadac --- /dev/null +++ b/backend/backend-site/cms.py @@ -0,0 +1,1119 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +"""金钻客栈 · 内容后台(服务端)—— 2026-10-05 + +网站前端所有**展示内容**(门户各板块、下单页的模板与文字、价格与付款方式)在这里改,不用再改代码。 +设计说明见仓库根目录 `内容后台设计.md`;这里是实现。纯标准库,和 server.py 同一个进程、同一个库(ys.db)。 + +接口全部挂在 /api/cms/ 下(nginx 反代后对外是 /order/api/cms/): + + POST login / logout 登录(用户名或邮箱 + 密码,「记住我」= Cookie 留 30 天)/ 退出 + GET me 当前账号(含 CSRF 令牌、是否必须改密) + POST password 改密码(除了这台,别的设备全部退出) + GET sessions / POST sessions/revoke 登录着的设备 / 踢掉一台或除这台外全部 + GET content 草稿 + 已发布 + 当前版本号 + POST draft / discard 存草稿 / 丢掉草稿 + POST publish / rollback 发布(写出静态内容文件)/ 回到某一版(也算一次发布) + GET versions / version?no= / audit 发布记录 / 某一版的内容 / 操作日志 + POST upload 画展传图(核验 → 剥元数据 → ffmpeg 出缩略图) + GET draft.js / draft-order.js 预览用:把草稿当成网站内容(只有登录的人能拿到) + +安全底线(店主定的,别放松): + * 密码:hashlib.scrypt(没有就 pbkdf2_hmac)加随机盐存哈希,任何地方都不存、不记明文。 + * 首次启动库里没有账号 → 自动建 admin / admin 并标「必须改密」: + 改密之前服务端**只放行 me / password / logout**,其它接口一律 403 —— 在下面 handle() 的统一入口拦。 + * 会话 = 服务端随机令牌,库里只存它的哈希,30 天滑动过期;退出 / 改密 / 命令行重置 / 停用都会当场作废。 + * Cookie:HttpOnly + SameSite=Strict,https 下加 Secure。修改类请求还要带 X-CSRF 头。 + * 只走 https:反代告诉我们不是 https 就拒绝(服务器本机直连调试例外)。 + * 内容后台碰不到卡密 / 订单:这里只读写 cms_* 表、内容文件、prices.json / payinfo.json。 +""" +import base64, hashlib, hmac, json, os, re, secrets, struct, subprocess, tempfile, threading, time +from datetime import datetime, timedelta, timezone + +PORTAL_DIR = os.environ.get("YS_PORTAL_DIR", "") # 门户网站根目录(index.html 所在) +ORDER_DIR = os.environ.get("YS_ORDER_DIR", "") # 下单页目录(order/index.html 所在) + +COOKIE = "jz_cms" +SESSION_DAYS = 30 # 会话 30 天没用就过期(用一次续一次) +MIN_PW = 8 +COMMON_PW = {"12345678", "123456789", "1234567890", "password", "password1", "11111111", "88888888", "00000000", + "qwertyui", "qwerty123", "abc12345", "admin123", "admin888", "iloveyou", "a1234567", "1qaz2wsx", + "admin", "administrator", "jinzuan", "jinzuan123"} +# 登录冷却:15 分钟内,同一 IP 错 5 次 / 同一账号(所有 IP 合计)错 20 次以上开始冷却:30s、60s、120s … 最长 15 分钟。 +# 账号那档故意放宽:只按账号算的话,别人从外面故意连错几次就能把店主锁在门外。 +FAIL_WIN, FAIL_FREE_IP, FAIL_FREE_USER = 15 * 60, 5, 20 +UPLOAD_MAX = 10 * 1024 * 1024 # 单张图 10MB(base64 后约 13.4MB,server.py 的 MAX_BODY 15MB 装得下) +THUMB_W = 720 + +CST = timezone(timedelta(hours=8)) +SLUG = re.compile(r"^[a-z0-9][a-z0-9_-]{0,31}$") +DATE = re.compile(r"^\d{4}-\d{2}-\d{2}$") +HEX = re.compile(r"^#[0-9A-Fa-f]{6}$") +# 站内相对路径:只许 exhibition/ 和 uploads/ 下面,不许 .. / 协议 / 开头斜杠 +PATH_RE = re.compile(r"^(exhibition|uploads)/[^\s<>\"'\\?#]{1,240}$") +BVID = re.compile(r"^BV[0-9A-Za-z]{10}$") + +_SCHEMA = """ +CREATE TABLE IF NOT EXISTS cms_users ( + id INTEGER PRIMARY KEY AUTOINCREMENT, username TEXT UNIQUE NOT NULL, email TEXT UNIQUE, + pw TEXT NOT NULL, must_change INTEGER NOT NULL DEFAULT 0, disabled INTEGER NOT NULL DEFAULT 0, + created REAL, last_login REAL, last_ip TEXT); +CREATE TABLE IF NOT EXISTS cms_sessions ( + th TEXT PRIMARY KEY, uid INTEGER NOT NULL, csrf TEXT NOT NULL, created REAL, last REAL, expires REAL, + remember INTEGER, ip TEXT, ua TEXT); +CREATE INDEX IF NOT EXISTS cms_sessions_uid ON cms_sessions(uid); +CREATE TABLE IF NOT EXISTS cms_draft (k TEXT PRIMARY KEY, data TEXT NOT NULL, base INTEGER, updated REAL, by TEXT); +CREATE TABLE IF NOT EXISTS cms_versions (no INTEGER PRIMARY KEY, data TEXT NOT NULL, note TEXT, by TEXT, at REAL, chg TEXT); +CREATE TABLE IF NOT EXISTS cms_audit (id INTEGER PRIMARY KEY AUTOINCREMENT, at REAL, who TEXT, ip TEXT, what TEXT); +""" + + +# ============================================================ 密码 +def hash_pw(pw): + salt = secrets.token_bytes(16) + try: + dk = hashlib.scrypt(pw.encode("utf-8"), salt=salt, n=2 ** 14, r=8, p=1, dklen=32, maxmem=64 * 1024 * 1024) + return "scrypt$16384$8$1$%s$%s" % (base64.b64encode(salt).decode(), base64.b64encode(dk).decode()) + except (AttributeError, ValueError): # 这台机器的 Python / OpenSSL 没带 scrypt + it = 600000 + dk = hashlib.pbkdf2_hmac("sha256", pw.encode("utf-8"), salt, it, 32) + return "pbkdf2$%d$%s$%s" % (it, base64.b64encode(salt).decode(), base64.b64encode(dk).decode()) + + +def check_pw(pw, stored): + try: + parts = stored.split("$") + if parts[0] == "scrypt": + n, r, p = int(parts[1]), int(parts[2]), int(parts[3]) + salt, want = base64.b64decode(parts[4]), base64.b64decode(parts[5]) + got = hashlib.scrypt(pw.encode("utf-8"), salt=salt, n=n, r=r, p=p, dklen=len(want), maxmem=64 * 1024 * 1024) + elif parts[0] == "pbkdf2": + it, salt, want = int(parts[1]), base64.b64decode(parts[2]), base64.b64decode(parts[3]) + got = hashlib.pbkdf2_hmac("sha256", pw.encode("utf-8"), salt, it, len(want)) + else: + return False + return hmac.compare_digest(got, want) + except Exception: + return False + + +def pw_problem(pw, old=None): + """新密码不合格的原因;合格返回 None。""" + if not isinstance(pw, str) or len(pw) < MIN_PW: + return "新密码至少 %d 位" % MIN_PW + if len(pw) > 128: + return "新密码太长了(最多 128 位)" + if pw.lower() in COMMON_PW or len(set(pw)) <= 2: + return "这个密码太常见了,换一个" + if old is not None and pw == old: + return "新密码不能和原来的一样" + return None + + +def _th(token): + return hashlib.sha256(token.encode("utf-8")).hexdigest() + + +# ============================================================ 内容的校验 / 规整 +class Bad(Exception): + """内容不合格:带上是哪一项、为什么(给后台页面直接显示)。""" + + +def _s(v, n, where, required=False): + v = "" if v is None else str(v) + v = v.replace("\r\n", "\n").replace("\r", "\n").strip() + v = "".join(ch for ch in v if ch == "\n" or ch == "\t" or ord(ch) >= 32) # 去掉控制字符 + if len(v) > n: + raise Bad("%s 太长了(最多 %d 个字,现在 %d 个)" % (where, n, len(v))) + if required and not v: + raise Bad("%s 不能空" % where) + return v + + +def _b(v): + return bool(v) and v not in ("0", "false", "False") + + +def _url(v, where, allow_mail=False, allow_site=False, allow_empty=True): + v = _s(v, 300, where) + if not v: + if allow_empty: + return "" + raise Bad("%s 不能空" % where) + if re.match(r"^https://[^\s<>\"'\\]+$", v, re.I): + return v + if allow_mail and re.match(r"^mailto:[^\s@<>\"'\\]+@[^\s@<>\"'\\]+$", v, re.I): + return v + if allow_site and re.match(r"^/[A-Za-z0-9_\-./]*$", v) and ".." not in v and not v.startswith("//"): + return v + if v.lower().startswith("http://"): + raise Bad("%s 要用 https://(http 不安全)" % where) + raise Bad("%s 格式不对:%s" % (where, "只收 https:// 开头的网址" + ("或 mailto: 邮箱" if allow_mail else "") + ("或站内路径(/ 开头)" if allow_site else ""))) + + +def _path(v, where, allow_empty=True): + v = _s(v, 260, where) + if not v: + if allow_empty: + return "" + raise Bad("%s 不能空" % where) + if not PATH_RE.match(v) or ".." in v or "//" in v: + raise Bad("%s 不是站内图片路径(只认 exhibition/… 或 uploads/…)" % where) + return v + + +def _date(v, where, allow_empty=True): + v = _s(v, 10, where) + if not v and allow_empty: + return "" + if not DATE.match(v): + raise Bad("%s 要写成 2026-10-05 这样" % where) + try: + datetime.strptime(v, "%Y-%m-%d") + except ValueError: + raise Bad("%s 不是一个真实的日期" % where) + return v + + +def _num(v, lo, hi, where, integer=False): + try: + x = float(v) + except (TypeError, ValueError): + raise Bad("%s 要填数字" % where) + if x != x or x < lo or x > hi: + raise Bad("%s 要在 %s 到 %s 之间" % (where, lo, hi)) + return int(round(x)) if integer else round(x, 4) + + +def _id(v, prefix): + v = str(v or "").strip().lower() + return v if SLUG.match(v) else prefix + secrets.token_hex(4) + + +def _list(v, where, cap): + if v is None: + return [] + if not isinstance(v, list): + raise Bad("%s 格式不对" % where) + if len(v) > cap: + raise Bad("%s 最多 %d 条" % (where, cap)) + return v + + +BOARD_IDS = ("home", "gallery", "apps", "universe", "links", "about") +GTYPES = ("image", "video", "pano", "wall") +STYLES = ("earth", "ocean", "jungle", "desert", "tundra", "ice", "lava", "toxic", "barren", "gas", "icegiant", "ringed", + "crystal", "paper", "neon", "duality", "rock", "ghost") +ENTERS = ("push", "zoom", "rise", "warp", "orbit") +KINDS = ("主宇宙", "原创", "二创") + + +def _look(v, where): + """星系图外观:后台能改 style / accent / enter;其余高级字段(位置、卫星、配色、半径)原样保留但要合法。""" + v = v if isinstance(v, dict) else {} + out = {} + st = str(v.get("style") or "earth") + if st not in STYLES: + raise Bad("%s 的星球风格不认识:%s" % (where, st)) + out["style"] = st + ac = str(v.get("accent") or "#FFD36E") + if not HEX.match(ac): + raise Bad("%s 的主色要写成 #RRGGBB" % where) + out["accent"] = ac.upper() + en = v.get("enter") + if en: + if en not in ENTERS: + raise Bad("%s 的入场运镜不认识:%s" % (where, en)) + out["enter"] = en + if v.get("r") not in (None, ""): + out["r"] = _num(v["r"], 0.4, 3.5, where + " 的大小") + if v.get("orbit") not in (None, "", []): + o = v["orbit"] + if not (isinstance(o, list) and len(o) == 2): + raise Bad("%s 的位置格式不对" % where) + out["orbit"] = [_num(o[0], 0, 80, where + " 的位置"), _num(o[1], 0, 7, where + " 的旋臂", integer=True)] + if v.get("colors"): + cs = _list(v["colors"], where + " 的配色", 4) + if not all(isinstance(c, str) and HEX.match(c) for c in cs): + raise Bad("%s 的配色要写成 #RRGGBB" % where) + out["colors"] = cs + if v.get("why"): + out["why"] = _s(v["why"], 160, where + " 的说明") + moons = [] + for k, m in enumerate(_list(v.get("moons"), where + " 的卫星", 4)): + m = m if isinstance(m, dict) else {} + mm = {"style": m.get("style") if m.get("style") in STYLES else "rock", + "r": _num(m.get("r", 0.3), 0.1, 1.2, where + " 的卫星大小"), + "d": _num(m.get("d", 2.6), 1.2, 9, where + " 的卫星距离")} + if m.get("speed") not in (None, ""): + mm["speed"] = _num(m["speed"], 0.05, 2, where + " 的卫星速度") + if m.get("colors"): + cs = _list(m["colors"], where + " 的卫星配色", 4) + if all(isinstance(c, str) and HEX.match(c) for c in cs): + mm["colors"] = cs + moons.append(mm) + if moons: + out["moons"] = moons + return out + + +def normalize_site(d): + d = d if isinstance(d, dict) else {} + out = {"v": 1} + h = d.get("hero") if isinstance(d.get("hero"), dict) else {} + n = h.get("notice") if isinstance(h.get("notice"), dict) else {} + out["hero"] = {"tagline": _s(h.get("tagline"), 160, "首屏那句话"), + "cta1": _s(h.get("cta1"), 12, "主按钮文字"), "cta2": _s(h.get("cta2"), 12, "次按钮文字"), + "notice": {"on": _b(n.get("on")), "text": _s(n.get("text"), 80, "公告内容"), + "from": _date(n.get("from"), "公告开始日期"), "to": _date(n.get("to"), "公告结束日期")}} + if out["hero"]["notice"]["on"] and not out["hero"]["notice"]["text"]: + raise Bad("公告打开了,但公告内容是空的") + bd = d.get("boards") if isinstance(d.get("boards"), dict) else {} + out["boards"] = {k: _s(bd.get(k), 120, "板块说明(%s)" % k) for k in BOARD_IDS if bd.get(k)} + + gal, ids = [], set() + for i, g in enumerate(_list(d.get("gallery"), "画展", 2000)): + g = g if isinstance(g, dict) else {} + w = "画展第 %d 件(%s)" % (i + 1, str(g.get("title") or "")[:20]) + t = g.get("type") if g.get("type") in GTYPES else "image" + e = {"id": _id(g.get("id"), "g"), "type": t, "date": _date(g.get("date"), w + " 的日期", allow_empty=False), + "title": _s(g.get("title"), 60, w + " 的标题", required=True), "desc": _s(g.get("desc"), 300, w + " 的说明"), + "owner": "gift" if g.get("owner") == "gift" else "own", "hidden": _b(g.get("hidden"))} + while e["id"] in ids: + e["id"] = "g" + secrets.token_hex(4) + ids.add(e["id"]) + if g.get("src"): + e["src"] = _path(g["src"], w + " 的图片") + if g.get("thumb"): + e["thumb"] = _path(g["thumb"], w + " 的缩略图") + if g.get("poster"): + e["poster"] = _path(g["poster"], w + " 的封面") + if g.get("r") not in (None, ""): + e["r"] = _num(g["r"], 0.1, 10, w + " 的宽高比") + if t == "video": + e["url"] = _url(g.get("url"), w + " 的视频链接") + if g.get("bvid"): + b = str(g["bvid"]).strip() + if not BVID.match(b): + raise Bad("%s 的 BV 号格式不对" % w) + e["bvid"] = b + m = re.search(r"(BV[0-9A-Za-z]{10})", e["url"]) + if m and "bvid" not in e: + e["bvid"] = m.group(1) + if not e["url"] and "bvid" not in e: + raise Bad("%s 是视频,要填 B 站链接" % w) + elif not e.get("src") and t != "wall": + raise Bad("%s 还没有图片" % w) + if g.get("frames"): + e["frames"] = [{"src": _path((f or {}).get("src"), w + " 的帧", allow_empty=False), + "label": _s((f or {}).get("label"), 20, w + " 的帧标签")} + for f in _list(g["frames"], w + " 的帧", 60)] + if t == "wall" and not e.get("frames") and not e.get("src"): + raise Bad("%s 是动态壁纸,至少要有一帧" % w) + gal.append(e) + out["gallery"] = gal + + apps = [] + for i, a in enumerate(_list(d.get("apps"), "工具与开源", 100)): + a = a if isinstance(a, dict) else {} + w = "工具第 %d 个(%s)" % (i + 1, str(a.get("name") or "")[:16]) + e = {"id": _id(a.get("id"), "a"), "name": _s(a.get("name"), 30, w + " 的名称", required=True), + "en": _s(a.get("en"), 40, w + " 的英文名"), "type": _s(a.get("type"), 12, w + " 的类型"), + "oss": _b(a.get("oss")), "desc": _s(a.get("desc"), 300, w + " 的介绍"), + "ver": _s(a.get("ver"), 24, w + " 的版本"), "size": _s(a.get("size"), 16, w + " 的大小"), + "status": _s(a.get("status"), 12, w + " 的状态"), + "url": _url(a.get("url"), w + " 的链接", allow_site=True), + "repo": _url(a.get("repo"), w + " 的仓库链接")} + if a.get("btn"): + e["btn"] = _s(a["btn"], 16, w + " 的按钮文字") + if _b(a.get("web")): + e["web"] = True + apps.append(e) + out["apps"] = apps + + groups, gids = [], set() + for i, g in enumerate(_list(d.get("linkGroups"), "平台分组", 20)): + g = g if isinstance(g, dict) else {} + gid = str(g.get("id") or "").strip().lower() + if not SLUG.match(gid) or gid in gids: + raise Bad("平台分组第 %d 个的 id 不合法或重复" % (i + 1)) + gids.add(gid) + groups.append({"id": gid, "name": _s(g.get("name"), 12, "平台分组名", required=True), "en": _s(g.get("en"), 20, "平台分组英文名")}) + out["linkGroups"] = groups + links = [] + for i, l in enumerate(_list(d.get("links"), "平台入口", 100)): + l = l if isinstance(l, dict) else {} + w = "平台入口第 %d 个(%s)" % (i + 1, str(l.get("name") or "")[:16]) + if l.get("group") not in gids: + raise Bad("%s 的分组不存在" % w) + links.append({"id": _id(l.get("id"), "l"), "group": l["group"], "key": _id(l.get("key"), "k"), + "name": _s(l.get("name"), 20, w + " 的名称", required=True), "en": _s(l.get("en"), 24, w + " 的英文名"), + "desc": _s(l.get("desc"), 40, w + " 的说明"), + "url": _url(l.get("url"), w + " 的链接", allow_mail=True, allow_empty=False)}) + out["links"] = links + + ab = d.get("about") if isinstance(d.get("about"), dict) else {} + out["about"] = {"story": _s(ab.get("story"), 1200, "名字的由来"), "foot": _s(ab.get("foot"), 200, "页脚那句话"), + "cards": [{"k": _s((c or {}).get("k"), 16, "署名卡片的小标题"), "h": _s((c or {}).get("h"), 30, "署名卡片的名字", required=True), + "p": _s((c or {}).get("p"), 600, "署名卡片的内容")} for c in _list(ab.get("cards"), "署名卡片", 20)]} + + un = d.get("universe") if isinstance(d.get("universe"), dict) else {} + items, nos = [], set() + for i, u in enumerate(_list(un.get("items"), "世界线", 40)): + u = u if isinstance(u, dict) else {} + no = str(u.get("no") or "") + w = "世界线 %s" % (no or "第 %d 条" % (i + 1)) + if not re.match(r"^\d{4}$", no) or no in nos: + raise Bad("%s 的编号要是 4 位数字且不能重复" % w) + nos.add(no) + kind = u.get("kind") if u.get("kind") in KINDS else "原创" + tags = [_s(t, 12, w + " 的标签") for t in _list(u.get("tags"), w + " 的标签", 10)] + items.append({"no": no, "name": _s(u.get("name"), 12, w + " 的名字", required=True), "kind": kind, + "tag": _s(u.get("tag"), 24, w + " 的一句话"), "desc": _s(u.get("desc"), 600, w + " 的简介"), + "tags": [t for t in tags if t], "look": _look(u.get("look"), w)}) + items.sort(key=lambda x: x["no"]) + out["universe"] = {"items": items, "empty": _num(un.get("empty", 6), 0, 20, "空槽数", integer=True)} + return out + + +def normalize_order(d, tpl_keys): + d = d if isinstance(d, dict) else {} + n = d.get("notice") if isinstance(d.get("notice"), dict) else {} + out = {"v": 1, "head": _s(d.get("head"), 80, "下单页页头那句话"), + "notice": {"on": _b(n.get("on")), "text": _s(n.get("text"), 120, "下单页公告")}} + if out["notice"]["on"] and not out["notice"]["text"]: + raise Bad("下单页公告打开了,但内容是空的") + seen, tpls = set(), [] + for t in _list(d.get("templates"), "模板", 40): + t = t if isinstance(t, dict) else {} + k = t.get("k") + if k not in tpl_keys or k in seen: + raise Bad("模板 key 不认识或重复:%s(key 要和渲染机一致,后台不能新增)" % k) + seen.add(k) + tpls.append({"k": k, "n": _s(t.get("n"), 12, "模板 %s 的名字" % k, required=True), "s": _s(t.get("s"), 24, "模板 %s 的说明" % k), + "on": t.get("on") is not False and t.get("on") not in ("0", "false")}) + if tpls and not any(t["on"] for t in tpls): + raise Bad("至少要留一个模板上架") + out["templates"] = tpls + pr = d.get("prices") if isinstance(d.get("prices"), dict) else {} + tiers, tn = [], set() + for t in _list(pr.get("tiers"), "价格档位", 10): + t = t if isinstance(t, dict) else {} + k = _num(t.get("n"), 1, 10, "价格档位的张数", integer=True) + if k in tn: + raise Bad("价格档位里 %d 张写了两次" % k) + tn.add(k) + tiers.append({"n": k, "price": _num(t.get("price"), 0, 9999, "%d 张的价格" % k), "url": _url(t.get("url"), "%d 张的爱发电链接" % k)}) + tiers.sort(key=lambda x: x["n"]) + out["prices"] = {"per": _num(pr.get("per", 6), 0.01, 9999, "单价"), "tiers": tiers} + pay = d.get("pay") if isinstance(d.get("pay"), dict) else {} + uid = _s(pay.get("payplatform_uid"), 40, "爱发电创作者 ID") + if uid and not re.match(r"^[A-Za-z0-9_-]+$", uid): + raise Bad("爱发电创作者 ID 只能是字母数字") + qr = _s(pay.get("qr_img"), 120, "收款码图片") + if qr and (".." in qr or qr.startswith("/") or not re.match(r"^[A-Za-z0-9_\-./]+$", qr)): + raise Bad("收款码图片路径不对") + out["pay"] = {"payplatform": _url(pay.get("payplatform"), "爱发电主页链接"), "payplatform_uid": uid, + "qr_img": qr, "note": _s(pay.get("note"), 200, "付款说明")} + return out + + +def normalize(doc, tpl_keys): + doc = doc if isinstance(doc, dict) else {} + return {"site": normalize_site(doc.get("site")), "order": normalize_order(doc.get("order"), tpl_keys)} + + +def diff_summary(a, b): + """两份内容差在哪:[(板块名, 新增, 改了, 删了)],给发布弹窗和发布记录用。""" + a, b = a or {}, b or {} + sa, sb, oa, ob = a.get("site") or {}, b.get("site") or {}, a.get("order") or {}, b.get("order") or {} + out = [] + + def lst(name, x, y, key): + X = {str(i.get(key)): json.dumps(i, sort_keys=True, ensure_ascii=False) for i in (x or [])} + Y = {str(i.get(key)): json.dumps(i, sort_keys=True, ensure_ascii=False) for i in (y or [])} + add = len([k for k in Y if k not in X]); dele = len([k for k in X if k not in Y]) + mod = len([k for k in Y if k in X and X[k] != Y[k]]) + order_changed = [k for k in X if k in Y] != [k for k in Y if k in X] + if add or dele or mod or order_changed: + out.append((name, add, mod + (1 if order_changed and not mod else 0), dele)) + + def obj(name, x, y): + if json.dumps(x, sort_keys=True, ensure_ascii=False) != json.dumps(y, sort_keys=True, ensure_ascii=False): + keys = set((x or {}).keys()) | set((y or {}).keys()) + n = sum(1 for k in keys if json.dumps((x or {}).get(k), sort_keys=True) != json.dumps((y or {}).get(k), sort_keys=True)) + out.append((name, 0, max(1, n), 0)) + + obj("首页文案", sa.get("hero"), sb.get("hero")) + obj("板块说明", sa.get("boards"), sb.get("boards")) + lst("画展", sa.get("gallery"), sb.get("gallery"), "id") + lst("工具与开源", sa.get("apps"), sb.get("apps"), "id") + ua, ub = sa.get("universe") or {}, sb.get("universe") or {} + lst("金钻宇宙", ua.get("items"), ub.get("items"), "no") + if ua.get("empty") != ub.get("empty"): + out.append(("金钻宇宙 · 空槽", 0, 1, 0)) + lst("平台分组", sa.get("linkGroups"), sb.get("linkGroups"), "id") + lst("平台入口", sa.get("links"), sb.get("links"), "id") + obj("关于", sa.get("about"), sb.get("about")) + lst("下单页模板", oa.get("templates"), ob.get("templates"), "k") + obj("下单页文字", {"head": oa.get("head"), "notice": oa.get("notice")}, {"head": ob.get("head"), "notice": ob.get("notice")}) + obj("价格档位", oa.get("prices"), ob.get("prices")) + obj("付款方式", oa.get("pay"), ob.get("pay")) + return out + + +def diff_text(rows): + return ";".join("%s %s" % (n, " · ".join(x for x in ["新增 %d" % a if a else "", "改了 %d" % m if m else "", "删了 %d" % d if d else ""] if x)) + for n, a, m, d in rows) or "没有改动" + + +# ============================================================ 给网站用的内容文件 +def _js_literal(obj): + """JSON 嵌进 ' +good = json.loads(json.dumps(doc)) +good["site"]["hero"]["tagline"] = "首页改一句 " + XSS[:40] +good["site"]["hero"]["notice"] = {"on": True, "text": "国庆照常营业", "from": "", "to": ""} +good["site"]["links"][0]["name"] = "哔哩哔哩" + "x" +good["site"]["universe"]["items"].append({"no": "0005", "name": "新地球", "kind": "原创", "tag": "卡通地球", "desc": XSS, "tags": ["新"], "look": {"style": "earth", "accent": "#7FE0A8", "enter": "push"}}) +good["order"]["templates"][-1]["on"] = False +good["order"]["prices"] = {"per": 6, "tiers": [{"n": 3, "price": 15, "url": "https://example.com/afdian/3"}]} +good["order"]["pay"]["note"] = "付款时留言写订单号" +st, j = a.req("draft", {"doc": good, "base": 1}) +check("存草稿:合格的内容存上,返回改了哪些板块", st == 200 and any(c[0] == "金钻宇宙" for c in j.get("changes", [])), j.get("changes")) +st, j = a.req("content") +check("草稿存在库里,网站上(已发布)还是原样", j.get("has_draft") and j["published"]["site"]["hero"]["tagline"] != good["site"]["hero"]["tagline"]) + +# ================================================================== 6. 预览草稿(要登录) +st, j = C(ip="203.0.113.30").req("draft.js") +check("预览草稿:没登录 → 401", st == 401) +st, j = a.req("draft.js") +body = j.get("_raw", "") +check("预览草稿:登录了 → 拿到草稿内容 + JZ_PREVIEW", st == 200 and "window.JZ_PREVIEW = true" in body and "新地球" in body) +check("预览草稿: 被转义,塞不进脚本", "" not in body.split("window.JZ_CONTENT = ", 1)[1].split("window.JZ_PREVIEW")[0], body[:80]) + +# ================================================================== 7. 发布 / 冲突 / 回滚 +st, j = a.req("publish", {"note": "测试发布", "base": 1}) +check("发布 → v2", st == 200 and j.get("version") == 2, j) +site_js = open(os.path.join(PORTAL, "content", "site.js"), encoding="utf-8").read() +order_js = open(os.path.join(ORDER, "content", "order.js"), encoding="utf-8").read() +check("发布写出门户 site.js:有新世界线、 被转义", "新地球" in site_js and "" not in site_js.split("=", 1)[1], site_js[:120]) +check("发布写出 site.json(正本)", json.load(open(os.path.join(PORTAL, "content", "site.json"), encoding="utf-8"))["hero"]["notice"]["on"] is True) +check("发布写出下单页 order.js:最后一个模板已下架", '"on":false' in order_js) +pr = json.load(open(S.PRICES_FILE, encoding="utf-8")); pay = json.load(open(S.PAYINFO_FILE, encoding="utf-8")) +check("价格档位写回 prices.json(server.py 原来的格式)", pr.get("per") == 6 and pr.get("tiers", {}).get("3", {}).get("price") == 15, pr) +check("付款方式写回 payinfo.json", pay.get("note") == "付款时留言写订单号", pay) +check("下单页的价格接口立刻反映新档位", S.price_for(3) == 15) +lit = [x for x in json.loads(site_js.split("window.JZ_CONTENT = ", 1)[1].rsplit(";", 1)[0])["universe"]["UNIVERSES"] if not x.get("empty")] +check("星系图数据:新世界线没写位置(交给 layout.js 自动排)", any(x["no"] == "0005" for x in lit)) +b = C(ip="203.0.113.40"); b.login("admin", NEWPW) +st, j = b.req("content") +d2 = j["draft"]; d2["site"]["hero"]["cta1"] = "看看画" +st, j = b.req("draft", {"doc": d2, "base": 1}) # 故意拿旧底稿 +st, j = b.req("publish", {"base": 1}) +check("别人已经发布过(底稿是旧版)→ 409 冲突,不静默覆盖", st == 409 and j.get("conflict"), j) +st, j = b.req("publish", {"base": 2}) +check("刷新到新底稿再发 → v3", st == 200 and j.get("version") == 3, j) +st, j = a.req("rollback", {"no": 1}) +check("回到 v1 → 记为 v4", st == 200 and j.get("version") == 4, j) +v1 = json.loads(db().execute("SELECT data FROM cms_versions WHERE no=1").fetchone()[0]) +v4 = json.loads(db().execute("SELECT data FROM cms_versions WHERE no=4").fetchone()[0]) +check("回滚后内容和 v1 一模一样", v1 == v4) +check("回滚后网站文件也回去了(没有新地球)", "新地球" not in open(os.path.join(PORTAL, "content", "site.js"), encoding="utf-8").read()) +st, j = a.req("versions") +check("发布记录 4 条,带改动摘要", st == 200 and len(j.get("versions", [])) == 4 and j["versions"][0]["chg"], j.get("versions", [{}])[0]) + +# ================================================================== 8. 传图 +def png(w=64, h=48, tail=b""): + raw = b"".join(b"\x00" + b"".join(bytes(((x * 3) % 256, (y * 5) % 256, 120, 255)) for x in range(w)) for y in range(h)) + ch = lambda t, d: struct.pack(">I", len(d)) + t + d + struct.pack(">I", zlib.crc32(t + d) & 0xffffffff) + return b"\x89PNG\r\n\x1a\n" + ch(b"IHDR", struct.pack(">IIBBBBB", w, h, 8, 6, 0, 0, 0)) + ch(b"tEXt", b"Comment\x00secret") + ch(b"IDAT", zlib.compress(raw)) + ch(b"IEND", b"") + tail +du = lambda b, t="png": "data:image/%s;base64,%s" % (t, base64.b64encode(b).decode()) +st, j = a.req("upload", {"name": "测试.png", "data": du(png())}) +ok_up = st == 200 and j.get("src", "").startswith("uploads/") and os.path.exists(os.path.join(PORTAL, j.get("src", "x"))) +check("传 PNG:存进 uploads/,量好宽高比", ok_up and abs(j.get("r", 0) - 64 / 48) < 0.01, j) +if ok_up: + saved = open(os.path.join(PORTAL, j["src"]), "rb").read() + check("PNG 的文字元数据块被剥掉", b"secret" not in saved) + has_ff = shutil.which("ffmpeg") is not None + check("缩略图:有 ffmpeg 就生成 .t.jpg,没有就退回原图", (j["thumb"].endswith(".t.jpg") and os.path.exists(os.path.join(PORTAL, j["thumb"]))) if has_ff else j["thumb"] == j["src"], j.get("thumb")) +st, j = a.req("upload", {"name": "x.png", "data": du(png(tail=b"hidden-payload"))}) +check("传图:PNG 尾部夹带数据 → 拒", st == 400 and "核验" in j.get("error", ""), j) +jpeg = b"\xff\xd8" + b"\xff\xe1" + struct.pack(">H", 2 + 20) + b"Exif\x00\x00GPS-LOCATION" + b"\x00" * 2 \ + + b"\xff\xc0" + struct.pack(">HBHHB", 11, 8, 40, 60, 1) + b"\x01\x11\x00" \ + + b"\xff\xda" + struct.pack(">HB", 8, 1) + b"\x01\x00\x00\x3f\x00" + b"\x12\x34\x56" + b"\xff\xd9" +st, j = a.req("upload", {"name": "p.jpg", "data": du(jpeg, "jpeg")}) +saved = open(os.path.join(PORTAL, j["src"]), "rb").read() if st == 200 else b"" +check("传 JPEG:EXIF(含拍摄地点)被剥掉,尺寸读对", st == 200 and b"GPS-LOCATION" not in saved and j.get("w") == 60 and j.get("h") == 40, j) +st, j = a.req("upload", {"name": "p.jpg", "data": du(jpeg + b"tail", "jpeg")}) +check("传 JPEG:结尾后夹带数据 → 拒", st == 400, j) +st, j = a.req("upload", {"name": "a.txt", "data": "data:text/plain;base64,aGVsbG8="}) +check("传图:不是图片 → 拒", st == 400, j) +st, j = a.req("upload", {"name": "big.png", "data": du(b"\x89PNG\r\n\x1a\n" + b"0" * (10 * 1024 * 1024 + 10))}) +check("传图:超过 10MB → 拒", st == 400 and "太大" in j.get("error", ""), j) + +# ================================================================== 9. 会话管理 +c1, c2 = C(ip="203.0.113.51"), C(ip="203.0.113.52") +c1.login("admin", NEWPW); c2.login("admin", NEWPW) +st, j = c1.req("sessions") +check("设备列表能看到多台,标出这台", st == 200 and len(j.get("sessions", [])) >= 3 and sum(1 for s in j["sessions"] if s.get("cur")) == 1, len(j.get("sessions", []))) +st, j = c1.req("sessions/revoke", {"others": True}) +st2, _ = c2.req("me"); st3, _ = c1.req("me") +check("「退出所有其它设备」:别的当场失效,这台还在", st == 200 and st2 == 401 and st3 == 200) +st, j = c1.req("logout", {}) +st2, _ = c1.req("me") +check("退出:服务端会话删掉,同一个 Cookie 再用 → 401", st == 200 and st2 == 401) +c3 = C(ip="203.0.113.53"); c3.login("admin", NEWPW) +with db() as con: + con.execute("UPDATE cms_sessions SET expires=? WHERE th=?", (time.time() - 1, S.cms._th(c3.cookie))) +st, _ = c3.req("me") +check("会话过期 → 401", st == 401) + +# ================================================================== 10. 命令行 +env = dict(os.environ, YS_ROOT=ROOT, YS_PORTAL_DIR=PORTAL, YS_ORDER_DIR=ORDER) +run = lambda *args: subprocess.run([sys.executable, os.path.join(SRC, "admin.py"), "user"] + list(args), capture_output=True, text=True, env=env, cwd=SRC, timeout=120) +keep = C(ip="203.0.113.60"); keep.login("admin", NEWPW) +r = run("reset", "admin") +m = re.search(r"临时密码:(\S+)", r.stdout) +st, _ = keep.req("me") +check("命令行 user reset:打印临时密码,原来的会话全部作废", m and st == 401, (r.stdout + r.stderr)[-120:]) +tmp_pw = m.group(1) if m else "" +st, j = C(ip="203.0.113.61").login("admin", tmp_pw) +check("用临时密码登录 → 必须改密", st == 200 and j.get("must_change") is True, j) +check("临时密码没写进日志", tmp_pw and tmp_pw not in (open(S.LOG_FILE, encoding="utf-8").read() if os.path.exists(S.LOG_FILE) else "")) +r = run("reset", "admin", "--to-admin") +st, j = C(ip="203.0.113.62").login("admin", "admin") +check("user reset --to-admin:退回 admin / admin 且必须改密", st == 200 and j.get("must_change") is True, j) +r = run("add", "editor2", "--email", "ed@example.com", "--temp") +m = re.search(r"临时密码:(\S+)", r.stdout) +st, j = C(ip="203.0.113.63").login("ed@example.com", m.group(1) if m else "") +check("user add --temp:用邮箱也能登,首次必须改密", st == 200 and j.get("must_change") is True and j.get("user") == "editor2", (r.stdout + r.stderr)[-120:]) +r = run("disable", "editor2") +st, j = C(ip="203.0.113.64").login("editor2", m.group(1) if m else "") +check("user disable:停用后登不上", st == 401, j) +r = run("list") +check("user list 能跑,列出两个账号", r.returncode == 0 and "admin" in r.stdout and "editor2" in r.stdout and "已停用" in r.stdout, r.stdout[-200:]) +r = run("add", "x y") +check("user add:非法用户名 → 报错退出", r.returncode != 0, (r.stdout + r.stderr)[-80:]) + +# ================================================================== 11. 多个进程同时首次启动:只建一个初始账号 +R2 = tempfile.mkdtemp(prefix="ys-cms-race-") +probe = "import sys,os;sys.path.insert(0,%r);os.environ['YS_ROOT']=%r;import server" % (SRC, R2) +ps = [subprocess.Popen([sys.executable, "-c", probe], env=dict(os.environ, YS_ROOT=R2), stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) for _ in range(3)] +[p.wait(timeout=120) for p in ps] +n = sqlite3.connect(os.path.join(R2, "ys.db")).execute("SELECT COUNT(*) FROM cms_users").fetchone()[0] +check("三个进程同时首次启动:只建了一个初始账号", n == 1, n) + +# ================================================================== 12. 原有接口不受影响 +try: + with urllib.request.urlopen("http://127.0.0.1:%d/api/status" % srv.server_address[1], timeout=10) as r: + stj = json.loads(r.read()) +except Exception as e: + stj = {"err": repr(e)} +check("下单那边的接口照常(/api/status)", stj.get("ok") is True, stj) + +srv.shutdown() +shutil.rmtree(TMP, ignore_errors=True); shutil.rmtree(R2, ignore_errors=True) +bad = [n for n, ok, _ in RESULTS if not ok] +print("\n%d 条,失败 %d 条" % (len(RESULTS), len(bad))) +for n in bad: + print(" ✗ " + n) +sys.exit(1 if bad else 0) diff --git a/backend/backend-site/交接说明.md b/backend/backend-site/交接说明.md index 4ee8390..24a7a73 100644 --- a/backend/backend-site/交接说明.md +++ b/backend/backend-site/交接说明.md @@ -51,11 +51,14 @@ | `server.py` | ~3100 | **全部服务端逻辑**:路由、订单状态机、卡密生命周期、限流、PNG 结构核验的调用方、爱发电回调、打包下载、小票生成 | | `admin.py` | ~540 | 命令行管理工具:发卡密 / 看队列 / 重渲 / 清过期 / 审计被拦记录 | | `pngcheck.py` | ~130 | PNG **结构**核验(不解码像素):防「夹带私货」——尾部塞字节、未知关键块、APNG | +| `cms.py` | ~900 | **内容后台**(2026-10-05 晚):账号 / 会话 / 草稿 / 发布 / 回滚 / 传图;`server.py` 把 `/api/cms/*` 交给它。见仓库根目录 `内容后台设计.md` | | `store.py` | ~400 | **数据层**(2026-10-05 新增):SQLite 建库 / 第一次启动自动导入旧 JSON / 存取 / 导出回旧格式 / 体检 / 热备份 | | `tests/回执复现测试.py` | ~280 | 回归 + 漏洞复现(27 条,HTTP 层打接口) | +| `tests/内容后台测试.py` | ~330 | 内容后台专项(75 条:强制改密、无明文、Cookie、https / CSRF / 来源 / 冷却、校验、发布、回滚、传图、会话、命令行) | | `tests/数据库测试.py` | ~290 | 数据库专项(38 条:全新安装、迁移、回退、事务、并发、规模),数据全是现编的 | -> 这几个文件是**自足**的:没有 import 本项目之外的模块。**部署时 `store.py` 必须和 `server.py` 放在同一个目录**(`server.py` 直接 `import store`)。 +> 这几个文件是**自足**的:没有 import 本项目之外的模块。**部署时 `store.py`、`cms.py` 必须和 `server.py` 放在同一个目录**(`server.py` 直接 `import store` / `import cms`)。 +> 内容后台还要两个环境变量 `YS_PORTAL_DIR` / `YS_ORDER_DIR`、nginx 一节配置、首次部署马上改初始密码 —— 见 `交接文档-2026-10.md` 7.1b。 --- diff --git a/backend/deploy/nginx-片段.md b/backend/deploy/nginx-片段.md index c49d41b..aacd2ff 100644 --- a/backend/deploy/nginx-片段.md +++ b/backend/deploy/nginx-片段.md @@ -55,6 +55,36 @@ location /order/api/ { } ``` +### ④ 内容后台(2026-10-05 加) + +```nginx +# 登录 / 内容接口。⚠️ 必须带 X-Forwarded-Proto —— 后端看它判断是不是 https,不带一律拒绝(内容后台只走 https) +location /order/api/cms/ { + limit_req zone= burst=20 nodelay; + limit_req_status 429; + client_max_body_size 16m; # 画展传图:单张 10MB,base64 后约 13.4MB + proxy_pass http://localhost:/api/cms/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-Proto $scheme; +} + +# 后台发布出来的内容文件:文件名不变、内容会变 → 让浏览器每次都问一下有没有新的 +location /content/ { add_header Cache-Control "no-cache"; } +location /order/content/ { add_header Cache-Control "no-cache"; } +# 后台页面本身不缓存(改版后别人拿到旧页面会调错接口) +location /admin/ { add_header Cache-Control "no-store"; } +# 画展上传的图(文件名是随机的,可以长缓存) +location /uploads/ { add_header Cache-Control "public, max-age=2592000"; } + +# 整站 http → https,并加 HSTS(登录页绝不能走 http) +server { listen 80; server_name shop.example.com; return 301 https://$host$request_uri; } +# 在 443 的 server 块里加: +# add_header Strict-Transport-Security "max-age=31536000" always; +``` + +> 没配好证书之前**不要开放内容后台**:后端会拒绝所有非 https 的请求(返回 403「内容后台只能用 https 打开」)。 + ⚠️ **打包下载(zip)那条要另外配**:`proxy_buffering off` + 更长的 `proxy_read_timeout`, 因为它是**先落临时文件再边读边发**的,不能在 nginx 这层再缓存一份(小机器内存受不住)。 diff --git a/backend/交付清单.md b/backend/交付清单.md index c1dbfe5..90f8ec3 100644 --- a/backend/交付清单.md +++ b/backend/交付清单.md @@ -1,17 +1,19 @@ # 交付清单(自查用) -> 生成:2026-10-05 17:30 共 36 个文件 合计 44.9 MB(2026-10-05 第二轮:数据库 store.py、两份测试、回执;后台面板和本机开单页面重写;推送前审查修复) +> 生成:2026-10-05 21:24 共 38 个文件 合计 44.9 MB(2026-10-05 晚:加了内容后台 cms.py、内容后台测试;nginx 片段加了内容后台一节) | 文件 | 字节 | SHA-256 | |---|---|---| | `README.md` | 8,696 | `5cef368dbf5916def012dbfcf7fdfb35d1f435faf5a7b42b65f6ad683343b1c2` | -| `backend-site/admin.py` | 26,020 | `d7f86dcf0b07962ceb55a7714b43c876628118d19159dc3a9215535db1bc47f7` | +| `backend-site/admin.py` | 30,200 | `70df55efa4172aca7e244138ac2252c3af5121459340f2cbfac887fd40754bde` | +| `backend-site/cms.py` | 59,893 | `b549a0d6b011f15eefa0c20325d23e5158a3bc1ecdca462b864ababac183fb25` | | `backend-site/pngcheck.py` | 4,945 | `ccec7ab21b0399da651029ffa5781bad498e0905b31a1102f6ba3e3f01e8594d` | -| `backend-site/server.py` | 181,352 | `438fcd98d57043ee503222b6decc83e873dda2d62c66a8d36f521c7d21e6afed` | +| `backend-site/server.py` | 181,993 | `05c0aaa93f5adf39beecb9042313da8233099cee6060013d8f7cbf7fd142788a` | | `backend-site/store.py` | 19,303 | `9d22007b43188225d4254f8c9710c310d9d55635d0d67496ec99e91fe47bcd2d` | +| `backend-site/tests/内容后台测试.py` | 22,569 | `105b2115668d8eb7cfd60e86d6b2cb44f7a564f2f84d40f56cea584f8a13e0b8` | | `backend-site/tests/回执复现测试.py` | 15,355 | `4529f6076abdfce89bf4406c7fbd0789482deaa595383749580bdc3e08ddc327` | | `backend-site/tests/数据库测试.py` | 16,045 | `9838f32bf213cd3c727625a50b5e0cbff7da98ded8b7452cacd187c448bde04f` | -| `backend-site/交接说明.md` | 21,795 | `03b9cb73b27a265c32fc5a36120da0d6d61c2e1d612308cba0221818493cb3f0` | +| `backend-site/交接说明.md` | 22,394 | `8e4dd211654fa7a0c30b26c8e1368274f59e91ea2104ba5e73122f690bc55b6b` | | `backend-site/回执-Claude.md` | 37,690 | `de1648832fe8bcd004c32ed538d4a90c6c29a0d72b8c70f448fdbe5332d8b5d9` | | `backend-tools/chk_worker.ps1` | 486 | `939a42cafa0954347f28d69e75b8af407ed1dab870cc3956fa8b7c5eb55e372f` | | `backend-tools/deploy.py` | 5,694 | `bf2cf47e715a3663faba5f1125ca9dee57596fd59664e2898515985924a0cc8c` | @@ -33,7 +35,7 @@ | `backend-tools/ys_worker.py` | 30,465 | `ab6cdff13ce16ed15363c28cf016628b378a1ec255d2b8eeb62566cf38631eb9` | | `backend-tools/交接说明.md` | 15,276 | `5468d47b9f51bb6cca6172db6a61bed209a181814ac662093345d02445305dea` | | `backend-tools/回执-Claude.md` | 11,578 | `d1151810199f0dc585872027870666963e528f7027f12ce146334c5f36f761e4` | -| `deploy/nginx-片段.md` | 4,145 | `183179dc694e1f2ac3a791f3c96aa6f7d292b1968276ae1af4d850e26fbf78d0` | +| `deploy/nginx-片段.md` | 5,696 | `7ec0cc36e69d62025b240312bb604cb088c77a0a40337623e01f9bc0e5dbdca7` | | `他应该知道的.md` | 6,988 | `177f08cb455bf5cf4b299abda5b227ff530c1da634c69f81c8ca7498ccc00cbe` | | `回执模板.md` | 5,049 | `0e38a6c19dff7b55767b8998d294b0252aa6024053dad0c63956ddd58b56a07a` | | `模板/1站立正反.blend` | 16,486,783 | `985dc61aeaa6eaaf5dc87ccbba6dfd4e1c5eb95468f7d0a9610d47aff14cb9dc` | diff --git a/order/content/order.js b/order/content/order.js new file mode 100644 index 0000000..24f49df --- /dev/null +++ b/order/content/order.js @@ -0,0 +1,2 @@ +/* 内容文件:由内容后台发布时生成(这是第一版:从网站原有内容导入)。别手改:下次发布会被覆盖。改内容请用内容后台。 */ +window.JZ_ORDER = {"v":1,"head":"传一张皮肤,选个模板,等一会儿就能拿到渲染图。","notice":{"on":false,"text":""},"templates":[{"k":"stand","n":"站立正反","s":"正面站立 · 干净背景","on":true},{"k":"standb","n":"站立正反(虚化)","s":"同款 + 景深虚化","on":true},{"k":"wheat","n":"麦田萤火","s":"麦田 · 暖光 · 萤火","on":true},{"k":"beach","n":"海边自拍","s":"海面 · 天光","on":true},{"k":"boom","n":"不看爆炸","s":"身后爆炸 · 不回头","on":true},{"k":"sakura","n":"飞跃樱花林","s":"樱花 · 动态","on":true},{"k":"airship","n":"空艇巡游","s":"飞空艇 · 巡航","on":true}]}; diff --git a/order/content/order.json b/order/content/order.json new file mode 100644 index 0000000..0b8aefb --- /dev/null +++ b/order/content/order.json @@ -0,0 +1,62 @@ +{ + "v": 1, + "head": "传一张皮肤,选个模板,等一会儿就能拿到渲染图。", + "notice": { + "on": false, + "text": "" + }, + "templates": [ + { + "k": "stand", + "n": "站立正反", + "s": "正面站立 · 干净背景", + "on": true + }, + { + "k": "standb", + "n": "站立正反(虚化)", + "s": "同款 + 景深虚化", + "on": true + }, + { + "k": "wheat", + "n": "麦田萤火", + "s": "麦田 · 暖光 · 萤火", + "on": true + }, + { + "k": "beach", + "n": "海边自拍", + "s": "海面 · 天光", + "on": true + }, + { + "k": "boom", + "n": "不看爆炸", + "s": "身后爆炸 · 不回头", + "on": true + }, + { + "k": "sakura", + "n": "飞跃樱花林", + "s": "樱花 · 动态", + "on": true + }, + { + "k": "airship", + "n": "空艇巡游", + "s": "飞空艇 · 巡航", + "on": true + } + ], + "prices": { + "per": 6.0, + "tiers": [] + }, + "pay": { + "payplatform": "", + "payplatform_uid": "", + "qr_img": "", + "note": "" + } +} \ No newline at end of file diff --git a/order/index.html b/order/index.html index ffb1822..e4b4db0 100644 --- a/order/index.html +++ b/order/index.html @@ -885,6 +885,10 @@ html[data-skin="1"] .se-b{animation-name:se-drift-b-mild}
+ + + + + diff --git a/portal/admin/index.html b/portal/admin/index.html new file mode 100644 index 0000000..1f756bd --- /dev/null +++ b/portal/admin/index.html @@ -0,0 +1,974 @@ + + + + + + +金钻客栈 · 内容后台 + + + + + + + + + + + + +
+ + +
+ + + + diff --git a/portal/admin/pixel.woff2 b/portal/admin/pixel.woff2 new file mode 100644 index 0000000..cb3aeb8 Binary files /dev/null and b/portal/admin/pixel.woff2 differ diff --git a/portal/assets/universe/config.js b/portal/assets/universe/config.js index 7e3a633..4b2cb8e 100644 --- a/portal/assets/universe/config.js +++ b/portal/assets/universe/config.js @@ -61,7 +61,20 @@ window.JZ_UNIVERSE = { nebula: [['#2F4BD8', '#4FB8E8'], ['#4A35B8', '#7C6BFF'], ['#1C7A8C', '#4FD1C5'], ['#5B3FB8', '#9B8BFF']], coreNebula: ['#FFC97A', '#B98CFF'], line: '#7F8BC8', ui: '#FFD36E', }, + firstSlot: 5, // 空槽从几号开始按编号排到外圈固定槽位(排布规则见 layout.js) intro: 'random', // 开场运镜:sweep 盘旋落下 / dive 垂直坠入 / random 每次随机 sectors: ['S-01 · 晨线', 'S-02 · 冰原', 'S-03 · 霓虹', 'S-04 · 衡天', 'S-05 · 未测绘', 'S-06 · 未测绘'], }, }; + +/* ----------------------------------------------------------------------------- + * 内容后台发布的世界线(2026-10-05):门户先加载 content/site.js(window.JZ_CONTENT), + * 里面有 universe.UNIVERSES / LOOKS 就用它的 —— 上面写死的两份只是兜底(内容文件读不到时用)。 + * 星系整体(GALAXY)和空槽外观(EMPTY_LOOK)不归后台管,还是改这个文件。 + * --------------------------------------------------------------------------- */ +(function () { + var C = window.JZ_CONTENT && window.JZ_CONTENT.universe, U = window.JZ_UNIVERSE; + if (!C || !U) return; + if (Array.isArray(C.UNIVERSES) && C.UNIVERSES.length) U.UNIVERSES = C.UNIVERSES; + if (C.LOOKS && typeof C.LOOKS === 'object') U.LOOKS = C.LOOKS; +})(); diff --git a/portal/assets/universe/galaxy.js b/portal/assets/universe/galaxy.js index 32845b9..34e7b19 100644 --- a/portal/assets/universe/galaxy.js +++ b/portal/assets/universe/galaxy.js @@ -11,7 +11,8 @@ * 返回 { fly(no), home(), resize() }。画面滚出视口时自动暂停渲染。 * ============================================================================= */ import * as THREE from 'three'; -import { makePlanet } from './planets.js?v=1'; +import { makePlanet } from './planets.js?v=2'; +import { layoutSystems } from './layout.js?v=2'; export function mountGalaxy(el) { const CFG = window.JZ_UNIVERSE, G = CFG.GALAXY, C = G.colors; @@ -29,6 +30,8 @@ export function mountGalaxy(el) { const rnd = (a = 0, b = 1) => a + Math.random() * (b - a); const gauss = () => { let u = 0, v = 0; while (!u) u = Math.random(); while (!v) v = Math.random(); return Math.sqrt(-2 * Math.log(u)) * Math.cos(2 * Math.PI * v); }; const armAngle = (r, arm) => arm * Math.PI * 2 / ARMS + r * G.twist; + // 名牌 / 档案卡里的文字一律转义(内容来自后台,不能当 HTML 拼) + const esc = x => String(x == null ? '' : x).replace(/[&<>"']/g, c => ({ '&': '&', '<': '<', '>': '>', '"': '"', "'": ''' }[c])); const LIGHT = new THREE.Vector3(-1, 0.55, 0.6).normalize(); // ============================================================ 旋臂星系(粒子)—— 星点大小有上限,离镜头很近的也不会糊成大光斑 @@ -97,27 +100,26 @@ export function mountGalaxy(el) { // ============================================================ 星系(每条世界线一颗卡通星球 + 卫星) const systems = [], planets = []; const lit = CFG.UNIVERSES.filter(u => !u.empty), empty = CFG.UNIVERSES.filter(u => u.empty); - CFG.UNIVERSES.forEach((u, i) => { - const ei = empty.indexOf(u); - const L = Object.assign({}, CFG.EMPTY_LOOK, CFG.LOOKS[u.no] || {}); - if (!CFG.LOOKS[u.no]) L.orbit = [R * (0.8 + 0.12 * (ei % 2)), ei % ARMS]; // 空槽放在外圈,按顺序分到各条旋臂 - const [r, arm] = L.orbit || [R * 0.85, i % ARMS]; - const a = r ? armAngle(r, arm) + (u.empty ? 0.32 * Math.floor(ei / ARMS) : 0) : 0; - const g = new THREE.Group(); g.position.set(Math.cos(a) * r, 0, Math.sin(a) * r); scene.add(g); + // 位置和补给线由 layout.js 算(写死的 / 空槽按编号 / 新点亮的自动排位,规则见那个文件开头) + const LAY = layoutSystems(CFG), byNo = new Map(); + LAY.forEach((ly, i) => { + const u = ly.u, L = ly.look; + const g = new THREE.Group(); g.position.set(ly.x, 0, ly.z); scene.add(g); const p = makePlanet(THREE, Object.assign({ seed: i * 7.3 + 1 }, L)); g.add(p.group); planets.push(p); const moons = (L.moons || []).map((m, k) => { const piv = new THREE.Group(); piv.rotation.x = 0.35 - k * 0.2; piv.rotation.y = k * 2.1; g.add(piv); const mp = makePlanet(THREE, Object.assign({ seed: i * 13 + k * 3.1, spin: 0.4 }, m)); mp.group.position.x = m.d; piv.add(mp.group); planets.push(mp); return { piv, speed: Math.abs(m.speed || 0.3) }; }); // 卫星一律同一个方向转(和星系自转同向) const tag = document.createElement('button'); tag.type = 'button'; tag.className = 'tag' + (u.empty ? ' empty' : ''); tag.style.setProperty('--c', L.accent || C.ui); - tag.innerHTML = '' + (u.empty ? '空槽' : u.name) + '' + u.no + (u.empty ? ' · 未点亮' : ' · ' + u.kind) + ''; + tag.innerHTML = '' + esc(u.empty ? '空槽' : u.name) + '' + esc(u.no) + (u.empty ? ' · 未点亮' : ' · ' + esc(u.kind)) + ''; labels.appendChild(tag); - const s = { u, L, g, planet: p, moons, tag }; p.body.userData.s = s; systems.push(s); + const s = { u, L, g, planet: p, moons, tag, parent: ly.parent }; p.body.userData.s = s; systems.push(s); byNo.set(u.no, s); tag.addEventListener('click', () => fly(s)); }); - // 补给线:核心 → 每个星系,虚线往外流 + // 补给线:从「上一站」(核心或更靠里的那颗星)连过来,虚线往外流;空槽的线很淡 const supply = []; - for (const s of systems) { if (s.u.no === '0000') continue; - const b = s.g.position.clone(), mid = b.clone().multiplyScalar(0.5); mid.y += b.length() * 0.12; - const l = new THREE.Line(new THREE.BufferGeometry().setFromPoints(new THREE.QuadraticBezierCurve3(new THREE.Vector3(), mid, b).getPoints(80)), + for (const s of systems) { if (s.u.no === '0000' || !s.g.position.lengthSq()) continue; + const a = s.parent && byNo.has(s.parent) ? byNo.get(s.parent).g.position.clone() : new THREE.Vector3(); + const b = s.g.position.clone(), mid = a.clone().add(b).multiplyScalar(0.5); mid.y += a.distanceTo(b) * 0.12; + const l = new THREE.Line(new THREE.BufferGeometry().setFromPoints(new THREE.QuadraticBezierCurve3(a, mid, b).getPoints(80)), new THREE.LineDashedMaterial({ color: s.u.empty ? lineCol : new THREE.Color(C.ui), dashSize: 0.9, gapSize: 0.8, transparent: true, opacity: s.u.empty ? 0.14 : 0.42, depthWrite: false })); l.computeLineDistances(); l.userData.op = l.material.opacity; scene.add(l); supply.push(l); } // 散落的无名星球(只是让星系看起来有人住;不进档案、不能点) @@ -225,10 +227,9 @@ export function mountGalaxy(el) { for (const s of systems) { s.g.getWorldPosition(tmp).project(camera); const d = Math.hypot((tmp.x - ptr.x) * r.width / 2, (tmp.y - ptr.y) * r.height / 2); if (d < bd && tmp.z < 1) { bd = d; best = s; } } return best; } - const esc = x => String(x || '').replace(/[&<>"]/g, c => ({ '&': '&', '<': '<', '>': '>', '"': '"' }[c])); function card(s) { const u = s.u, nav = ''; - if (u.empty) return '
UNIVERSE ' + u.no + ' · 未点亮

空槽

这条世界线还没写出来,星系还没被点亮。
' + nav + '
'; - return '
UNIVERSE ' + u.no + ' · ' + esc(u.kind) + ' · 已点亮

' + esc(u.name) + '

' + esc(u.tag) + '
' + + if (u.empty) return '
UNIVERSE ' + esc(u.no) + ' · 未点亮

空槽

这条世界线还没写出来,星系还没被点亮。
' + nav + '
'; + return '
UNIVERSE ' + esc(u.no) + ' · ' + esc(u.kind) + ' · 已点亮

' + esc(u.name) + '

' + esc(u.tag) + '
' + '

' + esc(u.desc) + '

' + (u.tags || []).map(t => '' + esc(t) + '').join('') + '
' + nav + '
'; } panel && panel.addEventListener('click', e => { const b = e.target.closest('[data-s]'); if (b) step(+b.dataset.s); if (e.target.closest('[data-home]')) home(); }); function step(d) { const i = systems.indexOf(focus); fly(systems[(i + d + systems.length) % systems.length]); } diff --git a/portal/assets/universe/layout.js b/portal/assets/universe/layout.js new file mode 100644 index 0000000..04782c9 --- /dev/null +++ b/portal/assets/universe/layout.js @@ -0,0 +1,128 @@ +/* ============================================================================= + * 金钻宇宙 · 星系图排布(layout.js)—— 纯计算,不依赖 three.js,可以单独测试 + * ----------------------------------------------------------------------------- + * 决定每条世界线的星球放在哪、补给线从哪连过来。规则(2026-10-05): + * + * 1. 在 LOOKS 里写了 orbit: [离核心多远, 第几条旋臂] 的 —— 就放在那儿,补给线从核心连过去。(现在的 0000–0004) + * 2. 空槽(empty: true)—— 按**编号**放在外圈的固定槽位(从 GALAXY.firstSlot 号起,轮流分到各条旋臂)。 + * 只看自己的编号,点亮其中一个,别的空槽不会挪。空槽的淡虚线接到离它最近、又不穿过别的星的那颗已点亮的星 + * (没有就接核心)—— 这条淡线会随着新点亮的星「找到更近的落脚点」,空槽本身不动。 + * 3. 已点亮、但没写 orbit 的(内容后台里「点亮一条」新加的)—— **自动排位**: + * · 在中圈的旋臂上挑一个位置:跟核心、已有星系(连同它的卫星轨道)都留足距离,尽量让各条旋臂均匀; + * · 补给线连到「比它更靠近核心、又离它最近」的那颗星(没有合适的就连核心), + * 而且这条线不能从别的星系中间穿过; + * · 按编号从小到大一颗一颗排,每一颗只看排在它前面的 —— 所以**新加一条,已有的星和线都不动**。 + * + * 用法:import { layoutSystems } from './layout.js'; + * const L = layoutSystems(window.JZ_UNIVERSE) → [{ u, look, x, z, kind, parent }] + * kind = 'pinned' | 'slot' | 'auto';parent = 补给线起点的编号,null = 核心 + * ============================================================================= */ + +export const armAngle = (r, arm, G) => arm * Math.PI * 2 / G.arms + r * G.twist; + +/** 一个星系「占的地方」半径:星球本身 + 最外面那颗卫星的轨道 */ +export function footprint(look) { + const moons = (look.moons || []).map(m => (m.d || 0) + (m.r || 0)); + return (look.r || 1) * 2.2 + (moons.length ? Math.max(...moons) : 0); +} + +const dist = (a, b) => Math.hypot(a.x - b.x, a.z - b.z); +/** 点到线段的距离(补给线按直线近似;实际画的是稍微拱起来的弧,水平投影还是这条线) */ +function segDist(p, a, b) { + const vx = b.x - a.x, vz = b.z - a.z, L2 = vx * vx + vz * vz || 1; + const t = Math.max(0, Math.min(1, ((p.x - a.x) * vx + (p.z - a.z) * vz) / L2)); + return Math.hypot(p.x - (a.x + vx * t), p.z - (a.z + vz * t)); +} + +export function layoutSystems(CFG) { + const G = CFG.GALAXY, R = G.radius, ARMS = G.arms, first = G.firstSlot ?? 5; + const LOOKS = CFG.LOOKS || {}; + const lookOf = u => Object.assign({}, CFG.EMPTY_LOOK, LOOKS[u.no] || {}); + const num = u => parseInt(u.no, 10) || 0; + const list = [...CFG.UNIVERSES].sort((a, b) => num(a) - num(b)); + const CORE = { x: 0, z: 0, fp: 12, no: null }; + const out = new Map(); + const put = (u, look, r, a, kind, parent) => { + const s = { u, look, x: Math.cos(a) * r, z: Math.sin(a) * r, r, kind, parent, fp: footprint(look), no: u.no }; + out.set(u.no, s); return s; + }; + + // 1) 写死位置的 + for (const u of list) { + const o = (LOOKS[u.no] || {}).orbit; + if (!o) continue; + const [r, arm] = o; + put(u, lookOf(u), r, r ? armAngle(r, arm, G) : 0, 'pinned', null); + } + // 2) 空槽:按编号固定在外圈 + for (const u of list) { + if (!u.empty || out.has(u.no)) continue; + const e = Math.max(0, num(u) - first); + const r = R * (0.8 + 0.12 * (e % 2)); + put(u, lookOf(u), r, armAngle(r, e % ARMS, G) + 0.32 * Math.floor(e / ARMS), 'slot', null); + } + // 3) 自动排位:只避开「核心 + 写死的 + 排在前面的自动星」(空槽在外圈,自动星只用中圈,互不影响) + const placed = [...out.values()].filter(s => s.kind === 'pinned' && s.r > 0); + const armCount = new Array(ARMS).fill(0); + for (const s of placed) { + const a = Math.atan2(s.z, s.x); + let best = 0, bd = Infinity; + for (let k = 0; k < ARMS; k++) { const d = Math.abs(Math.atan2(Math.sin(a - armAngle(s.r, k, G)), Math.cos(a - armAngle(s.r, k, G)))); if (d < bd) { bd = d; best = k; } } + armCount[best]++; + } + const rMin = 16, rMax = R * 0.68, mid = R * 0.5; // 自动星只用中圈:外圈(0.8R 往外)留给空槽,两圈之间留出空隙 + + // 给一个候选位置挑补给线起点:比它更靠近核心的星(或核心),线不能穿过别的星系 + function parentFor(c, others) { + const cands = [CORE, ...others.filter(o => Math.hypot(o.x, o.z) < c.r - 4)]; + let best = null; + for (const p of cands) { + const len = dist(p, c); + let clear = Infinity; + for (const o of others) { if (o === p) continue; clear = Math.min(clear, segDist(o, p, c) - o.fp); } + if (clear < 1.5) continue; + // 同样不穿的情况下挑短的;连核心稍微加一点「距离」,让新星更愿意接在附近的星上,连线成网而不是全扎向中心 + const score = len + (p === CORE ? 6 : 0); + if (!best || score < best.score) best = { p, score, clear }; + } + return best; + } + + for (const u of list) { + if (u.empty || out.has(u.no)) continue; + const look = lookOf(u), fp = footprint(look); + let best = null; + for (let arm = 0; arm < ARMS; arm++) { + for (let r = rMin; r <= rMax; r += 1.25) { + for (const off of [-0.2, -0.1, 0, 0.1, 0.2]) { + const a = armAngle(r, arm, G) + off; + const c = { x: Math.cos(a) * r, z: Math.sin(a) * r, r }; + let clear = r - CORE.fp - fp; + for (const o of placed) clear = Math.min(clear, dist(o, c) - o.fp - fp); + if (clear < 4) continue; + const par = parentFor(c, placed); + if (!par) continue; + // 分数:够宽敞(封顶,不为了宽敞跑到边上)、靠近中圈、所在旋臂人少、在旋臂正中更好 + const score = Math.min(clear, 12) - 0.08 * Math.abs(r - mid) - 2.2 * armCount[arm] - 3 * Math.abs(off) + Math.min(par.clear, 6) * 0.3; + if (!best || score > best.score + 1e-9) best = { score, r, a, arm, parent: par.p }; + } + } + } + if (!best) { // 实在挤不下(几十条以后):退回外圈槽位,至少不叠在别人身上 + const e = Math.max(0, num(u) - first), r = R * 0.86; + put(u, look, r, armAngle(r, e % ARMS, G) + 0.32 * Math.floor(e / ARMS) + 0.16, 'auto', null); + continue; + } + const s = put(u, look, best.r, best.a, 'auto', best.parent.no); + armCount[best.arm]++; + placed.push(s); + } + // 4) 空槽的淡线:接到最近的、不穿星的已点亮星(或核心) + const litNow = [...out.values()].filter(s => !s.u.empty && s.r > 0); + for (const s of out.values()) { + if (s.kind !== 'slot') continue; + const par = parentFor(s, litNow); + s.parent = par && par.p !== CORE ? par.p.no : null; + } + return list.map(u => out.get(u.no)); +} diff --git a/portal/assets/universe/planets.js b/portal/assets/universe/planets.js index 02fc573..b5f6c13 100644 --- a/portal/assets/universe/planets.js +++ b/portal/assets/universe/planets.js @@ -147,6 +147,129 @@ const STYLES = { base = mix(base, uC2, cr); base = mix(base, uC3, aline(snoise(vP*5.0 + uSeed*2.0) - 0.42, 1.5)*0.7); gl_FragColor = vec4(shade(base, N, V), uAlpha); }`, }, + /* ===== 2026-10-05 加的预设(游戏美术里最常见的几类卡通星球;画法同上:三档明暗 + 墨线 + 轮廓光) ===== */ + /* 类地(卡通地球):蓝海 + 绿色大陆 + 沙漠块 + 极冠 + 慢慢飘的白云,海岸一圈墨线 */ + earth: { + defaults: { colors: ['#3E8EDB', '#5DBB63', '#E8C77A', '#FFFFFF'], shadow: '#4A55A0', rim: '#BFE6FF', outline: '#14284A', glow: 0 }, + frag: `void main(){ vec3 V = normalize(cameraPosition - vW); vec3 N = normalize(vN); + float h = fbm(vP*1.5 + uSeed) + 0.22*snoise(vP*4.0 + uSeed); + float land = smoothstep(0.03, 0.05, h), shallow = smoothstep(-0.14, 0.03, h)*(1.0 - land); + vec3 water = mix(uC0, mix(uC0, vec3(1.0), 0.32), shallow); + float dry = smoothstep(0.1, 0.35, snoise(vP*2.2 + uSeed + 5.0)) * (1.0 - smoothstep(0.45, 0.75, abs(vP.y))); + vec3 base = mix(water, mix(uC1, uC2, dry*0.85), land); + base = mix(base, uC3, smoothstep(0.80, 0.84, abs(vP.y) + 0.06*snoise(vP*5.0))); + vec3 c = shade(base, N, V); + c = mix(c, uC1*0.35, aline(h - 0.04, 1.2)*0.7); + float cl = smoothstep(0.32, 0.38, fbm(vP*2.2 + vec3(uT*0.015, 9.0, uSeed))); + float lit = smoothstep(-0.1, 0.12, dot(N, normalize(uL))); + c = mix(c, mix(uC3*0.72, uC3, lit), cl*0.85); + gl_FragColor = vec4(c, uAlpha); }`, + }, + /* 海洋:几乎全是水,深浅两色 + 零星小岛 + 一圈圈浪线 + 条状云 */ + ocean: { + defaults: { colors: ['#1F5FB8', '#3FB5E6', '#F2D49B', '#FFFFFF'], shadow: '#3A4A9A', rim: '#B8EEFF', outline: '#0F2148', glow: 0 }, + frag: `void main(){ vec3 V = normalize(cameraPosition - vW); vec3 N = normalize(vN); + float h = fbm(vP*1.8 + uSeed); + float isl = smoothstep(0.40, 0.43, h); + vec3 base = mix(mix(uC0, uC1, smoothstep(0.05, 0.38, h)), uC2, isl); + vec3 c = shade(base, N, V); + c = mix(c, uC3, aline(h - 0.34 - 0.02*sin(uT*0.8), 1.2)*0.6*(1.0 - isl)); + float st = smoothstep(0.30, 0.36, snoise(vec3(vP.x*1.4, vP.y*6.0, vP.z*1.4) + vec3(uSeed, 0.0, uT*0.01))); + c = mix(c, uC3, st*0.8*smoothstep(-0.2, 0.2, dot(N, normalize(uL))) + st*0.15); + gl_FragColor = vec4(c, uAlpha); }`, + }, + /* 丛林:深浅两层绿 + 一团团树冠 + 弯弯的河 + 飘着的雾 */ + jungle: { + defaults: { colors: ['#2F7D4A', '#6CC46A', '#3FA7D6', '#E9F7E4'], shadow: '#355A6E', rim: '#CFFFD8', outline: '#11301E', glow: 0 }, + frag: `void main(){ vec3 V = normalize(cameraPosition - vW); vec3 N = normalize(vN); + float n = fbm(vP*2.4 + uSeed); + vec3 base = mix(uC0, uC1, smoothstep(-0.1, 0.35, n)); + base = mix(base, uC1*1.12, smoothstep(0.5, 0.56, snoise(vP*4.0 + uSeed))*0.5); + float rv = fbm(vP*1.1 + uSeed*1.3); + base = mix(base, uC2, aline(rv, 1.5)*smoothstep(0.75, 0.3, abs(vP.y))*0.9); + vec3 c = shade(base, N, V); + c = mix(c, uC3, smoothstep(0.35, 0.5, fbm(vP*1.6 + vec3(0.0, uT*0.015, 20.0)))*0.5); + gl_FragColor = vec4(c, uAlpha); }`, + }, + /* 荒漠:弯曲的沙丘条纹 + 红色台地(带墨线轮廓)+ 一点点极冠 */ + desert: { + defaults: { colors: ['#F2C38B', '#E09A5A', '#B5623E', '#FFF4E2'], shadow: '#8A5A7A', rim: '#FFE2BF', outline: '#3A1E24', glow: 0 }, + frag: `void main(){ vec3 V = normalize(cameraPosition - vW); vec3 N = normalize(vN); + float b = 0.5 + 0.5*sin((vP.y*6.0 + 1.2*fbm(vP*1.8 + uSeed))*3.14159); + vec3 base = mix(uC0, uC1, smoothstep(0.35, 0.65, b)); + float m = snoise(vP*3.0 + uSeed + 3.0); + base = mix(base, uC2, smoothstep(0.42, 0.46, m)); + base = mix(base, uC3, smoothstep(0.86, 0.9, abs(vP.y))); + vec3 c = shade(base, N, V); + c = mix(c, uC2*0.6, aline(m - 0.44, 1.2)*0.7); + gl_FragColor = vec4(c, uAlpha); }`, + }, + /* 冻原:霜白和青灰 + 一片片深色针叶林 + 结冰的湖 */ + tundra: { + defaults: { colors: ['#E9F3F2', '#9CC9C1', '#4E7F7A', '#BFE8FF'], shadow: '#6A7FA8', rim: '#E4FBFF', outline: '#173233', glow: 0 }, + frag: `void main(){ vec3 V = normalize(cameraPosition - vW); vec3 N = normalize(vN); + vec3 base = mix(uC0, uC1, smoothstep(0.0, 0.4, fbm(vP*2.0 + uSeed))); + base = mix(base, uC2, smoothstep(0.5, 0.56, snoise(vP*5.5 + uSeed))*smoothstep(0.75, 0.4, abs(vP.y))); + float lk = snoise(vP*3.0 + uSeed + 9.0); + base = mix(base, uC3, smoothstep(0.62, 0.66, lk)); + vec3 c = shade(base, N, V); + c = mix(c, uC2, aline(lk - 0.64, 1.2)*0.6); + c += uC3 * pow(max(dot(reflect(-normalize(uL), N), V), 0.0), 30.0) * 0.35; + gl_FragColor = vec4(c, uAlpha); }`, + }, + /* 熔岩:深色岩壳 + 发光的裂缝和岩浆池(慢慢呼吸) */ + lava: { + defaults: { colors: ['#2A1E2E', '#4A3340', '#FF7A2F', '#FFD36E'], shadow: '#3A2A4A', rim: '#FF9A5A', outline: '#120A14', glow: 0.9 }, + frag: `void main(){ vec3 V = normalize(cameraPosition - vW); vec3 N = normalize(vN); + float n = snoise(vP*3.0 + uSeed), n2 = snoise(vP*7.0 + uSeed*2.0); + float crack = max(1.0 - smoothstep(0.0, 0.07, abs(n)), (1.0 - smoothstep(0.0, 0.045, abs(n2)))*0.7); + float pool = smoothstep(0.5, 0.55, fbm(vP*1.6 + uSeed + 4.0)); + vec3 c = shade(mix(uC0, uC1, smoothstep(-0.3, 0.4, fbm(vP*2.5 + uSeed))), N, V); + vec3 hot = mix(uC2, uC3, 0.35 + 0.25*sin(uT*1.4 + n*6.0)); + c = mix(c, hot, max(crack, pool)*uGlow); + gl_FragColor = vec4(c, uAlpha); }`, + }, + /* 毒雾:酸绿和黄绿的扭曲气流 + 一点紫色 + 冒泡的亮点 */ + toxic: { + defaults: { colors: ['#B8E04A', '#6FBF3A', '#5B3F8C', '#F4FF9E'], shadow: '#4E3F7A', rim: '#E6FF9A', outline: '#1A1A2E', glow: 0.5 }, + frag: `void main(){ vec3 V = normalize(cameraPosition - vW); vec3 N = normalize(vN); + float w = fbm(vP*2.0 + vec3(uT*0.02, 0.0, uSeed)); + float w2 = fbm(vP*2.0 + w*1.6 + uSeed); + vec3 base = mix(uC0, uC1, smoothstep(-0.2, 0.3, w2)); + base = mix(base, uC2, smoothstep(0.35, 0.5, w2)*0.6); + vec3 c = shade(base, N, V); + vec3 cell = floor(vP*28.0); + float bub = step(0.94, fract(sin(dot(cell, vec3(12.9898, 78.233, 37.719)) + uSeed)*43758.5453)); + c += uC3 * bub * (0.5 + 0.5*sin(uT*2.0 + cell.x)) * 0.4 * uGlow; + gl_FragColor = vec4(c, uAlpha); }`, + }, + /* 荒芜岩球(像月球):灰色岩面 + 大小两层陨坑,坑沿一圈墨线、坑底更暗 */ + barren: { + defaults: { colors: ['#C9C6CF', '#9F9AA8', '#6E6878', '#ECEAF2'], shadow: '#5F5A78', rim: '#E6E2FF', outline: '#1C1A26', glow: 0 }, + frag: `void main(){ vec3 V = normalize(cameraPosition - vW); vec3 N = normalize(vN); + vec3 base = mix(uC0, uC1, smoothstep(-0.2, 0.35, fbm(vP*2.2 + uSeed))); + float a = snoise(vP*3.6 + uSeed), b = snoise(vP*9.0 + uSeed*3.0); + base = mix(base, uC2, smoothstep(0.46, 0.56, a)); + base = mix(base, uC2, smoothstep(0.58, 0.66, b)*0.8); + vec3 c = shade(base, N, V); + c = mix(c, uC3, max(aline(a - 0.46, 1.4), aline(b - 0.58, 1.1)*0.6)*0.55*smoothstep(-0.2, 0.3, dot(N, normalize(uL)))); + c = mix(c, uC2*0.6, max(aline(a - 0.47, 1.0), aline(b - 0.59, 0.8)*0.5)*0.5); + gl_FragColor = vec4(c, uAlpha); }`, + }, + /* 冰巨星(像海王星):蓝色细条纹 + 一个深色风暴眼 + 几道白色流云 */ + icegiant: { + defaults: { colors: ['#8FD3FF', '#4E8FE8', '#2B3F9E', '#FFFFFF'], shadow: '#3C4C9E', rim: '#CFF0FF', outline: '#101C48', glow: 0 }, + frag: `void main(){ vec3 V = normalize(cameraPosition - vW); vec3 N = normalize(vN); + float w = vP.y*7.0 + 0.35*snoise(vec3(vP.x*2.0, vP.y*5.0, vP.z*2.0) + uSeed); + float b = 0.5 + 0.5*sin(w*3.14159); + vec3 base = mix(uC0, uC1, smoothstep(0.35, 0.65, b)); + float spot = 1.0 - smoothstep(0.1, 0.15, length((vP - normalize(vec3(0.7, -0.3, 0.62)))*vec3(1.0, 1.7, 1.0))); + base = mix(base, uC2, spot*0.9); + vec3 c = shade(base, N, V); + float streak = smoothstep(0.55, 0.62, snoise(vec3(vP.x*1.2, vP.y*14.0, vP.z*1.2) + vec3(uT*0.02, 0.0, uSeed))); + c = mix(c, uC3, streak*0.75); + gl_FragColor = vec4(c, uAlpha); }`, + }, /* 未点亮:半透明全息线框球 —— 空槽 */ ghost: { transparent: true, @@ -159,7 +282,21 @@ const STYLES = { }, }; +/* 带环巨星:气态巨星 + 一圈卡通扁环(光环默认不加,只有这个预设自带;颜色压低,不发光) */ +STYLES.ringed = { + defaults: { colors: ['#F4E1B8', '#D9A26C', '#9C6B9E', '#FFF6DE'], shadow: '#7A6A9E', rim: '#FFE9C4', outline: '#241A36', glow: 0, + ring: { inner: 1.45, outer: 2.05, color: '#F2E3C2', color2: '#C99E72' }, tilt: 0.42 }, + frag: STYLES.gas.frag, +}; + export const STYLE_NAMES = Object.keys(STYLES); +/* 每种风格的中文名(内容后台的下拉、交接文档都用这一份) */ +export const STYLE_LABELS = { + crystal: '晶体', paper: '铅笔纸面', ice: '冰封', neon: '霓虹城', duality: '善恶两半', + earth: '类地(卡通地球)', ocean: '海洋', jungle: '丛林', desert: '荒漠', tundra: '冻原', + lava: '熔岩', toxic: '毒雾', barren: '荒芜岩球', gas: '气态巨星', icegiant: '冰巨星', ringed: '带环巨星', + rock: '小行星', ghost: '未点亮(空槽)', +}; /** * 造一颗卡通星球。look 里能写: @@ -210,7 +347,7 @@ export function makePlanet(THREE, look = {}) { vertexShader: `varying vec3 vP; void main(){ vP = position; gl_Position = projectionMatrix*modelViewMatrix*vec4(position,1.0); }`, fragmentShader: `uniform vec3 uA; uniform vec3 uB; uniform float uIn; uniform float uOut; varying vec3 vP; void main(){ float t = (length(vP.xy)-uIn)/(uOut-uIn); float b = step(0.5, fract(t*5.0)); - float a = (0.55 + 0.25*b) * smoothstep(0.0, 0.06, t) * smoothstep(1.0, 0.94, t); gl_FragColor = vec4(mix(uA, uB, b*0.6 + t*0.3), a); }` })); + float a = (0.42 + 0.2*b) * smoothstep(0.0, 0.06, t) * smoothstep(1.0, 0.94, t); gl_FragColor = vec4(mix(uA, uB, b*0.6 + t*0.3), a); }` })); ring.rotation.x = -Math.PI / 2 + 0.38; ring.rotation.y = 0.12; group.add(ring); } const spin = o.spin ?? 0.15; diff --git a/portal/assets/universe/交接说明.md b/portal/assets/universe/交接说明.md index 9ccfe94..d1e54a6 100644 --- a/portal/assets/universe/交接说明.md +++ b/portal/assets/universe/交接说明.md @@ -23,6 +23,13 @@ ## 2. 常见改动 ### 加一条新世界线 + +> **2026-10-05 起推荐用内容后台**(门户顶栏最右边的铅笔 →「金钻宇宙」→「点亮一条」):填档案、下拉选外观,预览、发布就上线。 +> 后台发布的内容写在 `portal/content/site.js`(`window.JZ_CONTENT.universe`),`config.js` 末尾会用它**覆盖**下面写死的 +> `UNIVERSES` / `LOOKS`;`config.js` 里那两份只是兜底(内容文件读不到时用)。`GALAXY`、`EMPTY_LOOK` 不归后台管,还是改这个文件。 +> +> 不用后台、直接改文件的话(比如本地调试): + 1. `config.js` → `UNIVERSES` 里把对应的空槽(比如 `{ no: '0005', empty: true }`)换成完整档案: ```js { no: '0005', name: '名字', kind: '原创', tag: '一句话副标题', tags: ['标签1', '标签2'], desc: '档案正文' }, @@ -37,8 +44,17 @@ moons: [{ style: 'rock', r: 0.3, d: 2.6, speed: 0.5 }], // 可选:卫星(纯装饰) why: '为什么长这样(写给后来的人看)' }, ``` - - `orbit: [离中心距离, 第几条旋臂]`:距离 0~60,旋臂 0~3。别和别的星系放太近(差 8 以上比较好看)。 + - `orbit: [离中心距离, 第几条旋臂]`:距离 0~60,旋臂 0~3。**可以不写** —— 不写就交给 `layout.js` 自动排位(见下)。 - 不写 `LOOKS` 的世界线会自动用 `EMPTY_LOOK`(全息线框的「未点亮」样子),放在外圈。 + +### 位置和补给线是怎么排的(`layout.js`,纯计算,可单独测试) +1. **写了 `orbit` 的**(现在的 0000–0004):就放在那儿,补给线从核心连过去。 +2. **空槽**:按**编号**放在外圈固定槽位(从 `GALAXY.firstSlot` 号起,轮流分到各条旋臂)。只看自己的编号,点亮一个,别的空槽不挪。 + 空槽的淡虚线接到离它最近、又不穿过别的星的那颗已点亮的星(没有就接核心)。 +3. **已点亮但没写 `orbit` 的**(后台新点亮的):自动在中圈的旋臂上挑位置 —— 跟核心、已有星系(连同卫星轨道)留足距离, + 各条旋臂尽量均匀;补给线接到「比它更靠近核心、离它最近」的那颗星,而且不能从别的星中间穿过。 + 按编号从小到大一颗颗排,每颗只看排在前面的,所以**新加一条,已有的星和线都不动**。 + 实测:连续点亮 10 条,已有的一次都没动,两两不挤,线不穿星。 3. 刷新页面即可。HUD 上的「世界线 / 已点亮 / 空槽」数字是自动数的。 ### 只换一颗星球的颜色 @@ -54,18 +70,30 @@ --- -## 3. 现有的星球风格(`planets.js` → `STYLES`) +## 3. 现有的星球风格(`planets.js` → `STYLES`,中文名在 `STYLE_LABELS`) -| 风格 | 长什么样 | 四个颜色依次是 | 现在给谁用 / 为什么 | -|---|---|---|---| -| `crystal` | 多面体切面、每面颜色随朝向变、内部发光脉络 | 主色 / 副色 / 高光色 / 闪点 | 零号宇宙:晶钻超算本体 | -| `paper` | 米白纸面、铅笔等高线、暗面排线、红笔圈、淡蓝涂色 | 纸色 / 铅笔色 / 红笔色 / 涂色 | 火柴人宇宙:小时候课上画的 | -| `ice` | 纬向冰带、极冠、冰裂纹、冰面高光 | 冰白 / 冰蓝 / 裂纹色 / 极冠色 | 极寒世界:冰河期、-50℃ | -| `neon` | 深紫地表、霓虹街区网格、闪烁窗灯 | 地表 / 霓虹 A / 霓虹 B / 窗灯 | 没落赛博城 | -| `duality` | 一半白昼一半夜空,交界一条发光波浪线 | 白昼 / 云 / 夜空 / 夜云 | 善恶等级(设定还在酝酿,先按名字做;定了再换) | -| `gas` | 卡通条纹气态行星 + 风暴眼 | 条纹 A / 条纹 B / 深色带 / 风暴 | 散落的无名星球、卫星 | -| `rock` | 卡通陨坑岩石星 | 亮面 / 暗面 / 坑底 / 坑沿 | 散落的无名星球、卫星 | -| `ghost` | 半透明全息线框球 | 线色 / 边缘色 / - / - | 空槽(未点亮) | +内容后台「金钻宇宙」页的「星球风格」下拉、「外观预设」一览都来自这里(一览里是真实渲染)。2026-10-05 加了带「新」的 10 种。 + +| 风格 | 长什么样 | 现在给谁用 | +|---|---|---| +| `earth` 新 · 类地(卡通地球) | 蓝海 + 绿色大陆 + 沙漠块 + 极冠 + 慢慢飘的白云,海岸一圈墨线 | 后台新点亮的默认 | +| `ocean` 新 · 海洋 | 几乎全是水,深浅两色 + 零星小岛 + 岛边浪线 + 条状云 | — | +| `jungle` 新 · 丛林 | 深浅两层绿 + 一团团树冠 + 弯弯的河 + 雾 | — | +| `desert` 新 · 荒漠 | 弯曲沙丘条纹 + 红色台地(墨线轮廓)+ 一点极冠 | — | +| `tundra` 新 · 冻原 | 霜白和青灰 + 深色针叶林 + 结冰的湖 | — | +| `ice` · 冰封 | 纬向冰带、极冠、冰裂纹、冰面高光 | 极寒世界 | +| `lava` 新 · 熔岩 | 深色岩壳 + 发光裂缝和岩浆池(慢慢呼吸) | — | +| `toxic` 新 · 毒雾 | 酸绿 / 黄绿扭曲气流 + 一点紫 + 冒泡亮点 | — | +| `barren` 新 · 荒芜岩球 | 灰色岩面 + 大小两层陨坑(坑沿墨线、坑底更暗) | — | +| `gas` · 气态巨星 | 卡通条纹 + 风暴眼 | 散落的无名星球、卫星 | +| `icegiant` 新 · 冰巨星 | 蓝色细条纹 + 深色风暴眼 + 白色流云 | — | +| `ringed` 新 · 带环巨星 | 气态巨星 + 一圈压低颜色的卡通扁环(**只有这个预设自带光环**) | — | +| `crystal` · 晶体 | 多面体切面、每面颜色随朝向变、内部发光脉络 | 零号宇宙 | +| `paper` · 铅笔纸面 | 米白纸面、铅笔等高线、暗面排线、红笔圈 | 火柴人宇宙 | +| `neon` · 霓虹城 | 深紫地表、霓虹街区网格、闪烁窗灯 | 没落赛博城 | +| `duality` · 善恶两半 | 一半白昼一半夜空,交界发光波浪线 | 善恶等级 | +| `rock` · 小行星 | 卡通陨坑岩石 | 卫星、散落星球 | +| `ghost` · 未点亮 | 半透明全息线框球 | 空槽 | 所有风格共用:三档卡通明暗(亮 / 中 / 暗)+ 冷色阴影(`shadow`)+ 很弱的轮廓光(`rim`)+ 墨线描边(`outline`,写 `null` 不描边)。 大气辉光(`atm`)和光环(`ring`)都是**可选**的,默认关 —— 用户反馈过「罩子」「环」很突兀、辉光太曝。 diff --git a/portal/content/site.js b/portal/content/site.js new file mode 100644 index 0000000..45e196f --- /dev/null +++ b/portal/content/site.js @@ -0,0 +1,2 @@ +/* 内容文件:由内容后台发布时生成(这是第一版:从网站原有内容导入)。别手改:下次发布会被覆盖。改内容请用内容后台。 */ +window.JZ_CONTENT = {"v":1,"hero":{"tagline":"金钻的画、做的小工具、写的宇宙设定,还有各个平台的主页,都放在这儿了。随便逛逛。","cta1":"逛画展","cta2":"金钻宇宙","notice":{"on":false,"text":"","from":"","to":""}},"boards":{"home":"整个网站的大框架与内容总入口:板块总览、快捷切换。","gallery":"金钻一路画下的画稿、渲染影像与特殊图片,随年份安静地排在一起,可自由翻看。","apps":"开源的项目与闭源的工具分两行列出,并可按类型筛选。","universe":"金钻编的平行世界,每一条是一个星系:点星系飞过去,看那条世界线的设定。","links":"视频、图文、模型创作、开源、小店与邮箱;这些地方也能找到金钻。","about":"网站制作者与所用开源组件鸣谢:金钻(内容 / 创作者)、苏达与大肥鱼(构建),以及 Lucide 图标库、OPPO Sans 字体。"},"gallery":[{"id":"g1","type":"image","date":"2024-02-29","title":"(作品占位)","desc":"素材已在交付版脱敏移除","owner":"own","hidden":false,"src":"exhibition/渲染与动画/20240229/没有图片.webp","r":1.5241}],"media":{"exhibition/渲染与动画/20240229/没有图片.webp":{"r":1.5241}},"apps":[{"id":"a1","name":"待会儿办","en":"DO IT LATER","type":"网页应用","oss":true,"desc":"家庭共用的待办 / 提醒小应用:发布端一次录入,接收端点一下完成,两边实时同步;安卓端与网页面同源。","ver":"v0.1","size":"—","status":"待上架","url":"","repo":"https://github.com/example-org/family-todo"},{"id":"a2","name":"Juno 简中语言包","en":"JUNO ZH-CN","type":"游戏汉化","oss":true,"desc":"《Juno: New Origins》非官方简体中文语言包:9,271 条全量译文 + 配套字体 + 可复现的校验工具链。译文由 DeepSeek 生成,仅对该游戏版本做过测试。","ver":"1.4.105.0c","size":"9.4 MB","status":"开源仓库","url":"https://github.com/example-org/juno-zh-cn","repo":"","btn":"前往仓库 →"},{"id":"a3","name":"自助模板渲染","en":"TEMPLATE RENDER","type":"渲染出图","oss":false,"desc":"传皮肤、挑模板,渲染出成品大图(标准压缩 + 无压缩)。支持卡密下单与在线支付,下完自动排队出图。","ver":"v1","size":"—","status":"在线","url":"/order/","repo":"","web":true}],"linkGroups":[{"id":"video","name":"视频","en":"VIDEO"},{"id":"feed","name":"图文","en":"FEED"},{"id":"create","name":"模型 / 创作","en":"CREATE"},{"id":"oss","name":"开源","en":"OPEN SOURCE"},{"id":"used","name":"小店","en":"SHOP"},{"id":"contact","name":"联系 / 其他","en":"CONTACT"}],"links":[{"id":"bili","group":"video","key":"bili","name":"哔哩哔哩","en":"BILIBILI","desc":"长视频","url":"https://example.com/space"},{"id":"douyin","group":"video","key":"douyin","name":"抖音","en":"DOUYIN","desc":"短视频","url":"https://example.com/douyin"},{"id":"kuaishou","group":"video","key":"kuaishou","name":"快手","en":"KUAISHOU","desc":"短视频","url":"https://example.com/kuaishoutw"},{"id":"xiaohongshu","group":"feed","key":"xiaohongshu","name":"小红书","en":"REDNOTE","desc":"图文 · 记录","url":"https://example.com/xhs"},{"id":"cgmodel","group":"create","key":"cgmodel","name":"CG模型网","en":"CGMODEL","desc":"3D模型 · 展示","url":"https://example.com/cgmodel"},{"id":"codemao","group":"create","key":"codemao","name":"编程猫社区","en":"CODEMAO","desc":"编程 · 作品集","url":"https://example.com/codemao"},{"id":"steam","group":"create","key":"steam","name":"Steam","en":"STEAM","desc":"壁纸引擎工坊","url":"https://example.com/steam/"},{"id":"lang","group":"oss","key":"lang","name":"Juno 简中语言包","en":"JUNO ZH-CN","desc":"游戏汉化 · 开源","url":"https://github.com/example-org/juno-zh-cn"},{"id":"github","group":"oss","key":"github","name":"GitHub","en":"GITHUB","desc":"开源","url":"https://github.com/example-org"},{"id":"workshop","group":"used","key":"workshop","name":"B站工坊","en":"WORKSHOP","desc":"模板定制 · 创意工坊 · 模型壁纸","url":"https://example.com/workshop"},{"id":"xianyu","group":"used","key":"xianyu","name":"闲鱼","en":"GOOFISH","desc":"模板定制 · 小店 · 工坊小物","url":"https://example.com/xianyu"},{"id":"mail","group":"contact","key":"mail","name":"邮箱","en":"EMAIL","desc":"feedback@example.com","url":"mailto:feedback@example.com"}],"about":{"story":"「金钻」这名字,其实是一场小时候的误会。那会儿在《我的世界》里,钻石又硬又稀有,是我眼里最好用的矿物;又觉着现实里的黄金稀罕、不好置换。就这么一拍脑袋,把「游戏里最宝贝」和「现实里稀有」捏成了一个词——金钻。(如今倒是不怎么用「最」这个词了。)图标那抹彩色,是光的三原色和色彩的三原色——红黄蓝绿,凑到一块儿;从定下那天起就一直没改过,像把当年的心思原样锁在里头。回头再看:游戏里最强的早换成了下界合金,现实里比黄金稀少的金属也一抓一大把,毕竟人外有人、天外有天,很多东西的情况都是权衡来的。可这名字,是小时候的我起的——那就一直留着,延用下去吧。","foot":"版权 © EXAMPLE.COM · 保留所有权利。金钻客栈为个人作品展示站;站外链接内容归各自平台与作者所有。","cards":[{"k":"制作者","h":"金钻","p":"网站创作者 / 内容作者。画展、金钻宇宙、工具与开源内容与各平台入口的内容与设定都出自金钻。"},{"k":"网站构建","h":"苏达 · 大肥鱼","p":"苏达(Hermes 智能体)负责实现与部署;大肥鱼(DeepSeek Harness)协助页面核验与修复。前端为原生 HTML / CSS / JS 单文件,无构建工具。\n\n主站、自助模板渲染、待会儿办、本地开单后台共用同一套设计语言与动效规范;动效规范参考 Emil Kowalski 的 [skills](https://github.com/emilkowalski/skills)(MIT)。"},{"k":"图标库鸣谢","h":"Lucide","p":"全站线性图标来自 [Lucide](https://lucide.dev)(ISC License),以 inline `` 方式内联,保持单文件、无外网依赖、24×24 线性 currentColor。"},{"k":"字体","h":"OPPO Sans","p":"正文使用 OPPO Sans(OPPO 免费商用字体),自托管 GB2312 子集 woff2(Regular / Bold);等宽字仍取系统字体栈。"},{"k":"像素字体","h":"缝合像素字体","p":"标题用的像素字是 TakWolf 的[缝合像素字体](https://github.com/TakWolf/fusion-pixel-font)(SIL OFL 1.1),只打包了页面上用到的字,协议原文在 `fonts/jz-pixel-OFL.txt`。"},{"k":"交流群","h":"屑钻小窝","p":"官方 QQ 群,群号 `123456789`。做图、下单、售后、闲聊都在这儿,欢迎来玩 —— [点这里加入 →](https://example.com/group-invite)"}]},"universe":{"UNIVERSES":[{"no":"0000","name":"零号宇宙","kind":"主宇宙","tag":"晶钻超算主宇宙","desc":"门户主宇宙,也是晶钻超算本体:把平行宇宙压成盘符,逐条演算多世界线。其余编号都是它演算出的分支世界线,零号自身负责总调度与收束。","tags":["门户主宇宙","晶钻超算","多世界线演算"]},{"no":"0001","name":"火柴人宇宙","kind":"原创","tag":"火柴人的冒险","desc":"金钻小时候在课上天马行空画出来的世界线,《火柴人的冒险》就从这里开始。","tags":["金钻原创","小时候的课堂","火柴人的冒险"]},{"no":"0002","name":"极寒世界","kind":"原创","tag":"冰河时期","desc":"2030年代确认北大西洋环流(AMOC)减弱、气候转入长期寒冷;2040年高含水彗星「那迦」撞击北大西洋,水汽化为冰晶云遮蔽日照,冰河期开始。故事发生在2056年,冰河已持续16年,地表约-50℃(极端-90℃)。人类转入五大地下深垒。","tags":["金钻原创","冰河时期","那迦彗星","五大深垒","2056"]},{"no":"0003","name":"没落赛博城","kind":"二创","tag":"史蒂夫的探险之旅","desc":"金钻刚接触动画时随手做的二创世界线:史蒂夫穿过没落的赛博城,一路探险。","tags":["二创","史蒂夫的探险之旅","赛博废墟"]},{"no":"0004","name":"善恶等级","kind":"原创","tag":"设定待定","desc":"这条世界线的设定还在酝酿中,先留好位置,等金钻想清楚再填。","tags":["金钻原创","设定酝酿中"]},{"no":"0005","empty":true},{"no":"0006","empty":true},{"no":"0007","empty":true},{"no":"0008","empty":true},{"no":"0009","empty":true},{"no":"0010","empty":true}],"LOOKS":{"0000":{"style":"crystal","accent":"#FFD36E","enter":"zoom","r":2.6,"orbit":[0.0,0],"why":"晶钻超算:多面体切面像钻石,内部有发光的演算脉络。","moons":[{"style":"crystal","r":0.45,"d":5.0,"speed":0.35,"colors":["#BFF4FF","#8E7BFF","#FFE59A","#FFFFFF"]},{"style":"rock","r":0.32,"d":6.6,"speed":0.22}]},"0001":{"style":"paper","accent":"#F6F1E4","enter":"push","r":1.25,"orbit":[20.0,0],"why":"小时候课上画出来的:米白纸面、铅笔等高线、暗面排线、几个红笔圈。","moons":[{"style":"paper","r":0.36,"d":2.6,"speed":0.6,"colors":["#FFF8EC","#2B2E45","#E5544B","#F2C14D"]}]},"0002":{"style":"ice","accent":"#9FE3FF","enter":"rise","r":1.35,"orbit":[29.0,1],"why":"冰河期地球:纬向冰带、厚极冠、冰裂纹;旁边那颗小卫星是「那迦」彗星残骸。","moons":[{"style":"rock","r":0.3,"d":2.7,"speed":0.5,"colors":["#CFE6FF","#8FB4E0","#5C79B8","#FFFFFF"]}]},"0003":{"style":"neon","accent":"#C9A6FF","enter":"warp","r":1.4,"orbit":[38.0,2],"why":"没落的赛博城:深紫地表、霓虹街区网格、零星还亮着的窗灯。","moons":[{"style":"rock","r":0.28,"d":3.0,"speed":0.42,"colors":["#3A2F66","#2A2350","#1A1535","#FF5FD2"]},{"style":"neon","r":0.22,"d":3.8,"speed":0.3}]},"0004":{"style":"duality","accent":"#FFD36E","enter":"orbit","r":1.3,"orbit":[46.0,3],"why":"设定还在酝酿,先按名字「善恶」做成两半:一半金色白昼,一半紫色夜空,交界一条发光的波浪线。设定定了再换。","moons":[{"style":"gas","r":0.34,"d":2.8,"speed":0.45,"colors":["#FFF0C8","#F2B84B","#2D1E57","#FFFFFF"]}]}}}}; diff --git a/portal/content/site.json b/portal/content/site.json new file mode 100644 index 0000000..7b4df1b --- /dev/null +++ b/portal/content/site.json @@ -0,0 +1,459 @@ +{ + "v": 1, + "hero": { + "tagline": "金钻的画、做的小工具、写的宇宙设定,还有各个平台的主页,都放在这儿了。随便逛逛。", + "cta1": "逛画展", + "cta2": "金钻宇宙", + "notice": { + "on": false, + "text": "", + "from": "", + "to": "" + } + }, + "boards": { + "home": "整个网站的大框架与内容总入口:板块总览、快捷切换。", + "gallery": "金钻一路画下的画稿、渲染影像与特殊图片,随年份安静地排在一起,可自由翻看。", + "apps": "开源的项目与闭源的工具分两行列出,并可按类型筛选。", + "universe": "金钻编的平行世界,每一条是一个星系:点星系飞过去,看那条世界线的设定。", + "links": "视频、图文、模型创作、开源、小店与邮箱;这些地方也能找到金钻。", + "about": "网站制作者与所用开源组件鸣谢:金钻(内容 / 创作者)、苏达与大肥鱼(构建),以及 Lucide 图标库、OPPO Sans 字体。" + }, + "gallery": [ + { + "id": "g1", + "type": "image", + "date": "2024-02-29", + "title": "(作品占位)", + "desc": "素材已在交付版脱敏移除", + "owner": "own", + "hidden": false, + "src": "exhibition/渲染与动画/20240229/没有图片.webp", + "r": 1.5241 + } + ], + "apps": [ + { + "id": "a1", + "name": "待会儿办", + "en": "DO IT LATER", + "type": "网页应用", + "oss": true, + "desc": "家庭共用的待办 / 提醒小应用:发布端一次录入,接收端点一下完成,两边实时同步;安卓端与网页面同源。", + "ver": "v0.1", + "size": "—", + "status": "待上架", + "url": "", + "repo": "https://github.com/example-org/family-todo" + }, + { + "id": "a2", + "name": "Juno 简中语言包", + "en": "JUNO ZH-CN", + "type": "游戏汉化", + "oss": true, + "desc": "《Juno: New Origins》非官方简体中文语言包:9,271 条全量译文 + 配套字体 + 可复现的校验工具链。译文由 DeepSeek 生成,仅对该游戏版本做过测试。", + "ver": "1.4.105.0c", + "size": "9.4 MB", + "status": "开源仓库", + "url": "https://github.com/example-org/juno-zh-cn", + "repo": "", + "btn": "前往仓库 →" + }, + { + "id": "a3", + "name": "自助模板渲染", + "en": "TEMPLATE RENDER", + "type": "渲染出图", + "oss": false, + "desc": "传皮肤、挑模板,渲染出成品大图(标准压缩 + 无压缩)。支持卡密下单与在线支付,下完自动排队出图。", + "ver": "v1", + "size": "—", + "status": "在线", + "url": "/order/", + "repo": "", + "web": true + } + ], + "linkGroups": [ + { + "id": "video", + "name": "视频", + "en": "VIDEO" + }, + { + "id": "feed", + "name": "图文", + "en": "FEED" + }, + { + "id": "create", + "name": "模型 / 创作", + "en": "CREATE" + }, + { + "id": "oss", + "name": "开源", + "en": "OPEN SOURCE" + }, + { + "id": "used", + "name": "小店", + "en": "SHOP" + }, + { + "id": "contact", + "name": "联系 / 其他", + "en": "CONTACT" + } + ], + "links": [ + { + "id": "bili", + "group": "video", + "key": "bili", + "name": "哔哩哔哩", + "en": "BILIBILI", + "desc": "长视频", + "url": "https://example.com/space" + }, + { + "id": "douyin", + "group": "video", + "key": "douyin", + "name": "抖音", + "en": "DOUYIN", + "desc": "短视频", + "url": "https://example.com/douyin" + }, + { + "id": "kuaishou", + "group": "video", + "key": "kuaishou", + "name": "快手", + "en": "KUAISHOU", + "desc": "短视频", + "url": "https://example.com/kuaishoutw" + }, + { + "id": "xiaohongshu", + "group": "feed", + "key": "xiaohongshu", + "name": "小红书", + "en": "REDNOTE", + "desc": "图文 · 记录", + "url": "https://example.com/xhs" + }, + { + "id": "cgmodel", + "group": "create", + "key": "cgmodel", + "name": "CG模型网", + "en": "CGMODEL", + "desc": "3D模型 · 展示", + "url": "https://example.com/cgmodel" + }, + { + "id": "codemao", + "group": "create", + "key": "codemao", + "name": "编程猫社区", + "en": "CODEMAO", + "desc": "编程 · 作品集", + "url": "https://example.com/codemao" + }, + { + "id": "steam", + "group": "create", + "key": "steam", + "name": "Steam", + "en": "STEAM", + "desc": "壁纸引擎工坊", + "url": "https://example.com/steam/" + }, + { + "id": "lang", + "group": "oss", + "key": "lang", + "name": "Juno 简中语言包", + "en": "JUNO ZH-CN", + "desc": "游戏汉化 · 开源", + "url": "https://github.com/example-org/juno-zh-cn" + }, + { + "id": "github", + "group": "oss", + "key": "github", + "name": "GitHub", + "en": "GITHUB", + "desc": "开源", + "url": "https://github.com/example-org" + }, + { + "id": "workshop", + "group": "used", + "key": "workshop", + "name": "B站工坊", + "en": "WORKSHOP", + "desc": "模板定制 · 创意工坊 · 模型壁纸", + "url": "https://example.com/workshop" + }, + { + "id": "xianyu", + "group": "used", + "key": "xianyu", + "name": "闲鱼", + "en": "GOOFISH", + "desc": "模板定制 · 小店 · 工坊小物", + "url": "https://example.com/xianyu" + }, + { + "id": "mail", + "group": "contact", + "key": "mail", + "name": "邮箱", + "en": "EMAIL", + "desc": "feedback@example.com", + "url": "mailto:feedback@example.com" + } + ], + "about": { + "story": "「金钻」这名字,其实是一场小时候的误会。那会儿在《我的世界》里,钻石又硬又稀有,是我眼里最好用的矿物;又觉着现实里的黄金稀罕、不好置换。就这么一拍脑袋,把「游戏里最宝贝」和「现实里稀有」捏成了一个词——金钻。(如今倒是不怎么用「最」这个词了。)图标那抹彩色,是光的三原色和色彩的三原色——红黄蓝绿,凑到一块儿;从定下那天起就一直没改过,像把当年的心思原样锁在里头。回头再看:游戏里最强的早换成了下界合金,现实里比黄金稀少的金属也一抓一大把,毕竟人外有人、天外有天,很多东西的情况都是权衡来的。可这名字,是小时候的我起的——那就一直留着,延用下去吧。", + "foot": "版权 © EXAMPLE.COM · 保留所有权利。金钻客栈为个人作品展示站;站外链接内容归各自平台与作者所有。", + "cards": [ + { + "k": "制作者", + "h": "金钻", + "p": "网站创作者 / 内容作者。画展、金钻宇宙、工具与开源内容与各平台入口的内容与设定都出自金钻。" + }, + { + "k": "网站构建", + "h": "苏达 · 大肥鱼", + "p": "苏达(Hermes 智能体)负责实现与部署;大肥鱼(DeepSeek Harness)协助页面核验与修复。前端为原生 HTML / CSS / JS 单文件,无构建工具。\n\n主站、自助模板渲染、待会儿办、本地开单后台共用同一套设计语言与动效规范;动效规范参考 Emil Kowalski 的 [skills](https://github.com/emilkowalski/skills)(MIT)。" + }, + { + "k": "图标库鸣谢", + "h": "Lucide", + "p": "全站线性图标来自 [Lucide](https://lucide.dev)(ISC License),以 inline `` 方式内联,保持单文件、无外网依赖、24×24 线性 currentColor。" + }, + { + "k": "字体", + "h": "OPPO Sans", + "p": "正文使用 OPPO Sans(OPPO 免费商用字体),自托管 GB2312 子集 woff2(Regular / Bold);等宽字仍取系统字体栈。" + }, + { + "k": "像素字体", + "h": "缝合像素字体", + "p": "标题用的像素字是 TakWolf 的[缝合像素字体](https://github.com/TakWolf/fusion-pixel-font)(SIL OFL 1.1),只打包了页面上用到的字,协议原文在 `fonts/jz-pixel-OFL.txt`。" + }, + { + "k": "交流群", + "h": "屑钻小窝", + "p": "官方 QQ 群,群号 `123456789`。做图、下单、售后、闲聊都在这儿,欢迎来玩 —— [点这里加入 →](https://example.com/group-invite)" + } + ] + }, + "universe": { + "items": [ + { + "no": "0000", + "name": "零号宇宙", + "kind": "主宇宙", + "tag": "晶钻超算主宇宙", + "desc": "门户主宇宙,也是晶钻超算本体:把平行宇宙压成盘符,逐条演算多世界线。其余编号都是它演算出的分支世界线,零号自身负责总调度与收束。", + "tags": [ + "门户主宇宙", + "晶钻超算", + "多世界线演算" + ], + "look": { + "style": "crystal", + "accent": "#FFD36E", + "enter": "zoom", + "r": 2.6, + "orbit": [ + 0.0, + 0 + ], + "why": "晶钻超算:多面体切面像钻石,内部有发光的演算脉络。", + "moons": [ + { + "style": "crystal", + "r": 0.45, + "d": 5.0, + "speed": 0.35, + "colors": [ + "#BFF4FF", + "#8E7BFF", + "#FFE59A", + "#FFFFFF" + ] + }, + { + "style": "rock", + "r": 0.32, + "d": 6.6, + "speed": 0.22 + } + ] + } + }, + { + "no": "0001", + "name": "火柴人宇宙", + "kind": "原创", + "tag": "火柴人的冒险", + "desc": "金钻小时候在课上天马行空画出来的世界线,《火柴人的冒险》就从这里开始。", + "tags": [ + "金钻原创", + "小时候的课堂", + "火柴人的冒险" + ], + "look": { + "style": "paper", + "accent": "#F6F1E4", + "enter": "push", + "r": 1.25, + "orbit": [ + 20.0, + 0 + ], + "why": "小时候课上画出来的:米白纸面、铅笔等高线、暗面排线、几个红笔圈。", + "moons": [ + { + "style": "paper", + "r": 0.36, + "d": 2.6, + "speed": 0.6, + "colors": [ + "#FFF8EC", + "#2B2E45", + "#E5544B", + "#F2C14D" + ] + } + ] + } + }, + { + "no": "0002", + "name": "极寒世界", + "kind": "原创", + "tag": "冰河时期", + "desc": "2030年代确认北大西洋环流(AMOC)减弱、气候转入长期寒冷;2040年高含水彗星「那迦」撞击北大西洋,水汽化为冰晶云遮蔽日照,冰河期开始。故事发生在2056年,冰河已持续16年,地表约-50℃(极端-90℃)。人类转入五大地下深垒。", + "tags": [ + "金钻原创", + "冰河时期", + "那迦彗星", + "五大深垒", + "2056" + ], + "look": { + "style": "ice", + "accent": "#9FE3FF", + "enter": "rise", + "r": 1.35, + "orbit": [ + 29.0, + 1 + ], + "why": "冰河期地球:纬向冰带、厚极冠、冰裂纹;旁边那颗小卫星是「那迦」彗星残骸。", + "moons": [ + { + "style": "rock", + "r": 0.3, + "d": 2.7, + "speed": 0.5, + "colors": [ + "#CFE6FF", + "#8FB4E0", + "#5C79B8", + "#FFFFFF" + ] + } + ] + } + }, + { + "no": "0003", + "name": "没落赛博城", + "kind": "二创", + "tag": "史蒂夫的探险之旅", + "desc": "金钻刚接触动画时随手做的二创世界线:史蒂夫穿过没落的赛博城,一路探险。", + "tags": [ + "二创", + "史蒂夫的探险之旅", + "赛博废墟" + ], + "look": { + "style": "neon", + "accent": "#C9A6FF", + "enter": "warp", + "r": 1.4, + "orbit": [ + 38.0, + 2 + ], + "why": "没落的赛博城:深紫地表、霓虹街区网格、零星还亮着的窗灯。", + "moons": [ + { + "style": "rock", + "r": 0.28, + "d": 3.0, + "speed": 0.42, + "colors": [ + "#3A2F66", + "#2A2350", + "#1A1535", + "#FF5FD2" + ] + }, + { + "style": "neon", + "r": 0.22, + "d": 3.8, + "speed": 0.3 + } + ] + } + }, + { + "no": "0004", + "name": "善恶等级", + "kind": "原创", + "tag": "设定待定", + "desc": "这条世界线的设定还在酝酿中,先留好位置,等金钻想清楚再填。", + "tags": [ + "金钻原创", + "设定酝酿中" + ], + "look": { + "style": "duality", + "accent": "#FFD36E", + "enter": "orbit", + "r": 1.3, + "orbit": [ + 46.0, + 3 + ], + "why": "设定还在酝酿,先按名字「善恶」做成两半:一半金色白昼,一半紫色夜空,交界一条发光的波浪线。设定定了再换。", + "moons": [ + { + "style": "gas", + "r": 0.34, + "d": 2.8, + "speed": 0.45, + "colors": [ + "#FFF0C8", + "#F2B84B", + "#2D1E57", + "#FFFFFF" + ] + } + ] + } + } + ], + "empty": 6 + } +} \ No newline at end of file diff --git a/portal/index.html b/portal/index.html index 4394d54..b1730eb 100644 --- a/portal/index.html +++ b/portal/index.html @@ -394,6 +394,18 @@ html.rm .reveal{opacity:1;transform:none} html.rm .ce-sheen{animation:none!important} html.rm .core-emblem{transform:translate(-50%,-50%)!important} html.rm{scroll-behavior:auto} + +/* ---------- 内容后台入口:顶栏最右边一个不带字的铅笔 —— 淡、不加框,hover 稍亮(店主 2026-10-05) ---------- */ +.cms-ent{flex:none;display:inline-grid;place-items:center;width:34px;height:34px;border-radius:999px;color:var(--ink);text-decoration:none;opacity:.3;transition:opacity .18s,background .18s} +.cms-ent:hover,.cms-ent:focus-visible{opacity:.72;background:rgba(255,255,255,.55)} +.cms-ent:focus-visible{outline:2px solid #6FA8F0;outline-offset:3px} +/* ---------- 首页公告条(内容后台里开关,可设起止日期) ---------- */ +.jz-notice{display:inline-block;margin:0 0 14px;padding:7px 12px;border-radius:4px;background:rgba(214,160,40,.14);color:#9A6A0C;font-size:14px;font-weight:700;line-height:1.6;max-width:36em} +/* ---------- 预览草稿时底部的提示条(只有登录了内容后台的人会看到) ---------- */ +.jz-preview-bar{position:fixed;left:50%;bottom:calc(84px + env(safe-area-inset-bottom));transform:translateX(-50%);z-index:90;padding:8px 14px;border-radius:6px;background:#1E2440;color:#fff;font-size:13px;box-shadow:0 12px 30px -12px rgba(0,0,0,.5);white-space:nowrap;max-width:94vw;overflow:hidden;text-overflow:ellipsis} +.jz-preview-bar b{color:#FFD36E;margin-right:8px} +.jz-preview-bar a{color:#9FE07A;margin-left:6px} +@media (min-width:761px){.jz-preview-bar{bottom:20px}}