From 973afd788654e3ca5365aad4fe2270a9ac161f86 Mon Sep 17 00:00:00 2001 From: ywsabc2 Date: Wed, 7 Oct 2026 06:58:21 +0000 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E5=8E=9F=E5=9E=8B=E5=B9=B6?= =?UTF-8?q?=E8=BF=9B=E9=A2=84=E8=A7=88=E7=AB=99=EF=BC=9A=E4=B8=8B=E5=8D=95?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=20+=20=E6=94=B6=E9=93=B6=E5=8F=B0=20/=20?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=20+=20=E6=94=B6=E6=AC=BE=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=EF=BC=88=E5=8F=82=E8=80=83=20Epusdt=20=E6=94=B6?= =?UTF-8?q?=E9=93=B6=E5=8F=B0=E3=80=81=E7=8B=AC=E8=A7=92=E6=95=B0=E5=8D=A1?= =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E7=BC=93=E5=AD=98=E6=9F=A5=E5=8D=95?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 预览站 order.html:模板多选、分辨率、皮肤三色灯(绿放行 / 黄勾无视风险 / 红拦住),吸底金额条; 「我的订单」= 本机下过的单 + 订单号/取件码查单。 - 新 pay.html:用站点「票据」样式做收银台(爱发电 / 支付宝扫码、二维码 + 倒计时、自动轮询、付好了没反应), 到账后同页变订单页;超时关闭态;取件码存根、复制订单链接。 - cms/pay.html:收款后台(待办 / 认领 / 渠道熔断 / 订单 / 支付单 / 流水)。演示控制台收进顶部预览横幅。 - 后端:订单记模板 / 分辨率 / 皮肤名,金额按模板数;取件码 10 位好抄;接口挂 /svc/,原型独立页撤掉。 - 测试 26 条;浏览器端到端 22 条(桌面 + 手机)。 Co-Authored-By: Claude Opus 5.5 --- backend/pay-proto/README.md | 13 +- backend/pay-proto/app.py | 32 +- backend/pay-proto/config.py | 6 + backend/pay-proto/core.py | 28 +- backend/pay-proto/mockgw.py | 8 +- backend/pay-proto/preview/assets/pay.css | 107 ++++++ backend/pay-proto/preview/assets/pay.js | 118 ++++++ .../assets/vendor}/qrcode.min.js | 0 backend/pay-proto/preview/cms/pay.html | 117 ++++++ backend/pay-proto/preview/order.html | 139 ++++++++ backend/pay-proto/preview/pay.html | 183 ++++++++++ backend/pay-proto/static/admin.html | 138 ------- backend/pay-proto/static/index.html | 337 ------------------ backend/pay-proto/tests/test_proto.py | 9 + 14 files changed, 724 insertions(+), 511 deletions(-) create mode 100644 backend/pay-proto/preview/assets/pay.css create mode 100644 backend/pay-proto/preview/assets/pay.js rename backend/pay-proto/{static => preview/assets/vendor}/qrcode.min.js (100%) create mode 100644 backend/pay-proto/preview/cms/pay.html create mode 100644 backend/pay-proto/preview/order.html create mode 100644 backend/pay-proto/preview/pay.html delete mode 100644 backend/pay-proto/static/admin.html delete mode 100644 backend/pay-proto/static/index.html diff --git a/backend/pay-proto/README.md b/backend/pay-proto/README.md index 5a0e397..0253b0f 100644 --- a/backend/pay-proto/README.md +++ b/backend/pay-proto/README.md @@ -24,13 +24,18 @@ - `core.py`:数据库、演示时钟、统一到账入口 `settle_payment()`、定时任务(爱发电对账 / 当面付补查 / 支付单过期 / 订单超时 / 迟到扫描) - `channels.py`:渠道抽象层,`Afdian`、`AlipayF2F`(create / verify_notify / query / close / refund) - `mockgw.py`:模拟网关(只在占位符时用) -- `app.py`:HTTP 服务;`static/`:付款页、后台页、二维码库(qrcode-generator 1.4.4,MIT) +- `app.py`:HTTP 服务(只有接口和模拟网关,页面都在站点里) +- `preview/`:并进预览站的页面 —— `order.html`(下单表单 + 我的订单)、`pay.html`(收银台 / 订单页)、 + `cms/pay.html`(收款后台)、`assets/pay.css`、`assets/pay.js`(含演示控制台)、`assets/vendor/qrcode.min.js`(qrcode-generator 1.4.4,MIT)。 + 另外 `cms/index.html` 的「下单页」分组里加了一个「收款与对账」链接(预览站上直接改的,三行)。 ## 测试 -`python3 tests/test_proto.py`:临时目录起一份服务,从 HTTP 层打 24 个场景。 +`python3 tests/test_proto.py`:临时目录起一份服务,从 HTTP 层打 26 个场景。 ## 预览部署(甲骨文 ARM) -`/opt/jz-pay-proto` + systemd `jz-pay-proto`(DynamicUser,数据 `/var/lib/jz-pay-proto`), -nginx `jz-preview.conf` 里 `/pay-proto/` 反代到 `127.0.0.1:18100`。 +`/opt/jz-pay-proto` + systemd `jz-pay-proto`(DynamicUser,数据 `/var/lib/jz-pay-proto`, +`PAY_BASE_URL=http://161.33.11.66/svc`、`PAY_SITE_URL=http://161.33.11.66`), +nginx `jz-preview.conf` 里 `/svc/` 反代到 `127.0.0.1:18100`;旧的 `/pay-proto/` 301 到 `/order.html`。 +页面:`/order.html` → `/pay.html?o=…&t=…`;后台 `/cms/pay.html`。**只在预览机,不碰生产。** diff --git a/backend/pay-proto/app.py b/backend/pay-proto/app.py index ba7994d..a30a6b8 100644 --- a/backend/pay-proto/app.py +++ b/backend/pay-proto/app.py @@ -7,7 +7,7 @@ 演示: api/demo/*(快进时钟、立即跑定时任务、模拟场景 —— 只在原型里有) 模拟网关:mock/afdian/* · mock/alipay/* """ -import json, mimetypes, os, secrets, sys, urllib.parse +import json, os, secrets, sys, urllib.parse from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) @@ -16,9 +16,8 @@ import core # noqa: E402 import channels # noqa: E402 import mockgw # noqa: E402 -STATIC = os.path.join(C.HERE, "static") -STATE_TEXT = {"unpaid": "待付款", "waiting": "已到账 · 排队中", "working": "渲染中", "done": "已完成", - "failed": "渲染失败", "closed": "已关闭(超时未付)", "void": "已注销"} +STATE_TEXT = {"unpaid": "待付款", "waiting": "已付款 · 排队中", "working": "渲染中", "done": "已完成", + "failed": "渲染失败", "closed": "已关闭", "void": "已注销"} PAY_TEXT = {"created": "等待付款", "paid": "已到账", "mismatch": "金额不足", "closed": "已关闭", "refunded": "已退款"} @@ -54,7 +53,9 @@ def order_view(o): return {"ok": True, "now": core.now(), "order": { "oid": o["oid"], "state": o["state"], "state_text": STATE_TEXT.get(o["state"], o["state"]), "n_img": o["n_img"], "amount": o["amount"], "created_at": o["created_at"], "paid_at": o["paid_at"], - "closed_at": o["closed_at"], "expire_at": o["created_at"] + C.ORDER_TTL}, + "closed_at": o["closed_at"], "expire_at": o["created_at"] + C.ORDER_TTL, + "templates": [{"k": k, "n": C.TEMPLATES.get(k, k)} for k in json.loads(o.get("templates") or "[]")], + "res": o.get("res") or 1000, "skin_name": o.get("skin_name") or "", "price_unit": C.PRICE_UNIT}, "payments": [pay_view(p) for p in pays], "channels": chans, "events": ev, "params": {"qr_ttl": C.QR_TTL, "order_ttl": C.ORDER_TTL, "late_grace": C.LATE_GRACE, "ali_max": C.ALI_MAX_AMOUNT}} @@ -259,27 +260,13 @@ class H(BaseHTTPRequestHandler): def is_admin(self): return secrets.compare_digest(self.headers.get("X-Admin-Token") or "", admin_token()) - def static(self, name): - p = os.path.normpath(os.path.join(STATIC, name)) - if not p.startswith(STATIC + os.sep) or not os.path.isfile(p): - return self.send(404, "text/plain; charset=utf-8", "not found") - ctype = (mimetypes.guess_type(p)[0] or "application/octet-stream") - if ctype.startswith("text/") or ctype.endswith("javascript"): - ctype += "; charset=utf-8" - with open(p, "rb") as f: - self.send(200, ctype, f.read()) - def do_GET(self): u = urllib.parse.urlparse(self.path) p, qs = u.path, urllib.parse.parse_qs(u.query) g = lambda k: (qs.get(k) or [""])[0] try: - if p in ("/", "/index.html"): - return self.static("index.html") - if p in ("/admin", "/admin.html"): - return self.static("admin.html") - if p.startswith("/static/"): - return self.static(p[len("/static/"):]) + if p in ("/", "/index.html", "/admin", "/admin.html"): # 页面都在站点里,这里只有接口 + return self.send(302, "text/plain", "", {"Location": C.SITE_URL + ("/cms/pay.html" if "admin" in p else "/order.html")}) if p == "/api/order": o = self.order_auth(g("oid"), g("t")) return self.js(order_view(o)) if o else self.js({"ok": False, "error": "订单不存在"}, 404) @@ -310,7 +297,8 @@ class H(BaseHTTPRequestHandler): p = urllib.parse.urlparse(self.path).path try: if p == "/api/order": - o = core.new_order(self.jbody().get("n_img")) + d = self.jbody() + o = core.new_order(d.get("templates"), d.get("res"), d.get("skin_name"), d.get("n_img")) return self.js(dict(order_view(o), token=o["token"])) if p in ("/api/pay", "/api/check"): d = self.jbody() diff --git a/backend/pay-proto/config.py b/backend/pay-proto/config.py index d0ea6aa..daf3f9d 100644 --- a/backend/pay-proto/config.py +++ b/backend/pay-proto/config.py @@ -24,6 +24,8 @@ PORT = int(env("PAY_PORT", "18100")) BASE_URL = env("PAY_BASE_URL", "http://127.0.0.1:%d" % PORT).rstrip("/") # 服务器自己调自己(模拟网关)用的内网地址 INTERNAL_URL = "http://127.0.0.1:%d" % PORT +# 站点地址:模拟收银台付完「回到订单页」用(预览站根) +SITE_URL = env("PAY_SITE_URL", BASE_URL).rstrip("/") ADMIN_TOKEN = env("PAY_ADMIN_TOKEN", "") # ---------------- 爱发电(主通道) ---------------- @@ -48,6 +50,10 @@ ALIPAY = { } PRICE_UNIT = 6 # 每张图 ¥ +# 模板 key → 名字(和下单页一致);分辨率可选值 +TEMPLATES = {"stand": "站立正反", "standb": "站立正反(虚化)", "wheat": "麦田萤火", "beach": "海边自拍", + "boom": "不看爆炸", "sakura": "飞跃樱花林", "airship": "空艇巡游"} +RESOLUTIONS = (1000, 1024, 2048, 4096) # ---------------- 时间参数(秒) ---------------- QR_TTL = 15 * 60 # 当面付二维码有效期 diff --git a/backend/pay-proto/core.py b/backend/pay-proto/core.py index 4a1cabb..28deffc 100644 --- a/backend/pay-proto/core.py +++ b/backend/pay-proto/core.py @@ -25,7 +25,8 @@ def advance_clock(seconds): SCHEMA = """ CREATE TABLE IF NOT EXISTS orders( oid TEXT PRIMARY KEY, token TEXT, state TEXT, n_img INTEGER, amount INTEGER, - created_at REAL, paid_at REAL, closed_at REAL, buyer_claim_at REAL, note TEXT DEFAULT ''); + created_at REAL, paid_at REAL, closed_at REAL, buyer_claim_at REAL, note TEXT DEFAULT '', + templates TEXT DEFAULT '[]', res INTEGER DEFAULT 1000, skin_name TEXT DEFAULT ''); CREATE TABLE IF NOT EXISTS payments( pay_id TEXT PRIMARY KEY, oid TEXT, channel TEXT, amount_due INTEGER, state TEXT, created_at REAL, expire_at REAL, trade_no TEXT UNIQUE, amount_paid REAL, paid_at REAL, @@ -51,6 +52,12 @@ def db(): _DB.row_factory = sqlite3.Row _DB.execute("PRAGMA journal_mode=WAL") _DB.executescript(SCHEMA) + for col, decl in (("templates", "TEXT DEFAULT '[]'"), ("res", "INTEGER DEFAULT 1000"), + ("skin_name", "TEXT DEFAULT ''")): + try: # 老库补列 + _DB.execute("ALTER TABLE orders ADD COLUMN %s %s" % (col, decl)) + except sqlite3.OperationalError: + pass return _DB @@ -100,13 +107,20 @@ def todo(kind, detail, oid="", pay_id="", channel="", trade_no="", amount_due=No # ---------------------------------------------------------------- 订单 / 支付单 -def new_order(n_img): - n = max(1, min(int(n_img or 1), 20)) +def new_order(templates=None, res=1000, skin_name="", n_img=None): + """下单。templates = 模板 key 列表(一张皮肤 × 每个模板出一张);老调用只给 n_img 也行。""" + tpls = [t for t in (templates or []) if t in C.TEMPLATES] + tpls = list(dict.fromkeys(tpls)) + if tpls: + n = len(tpls) + else: + n = max(1, min(int(n_img or 1), 20)) + res = int(res or 1000) if int(res or 1000) in C.RESOLUTIONS else 1000 oid = "YS" + "".join(secrets.choice("ABCDEFGHJKLMNPQRSTUVWXYZ23456789") for _ in range(6)) - tok = secrets.token_urlsafe(12) - x("INSERT INTO orders(oid,token,state,n_img,amount,created_at) VALUES(?,?,?,?,?,?)", - (oid, tok, "unpaid", n, n * C.PRICE_UNIT, now())) - event("", "order_created", "", oid, "unpaid", {"n_img": n, "amount": n * C.PRICE_UNIT}) + tok = "".join(secrets.choice("ABCDEFGHJKLMNPQRSTUVWXYZ23456789") for _ in range(10)) # 取件码:好抄、不混淆 + x("INSERT INTO orders(oid,token,state,n_img,amount,created_at,templates,res,skin_name) VALUES(?,?,?,?,?,?,?,?,?)", + (oid, tok, "unpaid", n, n * C.PRICE_UNIT, now(), json.dumps(tpls), res, str(skin_name or "")[:80])) + event("", "order_created", "", oid, "unpaid", {"templates": tpls, "res": res, "amount": n * C.PRICE_UNIT}) return get_order(oid) diff --git a/backend/pay-proto/mockgw.py b/backend/pay-proto/mockgw.py index 294d9fa..18bc266 100644 --- a/backend/pay-proto/mockgw.py +++ b/backend/pay-proto/mockgw.py @@ -132,7 +132,7 @@ def afd_push(o, forge=False): def afd_pay(form): g = lambda k: (form.get(k) or [""])[0] o = afd_create_order(g("custom_order_id"), g("amount"), g("remark"), drop=bool(g("drop"))) - back = C.BASE_URL + "/" + back = C.SITE_URL + "/pay.html?o=" + urllib.parse.quote(g("remark") or "") body = """
爱发电(模拟)
付款成功
爱发电订单号 %s
实付 ¥%s%s

