backend: 接入 SQLite 数据库 + 开单后台按功能重写
- store.py(新):卡密 / 订单信息 / 爱发电账本 / 呼叫记录 / 小块状态进 <DATA_DIR>/ys.db; 第一次启动自动建库并导入旧 JSON(旧文件不动),admin.py db check/backup/export - server.py / admin.py 存取换到库上,路由与接口字段不变;calls.jsonl 照旧追加 - 管理接口新增 calls / call-done / retry,codes 支持 q 搜索 - ys_admin.py 页面重写:待处理 / 订单 / 卡密 / 福利券 / 呼叫·反馈 / 开单工具 - tests/数据库测试.py(37 条,假数据);回归 27 条照旧全过 - 交接说明(数据库一节、面板一节)、回执第二轮、交付清单更新 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
+145
-92
@@ -5,7 +5,8 @@
|
|||||||
|
|
||||||
设计要点
|
设计要点
|
||||||
* 纯标准库(http.server),零依赖、内存小 —— 这台机器只有 1.6G 内存
|
* 纯标准库(http.server),零依赖、内存小 —— 这台机器只有 1.6G 内存
|
||||||
* 队列就是文件系统:orders/<订单号>/meta.json 里 state 字段 = 状态
|
* 数据在 SQLite(<DATA_DIR>/ys.db,见 store.py):卡密 / 订单 / 爱发电账本 / 呼叫记录 / 小块状态;
|
||||||
|
订单的 state 字段 = 队列状态。皮肤和成品**文件**还在 orders/<订单号>/ 目录里
|
||||||
* 渲染机主动出站拉单(宿主只能出站),服务器不主动连宿主
|
* 渲染机主动出站拉单(宿主只能出站),服务器不主动连宿主
|
||||||
* 管理操作全走本地 CLI(admin.py),**不开任何公网管理入口**
|
* 管理操作全走本地 CLI(admin.py),**不开任何公网管理入口**
|
||||||
|
|
||||||
@@ -123,6 +124,11 @@ LOG_FILE = os.path.join(ROOT, "server.log")
|
|||||||
|
|
||||||
os.makedirs(ROOT, exist_ok=True) # 模块导入时就要保证目录存在(token 文件要写进去)
|
os.makedirs(ROOT, exist_ok=True) # 模块导入时就要保证目录存在(token 文件要写进去)
|
||||||
|
|
||||||
|
# 数据库(2026-10-05):第一次启动自动建库,并把旧版 JSON(codes.json / meta.json / 账本 …)导进来,
|
||||||
|
# 旧文件原样留着。回退:python3 store.py export。详见 store.py 开头和交接说明「数据库」一节。
|
||||||
|
import store # noqa: E402 同目录,零依赖
|
||||||
|
STORE = store.Store(ROOT)
|
||||||
|
|
||||||
HOST, PORT = "localhost", 8080
|
HOST, PORT = "localhost", 8080
|
||||||
KEEP_HOURS = 72 # 成品在服务器保留时长
|
KEEP_HOURS = 72 # 成品在服务器保留时长
|
||||||
OFFLINE_AFTER = 1500 # 心跳超过这么多秒 = 离线
|
OFFLINE_AFTER = 1500 # 心跳超过这么多秒 = 离线
|
||||||
@@ -245,7 +251,7 @@ def gift_batches():
|
|||||||
kind(券的种类:render=渲染图 / standee=立牌 / keychain=钥匙扣 / …未来扩展)
|
kind(券的种类:render=渲染图 / standee=立牌 / keychain=钥匙扣 / …未来扩展)
|
||||||
shape(版式:square/横版 portrait…留字段,先不用)
|
shape(版式:square/横版 portrait…留字段,先不用)
|
||||||
"""
|
"""
|
||||||
d = jload(GIFTS_FILE, {})
|
d = STORE.kv_get("gifts", {})
|
||||||
if not isinstance(d, dict) or not isinstance(d.get("batches"), list):
|
if not isinstance(d, dict) or not isinstance(d.get("batches"), list):
|
||||||
d = {"batches": []}
|
d = {"batches": []}
|
||||||
return d
|
return d
|
||||||
@@ -310,7 +316,7 @@ def gift_public():
|
|||||||
def gift_claim_days():
|
def gift_claim_days():
|
||||||
"""福利券领到后**多久必须用掉**(金钻 2026-10-02:领了不用要逾期)"""
|
"""福利券领到后**多久必须用掉**(金钻 2026-10-02:领了不用要逾期)"""
|
||||||
try:
|
try:
|
||||||
return max(1, int((jload(GIFTS_FILE, {}) or {}).get("claim_days") or 7))
|
return max(1, int((STORE.kv_get("gifts", {}) or {}).get("claim_days") or 7))
|
||||||
except (TypeError, ValueError):
|
except (TypeError, ValueError):
|
||||||
return 7
|
return 7
|
||||||
|
|
||||||
@@ -414,7 +420,7 @@ def gift_claim(bid, token, ip):
|
|||||||
_days = gift_claim_days()
|
_days = gift_claim_days()
|
||||||
cs[pick]["claim_expire"] = (now() + timedelta(days=_days)).isoformat(timespec="seconds")
|
cs[pick]["claim_expire"] = (now() + timedelta(days=_days)).isoformat(timespec="seconds")
|
||||||
cs[pick]["gift_kind"] = b.get("kind") or "render"
|
cs[pick]["gift_kind"] = b.get("kind") or "render"
|
||||||
jsave(CODES_FILE, cs)
|
save_codes(cs)
|
||||||
log("福利券 %s 被领走:%s(%s)" % (bid, pick, ip))
|
log("福利券 %s 被领走:%s(%s)" % (bid, pick, ip))
|
||||||
rec = load_codes().get(pick) or {}
|
rec = load_codes().get(pick) or {}
|
||||||
mx = int(rec.get("n_max") or rec.get("n_fix") or 1)
|
mx = int(rec.get("n_max") or rec.get("n_fix") or 1)
|
||||||
@@ -487,7 +493,7 @@ def gift_batch_new(name, count=20, n_fix=1, n_free=False, tpl="", lock_tpl=False
|
|||||||
"enabled": True, "direct": bool(direct),
|
"enabled": True, "direct": bool(direct),
|
||||||
"created": now().isoformat(timespec="seconds"),
|
"created": now().isoformat(timespec="seconds"),
|
||||||
})
|
})
|
||||||
jsave(GIFTS_FILE, d)
|
STORE.kv_put("gifts", d)
|
||||||
codes = gift_batch_add(bid, count, direct=direct)
|
codes = gift_batch_add(bid, count, direct=direct)
|
||||||
log("福利券批次建好 %s「%s」%d 张(%s)" % (
|
log("福利券批次建好 %s「%s」%d 张(%s)" % (
|
||||||
bid, name, len(codes), "不限张数" if n_free else "最多 %d 张" % n_fix))
|
bid, name, len(codes), "不限张数" if n_free else "最多 %d 张" % n_fix))
|
||||||
@@ -526,7 +532,7 @@ def gift_batch_add(bid, count=20, direct=None):
|
|||||||
for c in got:
|
for c in got:
|
||||||
if c in cs:
|
if c in cs:
|
||||||
cs[c]["gift"] = bid
|
cs[c]["gift"] = bid
|
||||||
jsave(CODES_FILE, cs)
|
save_codes(cs)
|
||||||
log("福利券批次 %s 补货 %d 张" % (bid, len(got)))
|
log("福利券批次 %s 补货 %d 张" % (bid, len(got)))
|
||||||
return got
|
return got
|
||||||
|
|
||||||
@@ -539,7 +545,7 @@ def gift_batch_off(bid):
|
|||||||
if not b:
|
if not b:
|
||||||
raise ValueError("没有这个批次:%s" % bid)
|
raise ValueError("没有这个批次:%s" % bid)
|
||||||
b["enabled"] = False
|
b["enabled"] = False
|
||||||
jsave(GIFTS_FILE, d)
|
STORE.kv_put("gifts", d)
|
||||||
log("福利券批次 %s 已收摊" % bid)
|
log("福利券批次 %s 已收摊" % bid)
|
||||||
return b
|
return b
|
||||||
|
|
||||||
@@ -724,6 +730,20 @@ def now():
|
|||||||
return datetime.now(CST)
|
return datetime.now(CST)
|
||||||
|
|
||||||
|
|
||||||
|
def add_call(rec):
|
||||||
|
"""记一条「呼叫金钻」/ 反馈 / 部分失败。
|
||||||
|
|
||||||
|
数据库 calls 表是正本(后台和限频都查它);**同时照旧追加一行到 calls.jsonl** ——
|
||||||
|
手机通知那边是盯着这个文件的(那段不在这份代码里),不能让它断。
|
||||||
|
"""
|
||||||
|
STORE.call_add(rec)
|
||||||
|
try:
|
||||||
|
with open(CALLS_FILE, "a", encoding="utf-8") as f:
|
||||||
|
f.write(json.dumps(rec, ensure_ascii=False) + "\n")
|
||||||
|
except OSError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
def log(*a):
|
def log(*a):
|
||||||
line = "[%s] %s" % (now().strftime("%Y-%m-%d %H:%M:%S"), " ".join(str(x) for x in a))
|
line = "[%s] %s" % (now().strftime("%Y-%m-%d %H:%M:%S"), " ".join(str(x) for x in a))
|
||||||
try:
|
try:
|
||||||
@@ -811,7 +831,7 @@ def admin_token():
|
|||||||
|
|
||||||
AT = admin_token()
|
AT = admin_token()
|
||||||
|
|
||||||
HOME_IPS = (jload(HB_IPS_FILE, {}) or {}).get("ips") or [] # 重启后还记得上次认出的出口 IP
|
HOME_IPS = (STORE.kv_get("home_ips", {}) or {}).get("ips") or [] # 重启后还记得上次认出的出口 IP
|
||||||
|
|
||||||
|
|
||||||
def note_home_ip(ip):
|
def note_home_ip(ip):
|
||||||
@@ -843,7 +863,12 @@ def new_owner_token():
|
|||||||
|
|
||||||
# ----------------------------------------------------------------- 兑换码
|
# ----------------------------------------------------------------- 兑换码
|
||||||
def load_codes():
|
def load_codes():
|
||||||
return jload(CODES_FILE, {})
|
return STORE.codes_all()
|
||||||
|
|
||||||
|
|
||||||
|
def save_codes(codes):
|
||||||
|
"""整份写回卡密(一个事务里只改有变化的行)。调用方照旧要在 `with LOCK:` 里 load → 改 → save。"""
|
||||||
|
STORE.codes_save(codes)
|
||||||
|
|
||||||
|
|
||||||
def gen_codes(n, batch="", value=6, platform="", tpl="", state="active", is_set=False, direct=False,
|
def gen_codes(n, batch="", value=6, platform="", tpl="", state="active", is_set=False, direct=False,
|
||||||
@@ -880,7 +905,7 @@ def gen_codes(n, batch="", value=6, platform="", tpl="", state="active", is_set=
|
|||||||
"n_fix": int(n_fix or 0), "n_max": int(n_max or 0),
|
"n_fix": int(n_fix or 0), "n_max": int(n_max or 0),
|
||||||
"lock_tpl": bool(lock_tpl), "n_free": bool(n_free)}
|
"lock_tpl": bool(lock_tpl), "n_free": bool(n_free)}
|
||||||
made.append(c)
|
made.append(c)
|
||||||
jsave(CODES_FILE, codes)
|
save_codes(codes)
|
||||||
return made
|
return made
|
||||||
|
|
||||||
|
|
||||||
@@ -909,7 +934,7 @@ def code_info(raw):
|
|||||||
c = (raw or "").strip().upper()
|
c = (raw or "").strip().upper()
|
||||||
if not CODE_RE.match(c):
|
if not CODE_RE.match(c):
|
||||||
return None
|
return None
|
||||||
rec = (load_codes() or {}).get(c)
|
rec = STORE.code_get(c)
|
||||||
if not rec:
|
if not rec:
|
||||||
return None
|
return None
|
||||||
st = code_state(rec)
|
st = code_state(rec)
|
||||||
@@ -945,31 +970,20 @@ def note_tpl_time(tpl, sec):
|
|||||||
return
|
return
|
||||||
if not tpl or sec <= 0 or sec > 3600:
|
if not tpl or sec <= 0 or sec > 3600:
|
||||||
return
|
return
|
||||||
try:
|
with LOCK:
|
||||||
d = json.load(open(TPL_TIMES_FILE, encoding="utf-8"))
|
d = STORE.kv_get("tpl_times", {})
|
||||||
if not isinstance(d, dict):
|
if not isinstance(d, dict):
|
||||||
d = {}
|
d = {}
|
||||||
except Exception:
|
arr = list(d.get(tpl) or [])
|
||||||
d = {}
|
arr.append(round(sec, 1))
|
||||||
arr = list(d.get(tpl) or [])
|
d[tpl] = arr[-50:]
|
||||||
arr.append(round(sec, 1))
|
STORE.kv_put("tpl_times", d)
|
||||||
d[tpl] = arr[-50:]
|
|
||||||
try:
|
|
||||||
tmp = TPL_TIMES_FILE + ".tmp"
|
|
||||||
with open(tmp, "w", encoding="utf-8") as f:
|
|
||||||
json.dump(d, f, ensure_ascii=False)
|
|
||||||
os.replace(tmp, TPL_TIMES_FILE) # 原子替换,断电不会写坏
|
|
||||||
except OSError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
def tpl_eta_sec(templates, n_img=1):
|
def tpl_eta_sec(templates, n_img=1):
|
||||||
"""这单大概要渲多久:按模板历史耗时求和;没样本的模板按每张 60 秒兜底,再加 20 秒收尾。"""
|
"""这单大概要渲多久:按模板历史耗时求和;没样本的模板按每张 60 秒兜底,再加 20 秒收尾。"""
|
||||||
try:
|
d = STORE.kv_get("tpl_times", {})
|
||||||
d = json.load(open(TPL_TIMES_FILE, encoding="utf-8"))
|
if not isinstance(d, dict):
|
||||||
if not isinstance(d, dict):
|
|
||||||
d = {}
|
|
||||||
except Exception:
|
|
||||||
d = {}
|
d = {}
|
||||||
per = []
|
per = []
|
||||||
for t in (templates or []):
|
for t in (templates or []):
|
||||||
@@ -1127,7 +1141,7 @@ def redeem_bind(codes_in, oid):
|
|||||||
codes[c]["used"] = False
|
codes[c]["used"] = False
|
||||||
codes[c]["order"] = oid
|
codes[c]["order"] = oid
|
||||||
codes[c]["bound_at"] = ts
|
codes[c]["bound_at"] = ts
|
||||||
jsave(CODES_FILE, codes)
|
save_codes(codes)
|
||||||
return True, None, good
|
return True, None, good
|
||||||
|
|
||||||
|
|
||||||
@@ -1145,7 +1159,7 @@ def unbind_codes(codes_list, oid):
|
|||||||
r.pop("bound_at", None)
|
r.pop("bound_at", None)
|
||||||
hit = True
|
hit = True
|
||||||
if hit:
|
if hit:
|
||||||
jsave(CODES_FILE, codes)
|
save_codes(codes)
|
||||||
|
|
||||||
|
|
||||||
def burn_codes(codes_list, oid):
|
def burn_codes(codes_list, oid):
|
||||||
@@ -1163,7 +1177,7 @@ def burn_codes(codes_list, oid):
|
|||||||
codes[c]["used"] = False
|
codes[c]["used"] = False
|
||||||
codes[c]["order"] = oid
|
codes[c]["order"] = oid
|
||||||
codes[c]["bound_at"] = now().isoformat(timespec="seconds")
|
codes[c]["bound_at"] = now().isoformat(timespec="seconds")
|
||||||
jsave(CODES_FILE, codes)
|
save_codes(codes)
|
||||||
|
|
||||||
|
|
||||||
def settle_codes(oid, why=""):
|
def settle_codes(oid, why=""):
|
||||||
@@ -1185,7 +1199,7 @@ def settle_codes(oid, why=""):
|
|||||||
r["settled"] = why
|
r["settled"] = why
|
||||||
n += 1
|
n += 1
|
||||||
if n:
|
if n:
|
||||||
jsave(CODES_FILE, codes)
|
save_codes(codes)
|
||||||
return n
|
return n
|
||||||
|
|
||||||
|
|
||||||
@@ -1238,25 +1252,31 @@ def order_dir(oid):
|
|||||||
|
|
||||||
|
|
||||||
def read_meta(oid):
|
def read_meta(oid):
|
||||||
p = os.path.join(order_dir(oid), "meta.json")
|
"""订单信息(数据库 orders 表)。没有这单 / 已清理 → None。"""
|
||||||
if not os.path.exists(p):
|
if not oid or not isinstance(oid, str):
|
||||||
return None
|
return None
|
||||||
return jload(p, None)
|
return STORE.order_get(oid)
|
||||||
|
|
||||||
|
|
||||||
def write_meta(oid, meta):
|
def write_meta(oid, meta):
|
||||||
jsave(os.path.join(order_dir(oid), "meta.json"), meta)
|
STORE.order_put(oid, meta)
|
||||||
|
|
||||||
|
|
||||||
def list_orders(states=None):
|
def list_orders(states=None):
|
||||||
out = []
|
"""按单号排序的订单列表;states 给了就只要这几种状态(走索引,不再一单一单读文件)。"""
|
||||||
if not os.path.isdir(ORDERS):
|
return STORE.orders(states)
|
||||||
return out
|
|
||||||
for oid in sorted(os.listdir(ORDERS)):
|
|
||||||
m = read_meta(oid)
|
def drop_order(oid):
|
||||||
if m and (states is None or m.get("state") in states):
|
"""单没建成(提交中途失败):删目录 + 删行。"""
|
||||||
out.append(m)
|
shutil.rmtree(order_dir(oid), ignore_errors=True)
|
||||||
return out
|
STORE.order_drop(oid)
|
||||||
|
|
||||||
|
|
||||||
|
def purge_order(oid):
|
||||||
|
"""到期清理:删文件,行留着记账(之后 read_meta 当它不存在)。"""
|
||||||
|
shutil.rmtree(order_dir(oid), ignore_errors=True)
|
||||||
|
STORE.order_purge(oid)
|
||||||
|
|
||||||
|
|
||||||
import pngcheck # PNG 结构核验(防夹带)—— 同目录,零依赖
|
import pngcheck # PNG 结构核验(防夹带)—— 同目录,零依赖
|
||||||
@@ -1317,7 +1337,7 @@ def sync_voucher_nfix(m):
|
|||||||
rec["n_fix"] = img_total(m)
|
rec["n_fix"] = img_total(m)
|
||||||
hit = True
|
hit = True
|
||||||
if hit:
|
if hit:
|
||||||
jsave(CODES_FILE, cs)
|
save_codes(cs)
|
||||||
|
|
||||||
|
|
||||||
def img_total(m):
|
def img_total(m):
|
||||||
@@ -1405,7 +1425,7 @@ def heartbeat(force=False):
|
|||||||
c = _status_cache
|
c = _status_cache
|
||||||
if (not force) and c["v"] is not None and (time.monotonic() - c["t"]) < STATUS_TTL:
|
if (not force) and c["v"] is not None and (time.monotonic() - c["t"]) < STATUS_TTL:
|
||||||
return c["v"]
|
return c["v"]
|
||||||
hb = jload(HB_FILE, {})
|
hb = STORE.kv_get("heartbeat", {}) or {}
|
||||||
last = hb.get("ts")
|
last = hb.get("ts")
|
||||||
online = False
|
online = False
|
||||||
if last:
|
if last:
|
||||||
@@ -1487,7 +1507,7 @@ def _edit_code_locked(c, patch):
|
|||||||
r[k] = str(p[k] or "")[:20]
|
r[k] = str(p[k] or "")[:20]
|
||||||
if r.get("lock_tpl") and not (r.get("tpl") or "").strip():
|
if r.get("lock_tpl") and not (r.get("tpl") or "").strip():
|
||||||
return False, "要锁定模板,得先给这张码带模板"
|
return False, "要锁定模板,得先给这张码带模板"
|
||||||
jsave(CODES_FILE, cs)
|
save_codes(cs)
|
||||||
return r, None
|
return r, None
|
||||||
|
|
||||||
|
|
||||||
@@ -1684,6 +1704,8 @@ class H(BaseHTTPRequestHandler):
|
|||||||
return self.admin_codes(q)
|
return self.admin_codes(q)
|
||||||
if p == "/api/admin/gifts":
|
if p == "/api/admin/gifts":
|
||||||
return self.admin_gifts()
|
return self.admin_gifts()
|
||||||
|
if p == "/api/admin/calls":
|
||||||
|
return self.admin_calls(q)
|
||||||
|
|
||||||
return self.err("not found", 404)
|
return self.err("not found", 404)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
@@ -1758,6 +1780,10 @@ class H(BaseHTTPRequestHandler):
|
|||||||
return self.admin_gift_add()
|
return self.admin_gift_add()
|
||||||
if p == "/api/admin/gift/off":
|
if p == "/api/admin/gift/off":
|
||||||
return self.admin_gift_off()
|
return self.admin_gift_off()
|
||||||
|
if p == "/api/admin/retry":
|
||||||
|
return self.admin_retry()
|
||||||
|
if p == "/api/admin/call-done":
|
||||||
|
return self.admin_call_done()
|
||||||
return self.err("not found", 404)
|
return self.err("not found", 404)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
log("POST %s 异常 %r" % (p, e))
|
log("POST %s 异常 %r" % (p, e))
|
||||||
@@ -1887,7 +1913,7 @@ class H(BaseHTTPRequestHandler):
|
|||||||
return self.err("皮肤文件过大")
|
return self.err("皮肤文件过大")
|
||||||
|
|
||||||
oid = new_oid()
|
oid = new_oid()
|
||||||
while os.path.exists(order_dir(oid)):
|
while os.path.exists(order_dir(oid)) or STORE.order_known(oid):
|
||||||
oid = new_oid()
|
oid = new_oid()
|
||||||
tok = new_owner_token()
|
tok = new_owner_token()
|
||||||
os.makedirs(order_dir(oid), exist_ok=True)
|
os.makedirs(order_dir(oid), exist_ok=True)
|
||||||
@@ -1932,7 +1958,7 @@ class H(BaseHTTPRequestHandler):
|
|||||||
# 同一张码并发提交两次的话两边都会查到「可用」。绑不上 = 被别的提交抢先了。
|
# 同一张码并发提交两次的话两边都会查到「可用」。绑不上 = 被别的提交抢先了。
|
||||||
okb, eb, good = redeem_bind(good, oid)
|
okb, eb, good = redeem_bind(good, oid)
|
||||||
if not okb:
|
if not okb:
|
||||||
shutil.rmtree(order_dir(oid), ignore_errors=True)
|
drop_order(oid)
|
||||||
log("兑换码并发冲突 %s:%s" % (ip, eb))
|
log("兑换码并发冲突 %s:%s" % (ip, eb))
|
||||||
return self.err(eb)
|
return self.err(eb)
|
||||||
meta["codes"] = good
|
meta["codes"] = good
|
||||||
@@ -1942,7 +1968,7 @@ class H(BaseHTTPRequestHandler):
|
|||||||
except Exception:
|
except Exception:
|
||||||
if not prepay:
|
if not prepay:
|
||||||
unbind_codes(good, oid) # 单没建成,码放回去
|
unbind_codes(good, oid) # 单没建成,码放回去
|
||||||
shutil.rmtree(order_dir(oid), ignore_errors=True)
|
drop_order(oid)
|
||||||
raise
|
raise
|
||||||
note_submit(ip)
|
note_submit(ip)
|
||||||
if prepay:
|
if prepay:
|
||||||
@@ -1964,7 +1990,7 @@ class H(BaseHTTPRequestHandler):
|
|||||||
_cs = load_codes()
|
_cs = load_codes()
|
||||||
if newc in _cs:
|
if newc in _cs:
|
||||||
_cs[newc]["order"] = oid
|
_cs[newc]["order"] = oid
|
||||||
jsave(CODES_FILE, _cs)
|
save_codes(_cs)
|
||||||
meta["codes"] = [newc]
|
meta["codes"] = [newc]
|
||||||
with LOCK:
|
with LOCK:
|
||||||
write_meta(oid, meta)
|
write_meta(oid, meta)
|
||||||
@@ -2249,7 +2275,7 @@ class H(BaseHTTPRequestHandler):
|
|||||||
if "测试" in title:
|
if "测试" in title:
|
||||||
log("爱发电回调:测试单(%s),只记账不发码" % title.strip())
|
log("爱发电回调:测试单(%s),只记账不发码" % title.strip())
|
||||||
return self.js({"ec": 200, "em": ""})
|
return self.js({"ec": 200, "em": ""})
|
||||||
led = jload(PAYPLATFORM_LEDGER, {}) or {}
|
led = STORE.ledger_all()
|
||||||
# ⚠️ 2026-10-05(外部复查):幂等原来只认「发过码」。可「对上网页单、激活了」那条路记的是
|
# ⚠️ 2026-10-05(外部复查):幂等原来只认「发过码」。可「对上网页单、激活了」那条路记的是
|
||||||
# code=None + used_by=<单号> —— 同一笔单再推一次(爱发电自己会重试;这个地址又是公开的,
|
# code=None + used_by=<单号> —— 同一笔单再推一次(爱发电自己会重试;这个地址又是公开的,
|
||||||
# 谁都能把报文原样再 POST 一遍)就不算处理过:第二次激活失败(单子已经在排队)→ 掉进
|
# 谁都能把报文原样再 POST 一遍)就不算处理过:第二次激活失败(单子已经在排队)→ 掉进
|
||||||
@@ -2265,7 +2291,7 @@ class H(BaseHTTPRequestHandler):
|
|||||||
led[oid_af] = {"ts": now().isoformat(timespec="seconds"), "status": order.get("status"),
|
led[oid_af] = {"ts": now().isoformat(timespec="seconds"), "status": order.get("status"),
|
||||||
"amount": order.get("show_amount") or order.get("total_amount"),
|
"amount": order.get("show_amount") or order.get("total_amount"),
|
||||||
"code": None, "note": "未付款"}
|
"code": None, "note": "未付款"}
|
||||||
jsave(PAYPLATFORM_LEDGER, led)
|
STORE.ledger_save(led)
|
||||||
return self.js({"ec": 200, "em": ""})
|
return self.js({"ec": 200, "em": ""})
|
||||||
|
|
||||||
real = payplatform_find_order(oid_af)
|
real = payplatform_find_order(oid_af)
|
||||||
@@ -2275,7 +2301,7 @@ class H(BaseHTTPRequestHandler):
|
|||||||
led[oid_af] = {"ts": now().isoformat(timespec="seconds"), "code": None,
|
led[oid_af] = {"ts": now().isoformat(timespec="seconds"), "code": None,
|
||||||
"amount": order.get("show_amount") or order.get("total_amount"),
|
"amount": order.get("show_amount") or order.get("total_amount"),
|
||||||
"note": "接口没查到,待人工核对", "need_human": True}
|
"note": "接口没查到,待人工核对", "need_human": True}
|
||||||
jsave(PAYPLATFORM_LEDGER, led)
|
STORE.ledger_save(led)
|
||||||
return self.js({"ec": 200, "em": ""})
|
return self.js({"ec": 200, "em": ""})
|
||||||
|
|
||||||
n_img_af = payplatform_img_count(real)
|
n_img_af = payplatform_img_count(real)
|
||||||
@@ -2329,7 +2355,7 @@ class H(BaseHTTPRequestHandler):
|
|||||||
"want_order": target, "need": need, "paid": paid,
|
"want_order": target, "need": need, "paid": paid,
|
||||||
"note": "金额不足(应付 ¥%s,实付 ¥%s),待人工核对" % (need, paid),
|
"note": "金额不足(应付 ¥%s,实付 ¥%s),待人工核对" % (need, paid),
|
||||||
"need_human": True}
|
"need_human": True}
|
||||||
jsave(PAYPLATFORM_LEDGER, led)
|
STORE.ledger_save(led)
|
||||||
return self.js({"ec": 200, "em": "", "data": {"content":
|
return self.js({"ec": 200, "em": "", "data": {"content":
|
||||||
"金钻工坊 · 自助模板渲染\n收到你的付款,但金额和订单应付款(¥%s)对不上,已记下来等人工核对。\n"
|
"金钻工坊 · 自助模板渲染\n收到你的付款,但金额和订单应付款(¥%s)对不上,已记下来等人工核对。\n"
|
||||||
"核对没问题就立刻排队出图;如果是付少了,补齐后我们会马上处理。" % need}})
|
"核对没问题就立刻排队出图;如果是付少了,补齐后我们会马上处理。" % need}})
|
||||||
@@ -2358,7 +2384,7 @@ class H(BaseHTTPRequestHandler):
|
|||||||
"(也可以留作支持 🙏)" % (_yuan(paid), _yuan(need), _yuan(over)))
|
"(也可以留作支持 🙏)" % (_yuan(paid), _yuan(need), _yuan(over)))
|
||||||
rec_led["content"] = content
|
rec_led["content"] = content
|
||||||
led[oid_af] = rec_led
|
led[oid_af] = rec_led
|
||||||
jsave(PAYPLATFORM_LEDGER, led)
|
STORE.ledger_save(led)
|
||||||
log("爱发电付款 %s(¥%s)→ 对上网页单 %s → 已激活进队列(靠:%s)"
|
log("爱发电付款 %s(¥%s)→ 对上网页单 %s → 已激活进队列(靠:%s)"
|
||||||
% (oid_af, led[oid_af]["amount"], target, how))
|
% (oid_af, led[oid_af]["amount"], target, how))
|
||||||
return self.js({"ec": 200, "em": "", "data": {"content": content}})
|
return self.js({"ec": 200, "em": "", "data": {"content": content}})
|
||||||
@@ -2377,7 +2403,7 @@ class H(BaseHTTPRequestHandler):
|
|||||||
"sku": sku_txt, "buyer": real.get("user_id"), "remark": real.get("remark"),
|
"sku": sku_txt, "buyer": real.get("user_id"), "remark": real.get("remark"),
|
||||||
"paid": paid, "note": "金额不足一张(¥%s),待人工核对" % paid,
|
"paid": paid, "note": "金额不足一张(¥%s),待人工核对" % paid,
|
||||||
"need_human": True}
|
"need_human": True}
|
||||||
jsave(PAYPLATFORM_LEDGER, led)
|
STORE.ledger_save(led)
|
||||||
return self.js({"ec": 200, "em": "", "data": {"content":
|
return self.js({"ec": 200, "em": "", "data": {"content":
|
||||||
"金钻工坊 · 自助模板渲染\n收到你的付款 ¥%s,但不足一张(¥%s),没法自动发码。\n"
|
"金钻工坊 · 自助模板渲染\n收到你的付款 ¥%s,但不足一张(¥%s),没法自动发码。\n"
|
||||||
"已记下来等人工核对;补齐差额后会马上补发。" % (paid, PRICE_UNIT)}})
|
"已记下来等人工核对;补齐差额后会马上补发。" % (paid, PRICE_UNIT)}})
|
||||||
@@ -2386,10 +2412,6 @@ class H(BaseHTTPRequestHandler):
|
|||||||
% (oid_af, n_img_af, paid, afford, n_img))
|
% (oid_af, n_img_af, paid, afford, n_img))
|
||||||
code = gen_codes(1, batch="爱发电自动", value=n_img * PRICE_UNIT, platform="爱发电",
|
code = gen_codes(1, batch="爱发电自动", value=n_img * PRICE_UNIT, platform="爱发电",
|
||||||
tpl="", n_fix=n_img)[0] # 不限模板、只限张数(金钻口径)
|
tpl="", n_fix=n_img)[0] # 不限模板、只限张数(金钻口径)
|
||||||
try:
|
|
||||||
os.chmod(CODES_FILE, 0o640)
|
|
||||||
except OSError:
|
|
||||||
pass
|
|
||||||
content = ("金钻工坊 · 自助模板渲染\n这是你的卡密(固定 %d 张,模板随便挑):%s\n"
|
content = ("金钻工坊 · 自助模板渲染\n这是你的卡密(固定 %d 张,模板随便挑):%s\n"
|
||||||
"到 http<WIN-PATH> 点「卡密下单」填进去就能开始。"
|
"到 http<WIN-PATH> 点「卡密下单」填进去就能开始。"
|
||||||
% (n_img, code))
|
% (n_img, code))
|
||||||
@@ -2409,7 +2431,7 @@ class H(BaseHTTPRequestHandler):
|
|||||||
"待人工看一眼(可能是想多买)"
|
"待人工看一眼(可能是想多买)"
|
||||||
% (_yuan(over_code), _yuan(n_img * PRICE_UNIT), _yuan(paid)))
|
% (_yuan(over_code), _yuan(n_img * PRICE_UNIT), _yuan(paid)))
|
||||||
led[oid_af] = rec_led
|
led[oid_af] = rec_led
|
||||||
jsave(PAYPLATFORM_LEDGER, led)
|
STORE.ledger_save(led)
|
||||||
log("爱发电卖出:%s | 金额 %s | 规格 %s | 留言 %s | 发码 %s(%d 张)"
|
log("爱发电卖出:%s | 金额 %s | 规格 %s | 留言 %s | 发码 %s(%d 张)"
|
||||||
% (oid_af, led[oid_af]["amount"], sku_txt, (real.get("remark") or "-")[:30], code, n_img))
|
% (oid_af, led[oid_af]["amount"], sku_txt, (real.get("remark") or "-")[:30], code, n_img))
|
||||||
# 发货内容塞进返回体(爱发电的自动发货会用 content 展示给买家;不认也没关系,
|
# 发货内容塞进返回体(爱发电的自动发货会用 content 展示给买家;不认也没关系,
|
||||||
@@ -2444,7 +2466,7 @@ class H(BaseHTTPRequestHandler):
|
|||||||
return self._activate_payplatform_locked(oid, m, ano, ip)
|
return self._activate_payplatform_locked(oid, m, ano, ip)
|
||||||
|
|
||||||
def _activate_payplatform_locked(self, oid, m, ano, ip):
|
def _activate_payplatform_locked(self, oid, m, ano, ip):
|
||||||
led = jload(PAYPLATFORM_LEDGER, {}) or {}
|
led = STORE.ledger_all()
|
||||||
rec = None
|
rec = None
|
||||||
for k, v in led.items():
|
for k, v in led.items():
|
||||||
if str(k).endswith(ano) or str(k) == ano:
|
if str(k).endswith(ano) or str(k) == ano:
|
||||||
@@ -2470,7 +2492,7 @@ class H(BaseHTTPRequestHandler):
|
|||||||
akey = rec["_key"] # ⚠️ 先存下来:下面要把 _key 从记录里 pop 掉,
|
akey = rec["_key"] # ⚠️ 先存下来:下面要把 _key 从记录里 pop 掉,
|
||||||
led[akey]["used_by"] = oid # 之后再读 rec["_key"] 就是 KeyError(2026-10-01 实踩,500)
|
led[akey]["used_by"] = oid # 之后再读 rec["_key"] 就是 KeyError(2026-10-01 实踩,500)
|
||||||
led[akey].pop("_key", None)
|
led[akey].pop("_key", None)
|
||||||
jsave(PAYPLATFORM_LEDGER, led)
|
STORE.ledger_save(led)
|
||||||
m["payplatform_order"] = akey
|
m["payplatform_order"] = akey
|
||||||
with LOCK:
|
with LOCK:
|
||||||
write_meta(oid, m)
|
write_meta(oid, m)
|
||||||
@@ -2719,13 +2741,9 @@ class H(BaseHTTPRequestHandler):
|
|||||||
with open(os.path.join(FEEDBACK_DIR, fid + ".json"), "w", encoding="utf-8") as f:
|
with open(os.path.join(FEEDBACK_DIR, fid + ".json"), "w", encoding="utf-8") as f:
|
||||||
json.dump(rec, f, ensure_ascii=False, indent=1)
|
json.dump(rec, f, ensure_ascii=False, indent=1)
|
||||||
# 走「呼叫金钻」同一套通知:他手机能收到
|
# 走「呼叫金钻」同一套通知:他手机能收到
|
||||||
try:
|
add_call({"ts": rec["ts"], "ip": ip, "order": rec["order"],
|
||||||
with open(CALLS_FILE, "a", encoding="utf-8") as f:
|
"notified": False, "kind": "反馈",
|
||||||
f.write(json.dumps({"ts": rec["ts"], "ip": ip, "order": rec["order"],
|
"note": (note or "(只传了图)")[:120]})
|
||||||
"notified": False, "kind": "反馈",
|
|
||||||
"note": (note or "(只传了图)")[:120]}, ensure_ascii=False) + "\n")
|
|
||||||
except OSError:
|
|
||||||
pass
|
|
||||||
log("反馈 %s | 单 %s | 图 %s | %s" % (fid, rec["order"] or "-", rec["image"] or "无", (note or "")[:60]))
|
log("反馈 %s | 单 %s | 图 %s | %s" % (fid, rec["order"] or "-", rec["image"] or "无", (note or "")[:60]))
|
||||||
return self.js({"ok": True, "id": fid})
|
return self.js({"ok": True, "id": fid})
|
||||||
|
|
||||||
@@ -2866,10 +2884,10 @@ class H(BaseHTTPRequestHandler):
|
|||||||
ip = ip_of(self)
|
ip = ip_of(self)
|
||||||
if ip and ip not in ("?", "localhost"):
|
if ip and ip not in ("?", "localhost"):
|
||||||
note_home_ip(ip)
|
note_home_ip(ip)
|
||||||
jsave(HB_IPS_FILE, {"ips": HOME_IPS})
|
STORE.kv_put("home_ips", {"ips": HOME_IPS})
|
||||||
with LOCK:
|
with LOCK:
|
||||||
status_cache_clear()
|
status_cache_clear()
|
||||||
jsave(HB_FILE, {"ts": now().isoformat(timespec="seconds"),
|
STORE.kv_put("heartbeat", {"ts": now().isoformat(timespec="seconds"),
|
||||||
"host": (d.get("host") or "render")[:40]})
|
"host": (d.get("host") or "render")[:40]})
|
||||||
return self.js({"ok": True, "queue": len(list_orders(("waiting",)))})
|
return self.js({"ok": True, "queue": len(list_orders(("waiting",)))})
|
||||||
|
|
||||||
@@ -3070,15 +3088,10 @@ class H(BaseHTTPRequestHandler):
|
|||||||
m["partial"] = {"got": len(files), "want": total,
|
m["partial"] = {"got": len(files), "want": total,
|
||||||
"why": str(d.get("note") or "")[:300],
|
"why": str(d.get("note") or "")[:300],
|
||||||
"at": now().isoformat(timespec="seconds")}
|
"at": now().isoformat(timespec="seconds")}
|
||||||
try:
|
add_call({"ts": m["partial"]["at"], "ip": "渲染机", "order": oid,
|
||||||
with open(CALLS_FILE, "a", encoding="utf-8") as f:
|
"notified": False, "kind": "部分失败",
|
||||||
f.write(json.dumps({"ts": m["partial"]["at"], "ip": "渲染机", "order": oid,
|
"note": ("收到 %d/%d 个文件:%s" % (len(files), total,
|
||||||
"notified": False, "kind": "部分失败",
|
m["partial"]["why"]))[:300]})
|
||||||
"note": ("收到 %d/%d 个文件:%s" % (len(files), total,
|
|
||||||
m["partial"]["why"]))[:300]},
|
|
||||||
ensure_ascii=False) + "\n")
|
|
||||||
except OSError:
|
|
||||||
pass
|
|
||||||
log("⚠️ %s 部分失败:收到 %d/%d 个文件(%s)" % (oid, len(files), total, m["partial"]["why"]))
|
log("⚠️ %s 部分失败:收到 %d/%d 个文件(%s)" % (oid, len(files), total, m["partial"]["why"]))
|
||||||
if m.get("direct"):
|
if m.get("direct"):
|
||||||
# 直发单不用确认收货 —— 渲完就是「开放下载」,保留期/核销都从这一刻起算
|
# 直发单不用确认收货 —— 渲完就是「开放下载」,保留期/核销都从这一刻起算
|
||||||
@@ -3116,12 +3129,8 @@ class H(BaseHTTPRequestHandler):
|
|||||||
ip = self.headers.get("X-Real-IP") or self.client_address[0]
|
ip = self.headers.get("X-Real-IP") or self.client_address[0]
|
||||||
nowt = now()
|
nowt = now()
|
||||||
# 限频:同 IP 10 分钟内最多 3 次
|
# 限频:同 IP 10 分钟内最多 3 次
|
||||||
try:
|
since = (nowt - timedelta(seconds=600)).isoformat(timespec="seconds")
|
||||||
recent = [json.loads(l) for l in open(CALLS_FILE, encoding="utf-8") if l.strip()]
|
n = len(STORE.calls(ip=ip, since=since))
|
||||||
except OSError:
|
|
||||||
recent = []
|
|
||||||
n = sum(1 for r in recent[-50:] if r.get("ip") == ip
|
|
||||||
and (nowt - datetime.fromisoformat(r["ts"])).total_seconds() < 600)
|
|
||||||
if n >= 3:
|
if n >= 3:
|
||||||
return self.js({"ok": True, "throttled": True})
|
return self.js({"ok": True, "throttled": True})
|
||||||
rec = {"ts": nowt.isoformat(timespec="seconds"), "ip": ip,
|
rec = {"ts": nowt.isoformat(timespec="seconds"), "ip": ip,
|
||||||
@@ -3131,8 +3140,7 @@ class H(BaseHTTPRequestHandler):
|
|||||||
"note": (d.get("note") or "")[:600],
|
"note": (d.get("note") or "")[:600],
|
||||||
"email": (d.get("email") or "")[:120],
|
"email": (d.get("email") or "")[:120],
|
||||||
"notified": False}
|
"notified": False}
|
||||||
with open(CALLS_FILE, "a", encoding="utf-8") as f:
|
add_call(rec)
|
||||||
f.write(json.dumps(rec, ensure_ascii=False) + "\n")
|
|
||||||
log("呼叫金钻 %s" % rec)
|
log("呼叫金钻 %s" % rec)
|
||||||
return self.js({"ok": True})
|
return self.js({"ok": True})
|
||||||
|
|
||||||
@@ -3341,11 +3349,16 @@ class H(BaseHTTPRequestHandler):
|
|||||||
except ValueError:
|
except ValueError:
|
||||||
limit = 60
|
limit = 60
|
||||||
want = (q.get("state") or [""])[0].strip()
|
want = (q.get("state") or [""])[0].strip()
|
||||||
|
# 2026-10-05:后台面板加了搜索框 —— 按码 / 订单号 / 批次 / 平台 找(不分大小写)
|
||||||
|
kw = (q.get("q") or [""])[0].strip().upper()[:40]
|
||||||
out = []
|
out = []
|
||||||
for c, r in load_codes().items():
|
for c, r in load_codes().items():
|
||||||
st = code_state(r)
|
st = code_state(r)
|
||||||
if want and st != want:
|
if want and st != want:
|
||||||
continue
|
continue
|
||||||
|
if kw and not any(kw in str(x or "").upper()
|
||||||
|
for x in (c, r.get("order"), r.get("batch"), r.get("platform"))):
|
||||||
|
continue
|
||||||
out.append({"code": c, "state": st, "platform": r.get("platform"),
|
out.append({"code": c, "state": st, "platform": r.get("platform"),
|
||||||
"tpl": r.get("tpl"), "set": bool(r.get("set")),
|
"tpl": r.get("tpl"), "set": bool(r.get("set")),
|
||||||
"direct": bool(r.get("direct")), "batch": r.get("batch"),
|
"direct": bool(r.get("direct")), "batch": r.get("batch"),
|
||||||
@@ -3403,6 +3416,46 @@ class H(BaseHTTPRequestHandler):
|
|||||||
write_meta(oid, m)
|
write_meta(oid, m)
|
||||||
return self.js({"ok": True, "oid": oid, "state": "void"})
|
return self.js({"ok": True, "oid": oid, "state": "void"})
|
||||||
|
|
||||||
|
def admin_calls(self, q):
|
||||||
|
"""「呼叫金钻」/ 反馈 / 部分失败 记录,新的在前(2026-10-05:原来只能 ssh 上去 admin.py calls 看)。"""
|
||||||
|
try:
|
||||||
|
limit = min(int((q.get("limit") or ["60"])[0]), 300)
|
||||||
|
except ValueError:
|
||||||
|
limit = 60
|
||||||
|
rows = STORE.calls(limit=limit)[::-1]
|
||||||
|
return self.js({"ok": True, "calls": rows,
|
||||||
|
"open": sum(1 for r in rows if not r.get("handled"))})
|
||||||
|
|
||||||
|
def admin_call_done(self):
|
||||||
|
"""把一条呼叫标成「处理过了」。只加 handled 字段,不碰 notified(那是手机通知那边用的)。"""
|
||||||
|
d = self.body_json() or {}
|
||||||
|
try:
|
||||||
|
cid = int(d.get("id"))
|
||||||
|
except (TypeError, ValueError):
|
||||||
|
return self.err("没有这条记录", 404)
|
||||||
|
if not STORE.call_mark(cid, handled=not d.get("undo"),
|
||||||
|
handled_at=now().isoformat(timespec="seconds")):
|
||||||
|
return self.err("没有这条记录", 404)
|
||||||
|
return self.js({"ok": True, "id": cid})
|
||||||
|
|
||||||
|
def admin_retry(self):
|
||||||
|
"""渲染失败的单退回队列重渲(等于 admin.py retry;面板上原来只能写「喊苏达」)。"""
|
||||||
|
d = self.body_json() or {}
|
||||||
|
oid = (d.get("oid") or "").strip().upper()
|
||||||
|
with LOCK:
|
||||||
|
m = read_meta(oid) if oid else None
|
||||||
|
if not m:
|
||||||
|
return self.err("没有这个订单:%s" % oid, 404)
|
||||||
|
if m.get("state") != "failed":
|
||||||
|
return self.err("只有「渲染失败」的单能退回重渲,这一单现在是「%s」" % m.get("state"))
|
||||||
|
m["state"] = "waiting"
|
||||||
|
m["note"] = "管理员退回重渲"
|
||||||
|
m["started"] = m["finished"] = None
|
||||||
|
write_meta(oid, m)
|
||||||
|
status_cache_clear()
|
||||||
|
log("后台退回重渲 %s" % oid)
|
||||||
|
return self.js({"ok": True, "oid": oid, "state": "waiting"})
|
||||||
|
|
||||||
def admin_note(self):
|
def admin_note(self):
|
||||||
d = self.body_json() or {}
|
d = self.body_json() or {}
|
||||||
oid = (d.get("oid") or "").strip().upper()
|
oid = (d.get("oid") or "").strip().upper()
|
||||||
|
|||||||
Reference in New Issue
Block a user