全量细审修复:部署漏配防清空、scrypt 并发闸、发布冲突可解、价格文件只在改了才写、排位扩容
- cms.py:没设 YS_PORTAL_DIR / YS_ORDER_DIR 或缺 content/site.json 时拒绝工作(不建空的第一版,免得一发布清空网站); 同时最多 2 个 scrypt(内存上限 256M);登录冷却记录定期清理;价格 / 付款只在这次发布真改了才写回 (不覆盖 admin.py price 的改动) - 后台页面:发布冲突二选一(丢掉我的草稿 / 确认后覆盖发布);草稿没存上、还有图在上传时不让发布 - layout.js:中圈排满后分档到外圈空槽之间找位置,40 条世界线也不重叠;去掉慢的 Math.hypot - config.js:后台把世界线删光也照实显示;门户删掉旧启动仪式留下的死数据;版本号 v=3 - 测试:内容后台 78 / 回归 27 / 数据库 38 全过;端到端浏览器 36 全过 - 文档同步(交接文档、内容后台设计「实现对照」、后端交接说明、交付清单) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -223,6 +223,9 @@ check("付款方式写回 payinfo.json", pay.get("note") == "付款时留言写
|
||||
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))
|
||||
# 命令行改了价格之后,后台发布别的内容不能把它改回去
|
||||
pr = json.load(open(S.PRICES_FILE, encoding="utf-8")); pr["tiers"]["5"] = {"price": 22, "payplatform": ""}
|
||||
S.jsave(S.PRICES_FILE, pr)
|
||||
b = C(ip="203.0.113.40"); b.login("admin", NEWPW)
|
||||
st, j = b.req("content")
|
||||
d2 = j["draft"]; d2["site"]["hero"]["cta1"] = "看看画"
|
||||
@@ -231,6 +234,7 @@ 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)
|
||||
check("后台发布没动价格时,不覆盖命令行改过的 prices.json", json.load(open(S.PRICES_FILE, encoding="utf-8")).get("tiers", {}).get("5", {}).get("price") == 22)
|
||||
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])
|
||||
@@ -321,6 +325,24 @@ ps = [subprocess.Popen([sys.executable, "-c", probe], env=dict(os.environ, YS_RO
|
||||
n = sqlite3.connect(os.path.join(R2, "ys.db")).execute("SELECT COUNT(*) FROM cms_users").fetchone()[0]
|
||||
check("三个进程同时首次启动:只建了一个初始账号", n == 1, n)
|
||||
|
||||
# ================================================================== 11b. 部署漏配:目录不对 / 缺内容文件 → 不建第一版、不写文件
|
||||
import store as ST
|
||||
R3 = tempfile.mkdtemp(prefix="ys-cms-dirs-")
|
||||
c3 = S.cms.CMS(ST.Store(R3), R3, log=lambda *a: None, prices_file=os.path.join(R3, "prices.json"), payinfo_file=os.path.join(R3, "payinfo.json"), tpl_keys=S.TPL_KEYS, pngcheck=S.pngcheck)
|
||||
old_p = S.cms.PORTAL_DIR
|
||||
for bad_dir, why in (("<PORTAL_DIR>", "没配环境变量"), (os.path.join(R3, "empty-www"), "目录里没有 content/site.json")):
|
||||
if not bad_dir.startswith("<"):
|
||||
os.makedirs(bad_dir, exist_ok=True)
|
||||
S.cms.PORTAL_DIR = bad_dir
|
||||
try:
|
||||
c3.current(); refused = False
|
||||
except S.cms.Bad as e:
|
||||
refused = True; msg = str(e)
|
||||
n = sqlite3.connect(os.path.join(R3, "ys.db")).execute("SELECT COUNT(*) FROM cms_versions").fetchone()[0]
|
||||
check("部署漏配(%s):内容后台拒绝工作、不建空的第一版" % why, refused and n == 0 and not os.path.exists("<PORTAL_DIR>"), msg if refused else "没拒")
|
||||
S.cms.PORTAL_DIR = old_p
|
||||
shutil.rmtree(R3, ignore_errors=True)
|
||||
|
||||
# ================================================================== 12. 原有接口不受影响
|
||||
try:
|
||||
with urllib.request.urlopen("http://127.0.0.1:%d/api/status" % srv.server_address[1], timeout=10) as r:
|
||||
|
||||
Reference in New Issue
Block a user