回到订单页(订单页会自动发现到账)

""" % ( @@ -274,8 +274,10 @@ def ali_scanpay(form): _later(lambda: _post(url, urllib.parse.urlencode(p).encode(), "application/x-www-form-urlencoded")) body = """
支付宝(模拟)
支付成功
¥%s · 交易号 %s%s
-

回到电脑上的订单页,它会自动变成「已到账」。

""" % ( - t["total_amount"], tn, "
已模拟异步通知丢失" if g("drop") else "") +

回到电脑上的订单页,它会自动变成「已到账」。

+

在这台设备看订单

""" % ( + t["total_amount"], tn, "
已模拟异步通知丢失" if g("drop") else "", + C.SITE_URL, urllib.parse.quote(t["out_trade_no"].rsplit("P", 1)[0])) return 200, "text/html; charset=utf-8", page("支付成功", body) diff --git a/backend/pay-proto/preview/assets/pay.css b/backend/pay-proto/preview/assets/pay.css new file mode 100644 index 0000000..41fc453 --- /dev/null +++ b/backend/pay-proto/preview/assets/pay.css @@ -0,0 +1,107 @@ +/* 自助渲染 · 下单与收银台(预览)—— 只放新组件,站点通用样式仍在 site.css */ + +/* ---------- 下单表单 ---------- */ +.buy-step{margin-top:26px} +.buy-step>h3{margin:0 0 4px;font-size:18px} +.buy-step>p{margin:0 0 14px;font-size:14px;color:var(--ink-3)} +.tpl-grid .tpl{cursor:pointer;text-align:left;font:inherit;color:inherit;border:2px solid rgba(255,255,255,.95);transition:border-color .15s var(--ease),box-shadow .15s var(--ease)} +.tpl .pick{position:absolute;top:18px;right:18px;width:24px;height:24px;border-radius:4px;background:rgba(255,255,255,.92);border:2px solid rgba(30,36,64,.18);display:grid;place-items:center;color:#fff;font-size:15px;font-weight:700;line-height:1} +.tpl[aria-pressed=true]{border-color:var(--mc-green)!important;box-shadow:0 0 0 3px rgba(91,170,60,.22),0 18px 30px -22px rgba(29,77,19,.45)!important} +.tpl[aria-pressed=true] .pick{background:var(--mc-green);border-color:var(--mc-green-lo)} +.tpl:focus-visible{outline:3px solid var(--mc-green-hi);outline-offset:2px} + +.skin{display:grid;grid-template-columns:132px minmax(0,1fr);gap:18px;align-items:start;padding:18px;border-radius:var(--r)} +@media (max-width:560px){.skin{grid-template-columns:1fr}} +.skin-drop{position:relative;display:grid;place-items:center;aspect-ratio:1/1;border-radius:12px;border:2px dashed rgba(140,150,200,.45);background:rgba(255,255,255,.7);cursor:pointer;text-align:center;font-size:13px;color:var(--ink-3);padding:8px;overflow:hidden} +.skin-drop:hover{border-color:var(--mc-green-hi)} +.skin-drop canvas{width:100%;height:100%;image-rendering:pixelated;display:block} +.skin-drop input{position:absolute;inset:0;opacity:0;cursor:pointer} +.skin-rep{display:flex;flex-direction:column;gap:8px} +.lamp{display:flex;gap:10px;align-items:flex-start;padding:9px 12px;border-radius:10px;font-size:13.5px;color:var(--ink-2);background:rgba(255,255,255,.6)} +.lamp::before{content:"";flex:none;width:8px;height:8px;margin-top:7px;border-radius:2px;background:#3CC985} +.lamp.warn{background:rgba(245,178,62,.055)} .lamp.warn::before{background:#F5B23E} +.lamp.bad{background:rgba(224,83,61,.055)} .lamp.bad::before{background:#E0533D} +.lamp b{color:var(--ink)} +.lamp label{display:flex;gap:6px;align-items:center;margin-top:4px;cursor:pointer} + +.sumbar{position:sticky;bottom:12px;z-index:4;margin-top:26px;display:flex;flex-wrap:wrap;align-items:center;gap:12px 18px;padding:14px 18px;border-radius:var(--r)} +.sumbar .sum{display:flex;flex-direction:column;gap:2px;min-width:0} +.sumbar .sum b{font-size:24px;font-variant-numeric:tabular-nums} +.sumbar .sum span{font-size:13px;color:var(--ink-3);overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +.sumbar .sp{flex:1} +.sumbar .btn{min-width:150px} +.sumbar .why{font-size:13px;color:#B4412F} +@media (max-width:760px){.sumbar{bottom:calc(84px + env(safe-area-inset-bottom,0px))}} + +/* ---------- 我的订单(这台浏览器里下过的单) ---------- */ +.mine{display:flex;flex-direction:column;gap:10px} +.mine a.mrow{display:grid;grid-template-columns:auto minmax(0,1fr) auto;gap:6px 16px;align-items:center;padding:14px 18px;border-radius:var(--r-sm);text-decoration:none;color:inherit} +.mine a.mrow:hover{border-color:var(--mc-green-hi)} +.mrow .code{font-weight:700;letter-spacing:.05em;font-variant-numeric:tabular-nums} +.mrow .what{font-size:13.5px;color:var(--ink-3);overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +.lookup{display:flex;flex-wrap:wrap;gap:10px;align-items:center;margin-top:14px} +.lookup input{height:44px;padding:0 14px;border-radius:4px;border:2px solid var(--stone-edge,#C9CED8);background:#fff;font:inherit;font-size:15px;min-width:0;flex:1 1 160px;letter-spacing:.04em;text-transform:uppercase} +.lookup input:focus{outline:none;border-color:var(--mc-green)} + +/* ---------- 状态 ---------- */ +.state.unpaid{background:#FFF4D9;color:#8A5A00} +.state.waiting,.state.working{background:#E5F3DF;color:#2E6A1D} +.state.done{background:#E5F3DF;color:#2E6A1D} +.state.closed,.state.void,.state.failed{background:#FBE8E4;color:#A33A2A} + +/* ---------- 收银台 ---------- */ +.pay .amt{font-size:34px;font-weight:700;font-variant-numeric:tabular-nums;line-height:1.1} +.pay .items{display:flex;flex-wrap:wrap;gap:6px} +.pay .items .chip{height:26px} +.chs{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:12px} +@media (max-width:560px){.chs{grid-template-columns:1fr}} +.chx{position:relative;display:flex;flex-direction:column;gap:4px;padding:14px 16px;border-radius:var(--r-sm);cursor:pointer;text-align:left;font:inherit;color:inherit;border:2px solid rgba(255,255,255,.95)} +.chx b{font-size:16px;display:flex;align-items:center;gap:8px} +.chx b i{width:22px;height:22px;border-radius:5px;display:grid;place-items:center;color:#fff;font-style:normal;font-size:12px;font-weight:700} +.chx.afd b i{background:#946CE6} .chx.ali b i{background:#1677FF} +.chx span{font-size:13px;color:var(--ink-3)} +.chx .rec{position:absolute;top:12px;right:12px;font-size:11.5px;font-weight:700;color:#2E6A1D;background:#E5F3DF;padding:1px 8px;border-radius:4px} +.chx[aria-pressed=true]{border-color:var(--mc-green)!important;box-shadow:0 0 0 3px rgba(91,170,60,.2)!important} +.chx:disabled{cursor:not-allowed;opacity:.55} +.chx .why{color:#A33A2A} +.qrbox{display:grid;grid-template-columns:184px minmax(0,1fr);gap:20px;align-items:start;padding-top:16px;border-top:1px dashed rgba(140,150,200,.35)} +@media (max-width:560px){.qrbox{grid-template-columns:1fr;justify-items:start}} +.qr{width:184px;height:184px;padding:10px;border-radius:12px;background:#fff;box-shadow:inset 0 0 0 1px rgba(30,36,64,.08),0 12px 24px -18px rgba(30,36,64,.4)} +.qr svg{display:block;width:100%;height:100%} +.qrbox h4{margin:0 0 6px;font-size:16px} +.qrbox p{margin:0 0 10px;font-size:13.5px;color:var(--ink-3);line-height:1.7} +.cd{display:flex;align-items:baseline;gap:8px;margin:4px 0 12px;font-size:13px;color:var(--ink-3)} +.cd b{font:700 26px/1 var(--pixel,inherit);color:var(--ink);font-variant-numeric:tabular-nums} +.cd.low b{color:#C2410C} +.waitline{display:flex;align-items:center;gap:8px;font-size:13.5px;color:var(--ink-2)} +.waitline::before{content:"";width:8px;height:8px;border-radius:2px;background:var(--mc-green-hi);animation:blink 1.2s steps(2) infinite} +@keyframes blink{50%{opacity:.25}} +.paid-hero{display:flex;gap:16px;align-items:center} +.paid-hero .ok{flex:none;width:52px;height:52px;border-radius:6px;display:grid;place-items:center;font-size:28px;color:#fff;background:var(--mc-green);box-shadow:inset 0 2px 0 var(--mc-green-hi),inset 0 -4px 0 var(--mc-green-lo)} +.paid-hero b{font-size:20px} +.paid-hero p{margin:2px 0 0;font-size:14px;color:var(--ink-3)} +.pmsg{font-size:13.5px;padding:10px 14px;border-radius:10px;background:rgba(255,255,255,.7);color:var(--ink-2)} +.pmsg.bad{background:rgba(224,83,61,.07);color:#A33A2A} +.plog{width:100%;border-collapse:collapse;font-size:13px} +.plog td{padding:7px 4px;border-top:1px solid var(--line);color:var(--ink-2)} +.plog code{font-size:12px} +.pass .stub .code{font-size:20px;word-break:break-all} + +/* ---------- 演示控制台(只在预览站) ---------- */ +.demo-fab{margin-left:4px;height:24px;padding:0 9px;border-radius:4px;border:1.5px solid #8A5A00;background:#FFF4D9;color:#8A5A00;font:700 12px/1 inherit;cursor:pointer;vertical-align:middle} +.demo-fab[aria-expanded=true]{background:#8A5A00;color:#FFF4D9} +.demo{position:fixed;right:16px;top:calc(46px + env(safe-area-inset-top,0px));z-index:31;width:min(380px,calc(100vw - 32px));max-height:min(70vh,640px);overflow:auto;padding:16px;border-radius:var(--r);background:rgba(255,255,255,.97);box-shadow:0 30px 60px -30px rgba(30,36,64,.55),inset 0 0 0 1px rgba(30,36,64,.08)} +.demo h4{margin:0 0 2px;font-size:15px} +.demo .mut{font-size:12.5px;color:var(--ink-3)} +.demo .grp{display:flex;flex-wrap:wrap;gap:6px;margin:8px 0 12px} +.demo button.d{height:32px;padding:0 10px;border-radius:4px;border:2px solid var(--stone-edge,#C9CED8);background:#fff;font:600 12.5px/1 inherit;color:var(--ink);cursor:pointer} +.demo button.d:hover{border-color:var(--mc-green)} +.demo .clock{font:700 15px/1.4 ui-monospace,Menlo,Consolas,monospace} +.demo .out{font-size:12.5px;padding:8px 10px;border-radius:8px;background:#F4F6FB;color:var(--ink-2);margin-bottom:10px} +.demo ul{list-style:none;margin:0;padding:0;font-size:12.5px} +.demo li{display:grid;grid-template-columns:56px 1fr;gap:6px;padding:5px 0;border-top:1px solid var(--line)} +.demo li time{font-family:ui-monospace,Menlo,Consolas,monospace;color:var(--ink-3);font-size:11.5px} +.demo li .c{font-size:11px;font-weight:700;margin-right:4px} +.demo li .c.afdian{color:#7A55D8} .demo li .c.alipay{color:#1677FF} + +@media (prefers-reduced-motion:reduce){.waitline::before{animation:none}} diff --git a/backend/pay-proto/preview/assets/pay.js b/backend/pay-proto/preview/assets/pay.js new file mode 100644 index 0000000..6898982 --- /dev/null +++ b/backend/pay-proto/preview/assets/pay.js @@ -0,0 +1,118 @@ +/* 自助渲染 · 下单与收银台共用(预览站) + - 接口:/svc/api/*(预览机上的收款服务,全模拟渠道) + - 本机订单:照独角数卡「浏览器缓存查单」—— 这台浏览器下过的单记在 localStorage,换设备用「订单号 + 取件码」查 + - 演示控制台:快进时钟 / 立即跑定时任务 / 模拟风控等,只在预览站有 */ +(function () { + 'use strict'; + var API = 'svc/api'; + var KEY = 'jz_orders_v1'; + var TPLS = [ + {k: 'stand', n: '站立正反', s: '正面站着,背景干净', c: '#8a8f98'}, + {k: 'standb', n: '站立正反(虚化)', s: '同上,背景虚化', c: '#6f7680'}, + {k: 'wheat', n: '麦田萤火', s: '麦田、暖光、萤火虫', c: '#a8863a'}, + {k: 'beach', n: '海边自拍', s: '海边,天光', c: '#4a7fa5'}, + {k: 'boom', n: '不看爆炸', s: '身后爆炸,头也不回', c: '#a2563f'}, + {k: 'sakura', n: '飞跃樱花林', s: '樱花林,动态', c: '#b07a92'}, + {k: 'airship', n: '空艇巡游', s: '坐飞空艇巡航', c: '#5e7f8f'} + ]; + var STATE = {unpaid: '待付款', waiting: '已付款 · 排队中', working: '渲染中', done: '已完成', failed: '渲染失败', + closed: '已关闭', void: '已注销'}; + + function api(method, path, body) { + return fetch(API + path, {method: method, cache: 'no-store', + headers: body ? {'Content-Type': 'application/json'} : {}, body: body ? JSON.stringify(body) : undefined}) + .then(function (r) { return r.json().catch(function () { return {ok: false, error: '服务器没回应'}; }); }) + .catch(function () { return {ok: false, error: '网络不通,稍后再试'}; }); + } + function esc(s) { return String(s == null ? '' : s).replace(/[&<>"']/g, function (c) { + return {'&': '&', '<': '<', '>': '>', '"': '"', "'": '''}[c]; }); } + function left(sec) { + sec = Math.max(0, Math.round(sec)); + var h = Math.floor(sec / 3600), m = Math.floor(sec % 3600 / 60), s = sec % 60; + return h ? (h + ' 小时 ' + m + ' 分') : ((m < 10 ? '0' : '') + m + ':' + (s < 10 ? '0' : '') + s); + } + function hm(ts) { return new Date(ts * 1000).toLocaleTimeString('zh-CN', {hour12: false, timeZone: 'Asia/Shanghai'}); } + function full(ts) { return new Date(ts * 1000).toLocaleString('zh-CN', {hour12: false, timeZone: 'Asia/Shanghai'}); } + function qrSvg(text) { + try { var q = qrcode(0, 'M'); q.addData(text); q.make(); return q.createSvgTag({cellSize: 4, margin: 0, scalable: true}); } + catch (e) { return ''; } + } + function orders() { try { return JSON.parse(localStorage.getItem(KEY) || '[]') || []; } catch (e) { return []; } } + function saveOrder(o) { + try { + var l = orders().filter(function (x) { return x.oid !== o.oid; }); + l.unshift(o); localStorage.setItem(KEY, JSON.stringify(l.slice(0, 30))); + } catch (e) {} + } + function tokenOf(oid) { var o = orders().filter(function (x) { return x.oid === oid; })[0]; return o ? o.t : ''; } + + /* ---------------- 演示控制台 ---------------- */ + var KIND = {order_created: '下单', payment_created: '建支付单', notify: '收到回调', settle: '到账处理', close: '关单', + payment_expired: '支付单过期', order_closed: '订单超时关闭', buyer_check: '买家点「付好了没反应」', todo: '进待办', + mock_paid: '(模拟)买家付款', card_purchase: '按买卡密处理', breaker_open: '支付宝熔断', create_failed: '生成付款失败', + query_failed: '查单失败', todo_resolved: '待办已处理'}; + var RES = {activated: '激活订单', reopened: '恢复并激活', dup_trade: '重复,忽略', short: '金额不足', duplicate: '重复付款', + late: '迟到付款', ok: '验证通过', webhook_soon: '稍后推送回调', drop_webhook: '回调丢失(模拟)', + notify_soon: '稍后推送通知', drop_notify: '通知丢失(模拟)', '验签失败': '验签失败,丢弃'}; + var CH = {afdian: '爱发电', alipay: '支付宝', 'mock-afdian': '爱发电', 'mock-alipay': '支付宝'}; + var demo = {view: null, onChange: null}; + + function demoUI() { + var fab = document.createElement('button'); + fab.className = 'demo-fab'; fab.type = 'button'; fab.textContent = '演示控制台'; + fab.setAttribute('aria-expanded', 'false'); + var box = document.createElement('div'); box.className = 'demo'; box.hidden = true; + box.innerHTML = '

演示控制台

只在预览站有:付款全部走模拟的爱发电 / 支付宝,不会扣钱。
' + + '
演示时钟(快进用来看超时关单)
—
' + + '
' + + '
' + + '
场景
' + + '' + + '' + + '打开收款后台
' + + '
这张单的流水(新的在上)
  • 还没有
'; + document.body.appendChild(box); + var rib = document.querySelector('.ribbon'); /* 放进顶部「设计预览版」横幅,不压页面内容 */ + if (rib) rib.appendChild(fab); else { fab.style.cssText = 'position:fixed;right:16px;top:16px;z-index:30'; document.body.appendChild(fab); } + fab.onclick = function () { box.hidden = !box.hidden; fab.setAttribute('aria-expanded', String(!box.hidden)); }; + function out(t) { var o = document.getElementById('dOut'); o.hidden = false; o.textContent = t; } + function run(body, msg) { + out('执行中…'); + return api('POST', '/demo', body).then(function (j) { + var jobs = j.jobs ? ' 定时任务:' + Object.keys(j.jobs).map(function (k) { return k + ' ' + j.jobs[k]; }).join(',') : ''; + out((j.ok ? (msg || '完成。') : ('没成功:' + (j.error || ''))) + jobs); + if (demo.onChange) demo.onChange(); + }); + } + [].forEach.call(box.querySelectorAll('[data-ff]'), function (b) { + b.onclick = function () { run({kind: 'clock', seconds: +b.dataset.ff}, '时钟已快进,并跑了一轮定时任务。'); }; + }); + box.querySelector('[data-k=jobs]').onclick = function () { run({kind: 'jobs'}, '已跑一轮。'); }; + box.querySelector('[data-k=risk_on]').onclick = function () { + run({kind: 'alipay_risk', on: true}, '支付宝网关会返回风控错误码:现在点「支付宝扫码」会触发熔断,这个选项随即变灰。'); }; + box.querySelector('[data-k=risk_off]').onclick = function () { + api('POST', '/demo', {kind: 'alipay_risk', on: false}).then(function () { run({kind: 'breaker_reset'}, '风控已解除,支付宝恢复可用。'); }); }; + box.querySelector('[data-k=direct]').onclick = function () { + run({kind: 'afdian_direct', amount: 12}, '模拟了一笔没带订单号的爱发电成交:系统按「买卡密」处理,不去猜是哪张单;后台可以按爱发电订单号认领。'); }; + box.querySelector('[data-k=forge]').onclick = function () { + var p = demo.view && demo.view.payments.filter(function (x) { return x.channel === 'afdian' && x.state === 'created'; })[0]; + if (!p) { out('先在收银台选「爱发电」生成一张支付单,再伪造它的回调。'); return; } + run({kind: 'afdian_forge', pay_id: p.pay_id}, '发出了一条签名不对、金额 ¥999 的回调。看流水:验签失败,被丢弃。'); + }; + } + function demoUpdate(v) { + demo.view = v; + var c = document.getElementById('dClock'); if (c && v) c.textContent = full(v.now); + var ul = document.getElementById('dEv'); if (!ul || !v) return; + ul.innerHTML = (v.events || []).map(function (e) { + var r = RES.hasOwnProperty(e.result) ? RES[e.result] : e.result; + return '
  • ' + (e.channel ? '' + + esc(CH[e.channel] || e.channel) + '' : '') + esc(KIND[e.kind] || e.kind) + + (r && r !== 'created' && r !== 'unpaid' && r !== 'closed' ? ' · ' + esc(r) + '' : '') + '
  • '; + }).join('') || '
  • 还没有
  • '; + } + + window.JZPay = {api: api, esc: esc, left: left, full: full, qrSvg: qrSvg, orders: orders, saveOrder: saveOrder, + tokenOf: tokenOf, TPLS: TPLS, STATE: STATE, demo: demo, demoUpdate: demoUpdate}; + if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', demoUI); else demoUI(); +})(); diff --git a/backend/pay-proto/static/qrcode.min.js b/backend/pay-proto/preview/assets/vendor/qrcode.min.js similarity index 100% rename from backend/pay-proto/static/qrcode.min.js rename to backend/pay-proto/preview/assets/vendor/qrcode.min.js diff --git a/backend/pay-proto/preview/cms/pay.html b/backend/pay-proto/preview/cms/pay.html new file mode 100644 index 0000000..1c191a0 --- /dev/null +++ b/backend/pay-proto/preview/cms/pay.html @@ -0,0 +1,117 @@ + + + + + + +收款后台 · 金钻客栈(设计预览) + + + + + + +
    设计预览版,收款全部走模拟渠道
    +
    +
    +
    +

    收款后台

    到账、关单、对账都是自动的。这里只处理系统判断不了的情况。

    演示时钟 —

    + +
    +

    后台口令

    预览机 /var/lib/jz-pay-proto/admin_token 里的那串。

    +
    + +
    + + +
    + + + diff --git a/backend/pay-proto/preview/order.html b/backend/pay-proto/preview/order.html new file mode 100644 index 0000000..572f37d --- /dev/null +++ b/backend/pay-proto/preview/order.html @@ -0,0 +1,139 @@ + + + + + + +自助渲染 · 金钻客栈(设计预览) + + + + + + + +
    设计预览版,方括号里的是占位内容
    +
    +
    +

    自助模板渲染

    传一张皮肤,选个模板,等一会儿就能拿到渲染图。

    渲染机在线 · 每张 6 元起

    +

    怎么下单?

    下过单了?取图我的订单
    +
    +

    网页下单

    每个模板出两张:一张压缩过的,一张无压缩 16bit 的。一张 ¥6。

    +

    选模板

    可以多选,选几个出几张。

    +

    分辨率

    默认 1000px 就是网易我的世界头图的标准尺寸,出图最快。

    +
    + +
    +

    皮肤

    .png 文件,64×64 的标准皮肤最稳。质检在你自己的浏览器里完成。

    +
    + +
    还没选皮肤
    +
    +
    ¥0还没选模板
    +
    +
    +

    我的订单

    这台浏览器下过的单都在这里。换了设备,用订单号和取件码查。

    +
    +
    + +
    +

    非官方 Minecraft 产品,与 Mojang 无关
    有问题来 QQ 群找金钻:123456789

    +
    + + +
    金钻客栈© 2026 example.comQQ 群:屑钻小窝 123456789备案号(已移除)
    + + + + + diff --git a/backend/pay-proto/preview/pay.html b/backend/pay-proto/preview/pay.html new file mode 100644 index 0000000..5b3d3c3 --- /dev/null +++ b/backend/pay-proto/preview/pay.html @@ -0,0 +1,183 @@ + + + + + + +收银台 · 金钻客栈(设计预览) + + + + + + + +
    设计预览版,方括号里的是占位内容
    +
    +
    +
    +

    收银台

    选一种方式付款,到账后自动开始渲染。

    ← 回到自助渲染

    +
    +
    +
    +
    订单号
    —
    读取中
    +
    应付
    —
    + + + + + +
    +
    +
    取件码
    —
    + +
    记好订单号和取件码,换了手机也能查单、取图。
    + + 我的订单 +
    +
    +
    +

    非官方 Minecraft 产品,与 Mojang 无关
    有问题来 QQ 群找金钻:123456789

    +
    + + +
    金钻客栈© 2026 example.comQQ 群:屑钻小窝 123456789备案号(已移除)
    + + + + + + diff --git a/backend/pay-proto/static/admin.html b/backend/pay-proto/static/admin.html deleted file mode 100644 index d51c0e1..0000000 --- a/backend/pay-proto/static/admin.html +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - -收款原型后台 - - -
    -
    -

    收款原型 · 后台

    原型 · 全部为模拟渠道。演示时钟 —
    - ← 回付款页 -
    - -
    -

    后台口令

    -
    -
    - -
    - - -
    - - - diff --git a/backend/pay-proto/static/index.html b/backend/pay-proto/static/index.html deleted file mode 100644 index c8ee177..0000000 --- a/backend/pay-proto/static/index.html +++ /dev/null @@ -1,337 +0,0 @@ - - - - - - -金钻收款原型 - - - -
    - 金钻工坊 · 收款原型 - 原型 · 全部为模拟渠道,不会扣钱 - 后台 → -
    - -
    -
    -
    -

    网页下单

    -

    原型里省略了传皮肤、选模板,只选张数。每张 ¥6。

    -
    -
    - ¥12 -
    -
    -
    - - -
    - - -
    - - - - - diff --git a/backend/pay-proto/tests/test_proto.py b/backend/pay-proto/tests/test_proto.py index 19e61c6..e7d9d02 100644 --- a/backend/pay-proto/tests/test_proto.py +++ b/backend/pay-proto/tests/test_proto.py @@ -117,6 +117,15 @@ try: check("爱发电付款 → Webhook 验签 + 精确反查 → 订单 waiting", v["order"]["state"] == "waiting", [e["kind"] + ":" + e["result"] for e in v["events"][:4]]) + # 1b. 按真实下单内容建单:模板 × 1 张皮肤,金额按模板数算,非法模板/分辨率被过滤 + st, jt = req("POST", "/api/order", {"templates": ["stand", "sakura", "nope", "stand"], "res": 2048, "skin_name": "a.png"}) + o = jt["order"] + check("下单带模板:去重、丢掉不认识的模板,2 个模板 = ¥12,分辨率 2048,皮肤名带回", + o["amount"] == 12 and [t["n"] for t in o["templates"]] == ["站立正反", "飞跃樱花林"] and o["res"] == 2048 + and o["skin_name"] == "a.png" and len(jt["token"]) == 10, o) + st, jt = req("POST", "/api/order", {"templates": ["wheat"], "res": 777}) + check("不支持的分辨率 → 回落 1000", jt["order"]["res"] == 1000, jt["order"]["res"]) + # 2. 同一笔 Webhook 重复推送 → 幂等 from cryptography.hazmat.primitives import hashes, serialization from cryptography.hazmat.primitives.asymmetric import padding