Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 root
|
3b48a27921 | ||
|
root
|
793a41ab99 | ||
|
root
|
7d11a48756 |
@@ -0,0 +1,23 @@
|
||||
# v0.6.4 发布说明（2026-10-26）
|
||||
|
||||
## 移动端布局与板块尺寸优化
|
||||
|
||||
**触控基线**（全部界面统一）：
|
||||
- 常规按钮 36px / 次级 32px / 小按钮 30px（原 24-28px，触控不友好）
|
||||
- 输入框与下拉 38px 高；分段选择器 34px；图标按钮 34px
|
||||
- 弹窗底部主按钮 40px 并等宽铺满；弹窗宽距收窄近全屏
|
||||
|
||||
**板块重排**：
|
||||
- 详情页：出勤信息改 2×2 紧凑网格（原手机上拉成 1 列过高）；打卡/休假按钮并排等宽
|
||||
- 计划页：每日任务操作按钮（计时/完成/跳过）等宽铺满、触控高度 32px；「今天 / 添加计划」等宽；长期计划卡操作角标化
|
||||
- 记账页：工具栏分区——月份导航一行、两个筛选并排、「记一笔」全宽主按钮
|
||||
- 详情页导出：指定日/当周/当月/自定义分段等宽铺满，日期输入全宽
|
||||
- 总结页：范围分段铺满一行；草稿编辑器高度收窄
|
||||
- 备忘录：列表收窄至 210px，底部按钮等宽
|
||||
- 底部标签栏加高至 56px、图标 22px；悬浮计时时钟位置同步适配
|
||||
- 顶栏打卡按钮加高至 34px，更易点按
|
||||
|
||||
## 部署
|
||||
|
||||
- 服务器：`cd /opt/daywork && git pull && cd server && docker compose up -d --build`（网页端即生效）
|
||||
- 桌面 / 安卓：安装 0.6.4 安装包
|
||||
@@ -0,0 +1,11 @@
|
||||
# v0.6.5 发布说明（2026-10-26）
|
||||
|
||||
## 修复
|
||||
|
||||
- **写操作不再因同步失败弹全屏报错**：此前任何一次写后同步失败（如服务端 500）都会以「应用内部错误」遮罩抛到界面，一次服务端故障会让每次点击都报错。现在写操作在本地提交成功即视为成功，同步失败仅记录状态（设置页「多端数据同步」可见原因），并由下一轮自动同步继续完成。
|
||||
- **服务端 500 留痕**：接口异常现在会连同堆栈写入容器日志（`docker logs internlog-sync`），用于定位「同步服务返回 500」的真实原因。
|
||||
|
||||
## 部署
|
||||
|
||||
- 服务器：`cd /opt/daywork && git pull && cd server && docker compose up -d --build`
|
||||
- 桌面 / 安卓：安装 0.6.5（或继续用 0.6.2+ 旧版客户端，报错遮罩问题主要影响 0.6.4 网页端）
|
||||
@@ -0,0 +1,23 @@
|
||||
# v0.6.6 发布说明（2026-10-26）
|
||||
|
||||
## 修复「同步服务返回 500」与二次数据丢失（根因修复）
|
||||
|
||||
**根因**：此前数据恢复用的合并脚本把用户数据文件中的表写成了**数组**形态，而服务端按「uuid 键对象」读写。后果：数组上的附加属性在序列化时被丢弃（**每次容器重启丢失合并后新写的数据**）、删除/半途状态产生 null 行（**自然键扫描读到 null.date → 每次同步 500**）。该脚本缺陷由开发者引入，本版彻底治愈。
|
||||
|
||||
## 修复内容
|
||||
|
||||
- **服务端加载即自愈**：读取用户数据时自动把数组形态转回 uuid 键对象、剔除 null/非法行（一次性治愈线上文件，无需任何手动操作），自愈结果立即持久化
|
||||
- **自然键扫描 / 墓碑生效循环**：对非对象行防御性跳过
|
||||
- **客户端快照重建**：跳过 null / 无 uuid 行，垃圾行不再进入本地缓存
|
||||
- 合并后丢失的增量数据：各端升级后首次同步会触发行数比对防线，**自动把设备缓存中的数据重推回服务器**
|
||||
|
||||
## 验证
|
||||
|
||||
- 表结构自愈冒烟 8/8（数组+null 混合文件 → 同步一次 → 治愈且数据完整、快照无 null）
|
||||
- 存储冒烟 9/9 · 协议审计 36/36 · 用户管理审计 16/16 · 灾难恢复自救 7/7
|
||||
|
||||
## 部署
|
||||
|
||||
- 服务器：`cd /opt/daywork && git pull && cd server && docker compose up -d --build`
|
||||
- 桌面 / 安卓：安装 0.6.6（网页端刷新即新版）
|
||||
- 部署后各端打开一次，核对数据（工作记录/记账等）；若仍有缺，检查设置页「立即同步」的结果行并反馈
|
||||
+2
-2
@@ -1,2 +1,2 @@
|
||||
const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./web-DmHJbQPa.js","./index-BytpYHOU.js","./index-OQmtzryQ.css"])))=>i.map(i=>d[i]);
|
||||
import{r as s,_ as i}from"./index-BytpYHOU.js";var t;(function(e){e.Documents="DOCUMENTS",e.Data="DATA",e.Library="LIBRARY",e.Cache="CACHE",e.External="EXTERNAL",e.ExternalStorage="EXTERNAL_STORAGE"})(t||(t={}));var a;(function(e){e.UTF8="utf8",e.ASCII="ascii",e.UTF16="utf16"})(a||(a={}));const E=s("Filesystem",{web:()=>i(()=>import("./web-DmHJbQPa.js"),__vite__mapDeps([0,1,2]),import.meta.url).then(e=>new e.FilesystemWeb)});export{t as Directory,a as Encoding,E as Filesystem};
|
||||
const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./web-B4MkFHMk.js","./index-DP7vL7H5.js","./index-BuZbSc5_.css"])))=>i.map(i=>d[i]);
|
||||
import{r as s,_ as i}from"./index-DP7vL7H5.js";var t;(function(e){e.Documents="DOCUMENTS",e.Data="DATA",e.Library="LIBRARY",e.Cache="CACHE",e.External="EXTERNAL",e.ExternalStorage="EXTERNAL_STORAGE"})(t||(t={}));var a;(function(e){e.UTF8="utf8",e.ASCII="ascii",e.UTF16="utf16"})(a||(a={}));const E=s("Filesystem",{web:()=>i(()=>import("./web-B4MkFHMk.js"),__vite__mapDeps([0,1,2]),import.meta.url).then(e=>new e.FilesystemWeb)});export{t as Directory,a as Encoding,E as Filesystem};
|
||||
+1
File diff suppressed because one or more lines are too long
+5
-5
File diff suppressed because one or more lines are too long
-1
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+2
-2
@@ -8,8 +8,8 @@
|
||||
<link rel="icon" href="./icons/icon.svg" type="image/svg+xml" />
|
||||
<link rel="apple-touch-icon" href="./icons/icon-192.png" />
|
||||
<title>实习工作日志</title>
|
||||
<script type="module" crossorigin src="./assets/index-BytpYHOU.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="./assets/index-OQmtzryQ.css">
|
||||
<script type="module" crossorigin src="./assets/index-DP7vL7H5.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="./assets/index-BuZbSc5_.css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "intern-log",
|
||||
"private": true,
|
||||
"version": "0.6.3",
|
||||
"version": "0.6.6",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
|
||||
@@ -743,14 +743,16 @@ onMounted(async () => {
|
||||
.mob-search-btn { display: flex; }
|
||||
.topbar-actions { margin-left: auto; gap: 6px; }
|
||||
.week-tip { height: 28px; max-width: 118px; padding: 0 8px; white-space: nowrap; overflow: hidden; }
|
||||
.topbar-actions .btn { padding: 0 10px; height: 32px; }
|
||||
.topbar-actions .btn { padding: 0 12px; height: 34px; }
|
||||
.topbar-actions .btn .num { font-size: 12px; }
|
||||
|
||||
.tabbar { display: flex; }
|
||||
.tab-btn { height: 56px; font-size: 11px; }
|
||||
.tab-btn .icon { width: 22px; height: 22px; }
|
||||
.content { flex: 1; min-height: 0; }
|
||||
.content-inner {
|
||||
max-width: none;
|
||||
padding: 12px 12px calc(70px + env(safe-area-inset-bottom));
|
||||
padding: 12px 12px calc(78px + env(safe-area-inset-bottom));
|
||||
}
|
||||
|
||||
.toast-wrap {
|
||||
|
||||
@@ -147,7 +147,7 @@ onUnmounted(() => {
|
||||
.tp {
|
||||
left: 12px;
|
||||
right: 12px;
|
||||
bottom: calc(66px + env(safe-area-inset-bottom));
|
||||
bottom: calc(64px + env(safe-area-inset-bottom));
|
||||
max-width: none;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -163,4 +163,8 @@ function save() {
|
||||
.dialog { width: 480px; }
|
||||
.add-cat { display: flex; gap: 6px; margin-top: 6px; }
|
||||
.add-cat-input { flex: 1; height: 28px; font-size: 12px; }
|
||||
@media (max-width: 720px) {
|
||||
.add-cat-input { height: 34px; }
|
||||
.add-cat .btn { height: 34px; }
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -452,7 +452,15 @@ async function confirmDelete() {
|
||||
}
|
||||
.dp-foot { margin-top: 10px; font-size: 12px; text-align: right; }
|
||||
|
||||
@media (max-width: 560px) {
|
||||
.att-grid { grid-template-columns: 1fr; }
|
||||
@media (max-width: 720px) {
|
||||
.dp-head { margin-bottom: 10px; }
|
||||
.att-grid { grid-template-columns: 1fr 1fr; gap: 10px 12px; }
|
||||
.att-cell label { margin-bottom: 3px; }
|
||||
.att-actions { display: grid; grid-template-columns: 1fr 1fr; gap: 8px; }
|
||||
.att-actions .btn { width: 100%; }
|
||||
.edit-row { flex-wrap: wrap; }
|
||||
.edit-row .time-input { width: 100%; flex: 1 1 100%; }
|
||||
.edit-row .btn { flex: 1; }
|
||||
.item-main { gap: 6px; }
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,11 +1,40 @@
|
||||
/* ============================================================
|
||||
手机端（<=720px）全局适配：作用于各视图与弹窗组件
|
||||
（App.vue 的壳层样式是 scoped，跨组件规则统一放这里，便于集中管理）
|
||||
手机端（<=720px）全局适配
|
||||
原则：触控目标 ≥30px（按钮 32-36 / 输入 38 / 弹窗主按钮 40）、
|
||||
板块两列优先避免过度堆叠、内容优先密度适中
|
||||
============================================================ */
|
||||
|
||||
@media (max-width: 720px) {
|
||||
/* 卡片在窄屏贴边、圆角略收 */
|
||||
/* ---------- 触控基线 ---------- */
|
||||
.btn { height: 36px; padding: 0 14px; }
|
||||
.btn-sm { height: 32px; padding: 0 12px; }
|
||||
.btn-xs { height: 30px; padding: 0 12px; }
|
||||
.icon-btn { width: 34px; height: 34px; }
|
||||
.seg-btn { height: 34px; padding: 0 13px; }
|
||||
.input, .select { height: 38px; padding: 0 12px; }
|
||||
.textarea { min-height: 76px; padding: 10px 12px; }
|
||||
.toggle-btn { height: 38px; }
|
||||
.tag { height: 24px; line-height: 22px; padding: 0 9px; }
|
||||
.dot { width: 7px; height: 7px; }
|
||||
|
||||
/* ---------- 弹窗：近全屏 + 大按钮 ---------- */
|
||||
.dialog {
|
||||
width: calc(100vw - 16px) !important;
|
||||
max-width: calc(100vw - 16px) !important;
|
||||
max-height: 90vh;
|
||||
max-height: 90dvh;
|
||||
}
|
||||
.dialog-head { padding: 14px 16px 10px !important; }
|
||||
.dialog-body { padding: 14px 16px !important; }
|
||||
.dialog-btns { padding: 10px 16px calc(12px + env(safe-area-inset-bottom)) !important; gap: 10px; }
|
||||
.dialog-btns .btn { flex: 1; height: 40px; }
|
||||
.form-grid { grid-template-columns: 1fr !important; }
|
||||
|
||||
/* ---------- 卡片与分区 ---------- */
|
||||
.card { border-radius: 12px; }
|
||||
.section, .sec { padding: 12px; }
|
||||
.stat-num { font-size: 20px; }
|
||||
.empty { padding: 22px 12px; }
|
||||
|
||||
input.input, select.select, textarea.textarea {
|
||||
width: 100%;
|
||||
@@ -13,20 +42,7 @@
|
||||
}
|
||||
.btn { touch-action: manipulation; }
|
||||
|
||||
/* ---------- 弹窗：窄屏近全屏 ---------- */
|
||||
.dialog {
|
||||
width: calc(100vw - 20px) !important;
|
||||
max-width: calc(100vw - 20px) !important;
|
||||
max-height: 88vh;
|
||||
max-height: 88dvh;
|
||||
}
|
||||
.dialog-head { padding: 14px 16px 10px !important; }
|
||||
.dialog-body { padding: 14px 16px !important; }
|
||||
.dialog-btns { padding: 10px 16px 14px !important; }
|
||||
.dialog-btns .btn { flex: 1; }
|
||||
.form-grid { grid-template-columns: 1fr !important; }
|
||||
|
||||
/* ---------- 日历当日抽屉：改为底部抽屉 ---------- */
|
||||
/* ---------- 日历当日抽屉：底部抽屉 ---------- */
|
||||
.drawer {
|
||||
top: auto !important;
|
||||
left: 0 !important;
|
||||
@@ -42,7 +58,7 @@
|
||||
.drawer-head { border-radius: 14px 14px 0 0; }
|
||||
.drawer-body { padding: 12px !important; }
|
||||
|
||||
/* ---------- 记账表格：卡片行（带行内标签），手机上不横滚 ---------- */
|
||||
/* ---------- 记账表格：卡片行（带行内标签） ---------- */
|
||||
.tx-table { min-width: 0 !important; }
|
||||
.tx-table thead { display: none !important; }
|
||||
.tx-table tr { display: block; padding: 10px 12px; border-bottom: 1px solid var(--border); background: transparent; }
|
||||
@@ -63,11 +79,12 @@
|
||||
flex: none;
|
||||
}
|
||||
.tx-table td.ops-cell::before { content: none; }
|
||||
.tx-table td.ops-cell { justify-content: flex-end; }
|
||||
.tx-table td.ops-cell { justify-content: flex-end; flex-wrap: wrap; gap: 8px; }
|
||||
.tx-table td.ops-cell .btn { flex: none; }
|
||||
.tx-table td.empty { justify-content: center; }
|
||||
.tx-table td.empty::before { content: none !important; }
|
||||
|
||||
/* ---------- 密码库等其余宽表：横向滚动 ---------- */
|
||||
/* ---------- 密码库等宽表：横滚 + 工具栏堆叠 ---------- */
|
||||
.table-card, .tx-card { overflow-x: auto; }
|
||||
.cred-table { min-width: 560px !important; }
|
||||
.th-ops { width: auto !important; }
|
||||
@@ -79,15 +96,13 @@
|
||||
/* ---------- 统计卡两列 ---------- */
|
||||
.cards { grid-template-columns: repeat(2, minmax(0, 1fr)) !important; gap: 10px !important; }
|
||||
.stat-card { padding: 12px 14px !important; }
|
||||
.stat-num { font-size: 19px !important; }
|
||||
|
||||
/* ---------- 分区与栅格收窄 ---------- */
|
||||
.section, .sec { padding: 12px 12px !important; }
|
||||
/* ---------- 分区与栅格 ---------- */
|
||||
.rule-grid { grid-template-columns: 1fr !important; }
|
||||
.two-col { grid-template-columns: 1fr !important; }
|
||||
|
||||
/* ---------- 日历格子收窄 ---------- */
|
||||
.cal-toolbar { margin-bottom: 8px; }
|
||||
.cal-cell { min-height: 54px !important; padding: 4px 5px !important; }
|
||||
.cal-marks { margin-top: 3px !important; height: 12px !important; gap: 3px !important; }
|
||||
/* ---------- 日历格子 ---------- */
|
||||
.cal-toolbar { margin-bottom: 10px; }
|
||||
.cal-cell { min-height: 58px !important; padding: 5px 6px !important; }
|
||||
.cal-marks { margin-top: 4px !important; height: 14px !important; gap: 4px !important; }
|
||||
}
|
||||
|
||||
@@ -159,14 +159,15 @@ export async function syncWithStoredConfig(): Promise<SyncResult> {
|
||||
return runSync({ baseUrl: await baseOf(), username: creds.username, password: creds.password })
|
||||
}
|
||||
|
||||
// 界面写操作完成后调用：立即推送差异并以服务器快照重建缓存（失败会把缓存回退到服务器真值）
|
||||
// 界面写操作完成后调用：立即推送差异并以服务器快照重建缓存
|
||||
// 注意：绝不向界面抛出——写操作本身已在本地提交成功，同步失败只记录状态
|
||||
// （设置页可见 + 下一轮自动同步续传），否则一次服务端故障会把每次点击都变成全屏报错
|
||||
export async function flushAfterWrite(): Promise<void> {
|
||||
try {
|
||||
await syncWithStoredConfig()
|
||||
} catch (e) {
|
||||
syncLastError.value = e instanceof Error ? e.message : String(e)
|
||||
try { await syncWithStoredConfig() } catch { /* 服务器不可达：本地暂存修改，下次自动推送或全量刷新时对齐 */ }
|
||||
throw e
|
||||
}
|
||||
}
|
||||
|
||||
@@ -437,7 +438,9 @@ async function applySnapshot(
|
||||
const prevById = new Map(prevRows.map(r => [pkOf(t, r), r]))
|
||||
const prevByUuid = new Map(prevRows.filter(r => r.uuid).map(r => [r.uuid as string, r]))
|
||||
|
||||
const live: AnyRow[] = (serverTables[t] || []).filter(r => !dead.has(t + '|' + r.uuid))
|
||||
const live: AnyRow[] = (serverTables[t] || [])
|
||||
.filter(r => r && typeof r === 'object' && r.uuid)
|
||||
.filter(r => !dead.has(t + '|' + r.uuid))
|
||||
// 设置表的临时键：不写回本地缓存；顺手在服务端也清掉（下一轮推送墓碑）
|
||||
const filtered = live.filter(r => !(t === 'setting' && EXCLUDE_SETTING_KEYS.has(r.key)))
|
||||
const tmpKeys = live.filter(r => t === 'setting' && EXCLUDE_SETTING_KEYS.has(r.key))
|
||||
|
||||
@@ -200,9 +200,7 @@ watch(focusDate, d => {
|
||||
.drawer-enter-from, .drawer-leave-to { opacity: 0; }
|
||||
|
||||
@media (max-width: 720px) {
|
||||
.cal-cell { min-height: 60px; padding: 4px 5px; }
|
||||
.cal-title { min-width: 76px; font-size: 13px; }
|
||||
.cal-marks { gap: 3px; margin-top: 4px; height: 12px; }
|
||||
.drawer { width: 100%; }
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -332,7 +332,11 @@ async function confirmDelete() {
|
||||
.table-card { overflow-x: auto; }
|
||||
.table-note { margin-top: 10px; font-size: 12px; text-align: right; }
|
||||
|
||||
@media (max-width: 560px) {
|
||||
.ledger-toolbar .w-filter { flex: 1; min-width: 0; width: auto; }
|
||||
@media (max-width: 720px) {
|
||||
.ledger-toolbar { gap: 8px; }
|
||||
.ledger-toolbar .flex1 { display: none; }
|
||||
.month-title { min-width: 0; flex: 1; text-align: left; }
|
||||
.w-filter { flex: 1 1 calc(50% - 4px); min-width: 0; width: auto; }
|
||||
.ledger-toolbar .btn-primary { flex: 1 1 100%; order: 9; }
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -248,8 +248,11 @@ function fmtTime(s: string): string {
|
||||
}
|
||||
|
||||
@media (max-width: 800px) {
|
||||
.memo-page { grid-template-columns: 1fr; }
|
||||
.memo-list { max-height: 240px; }
|
||||
.content-textarea { min-height: 240px; }
|
||||
.memo-page { grid-template-columns: 1fr; gap: 10px; }
|
||||
.memo-list { max-height: 210px; }
|
||||
.content-textarea { min-height: 260px; }
|
||||
.title-input { height: 38px; }
|
||||
.editor-foot { flex-wrap: wrap; }
|
||||
.editor-foot .btn { flex: 1; min-height: 34px; }
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -459,8 +459,19 @@ function weekday(s: string): string {
|
||||
.goal-hint { font-size: 12px; margin-top: 8px; }
|
||||
|
||||
@media (max-width: 720px) {
|
||||
.plan-item { flex-wrap: wrap; }
|
||||
.pi-ops { width: 100%; justify-content: flex-start; }
|
||||
.blk-head { margin: 0 0 10px; }
|
||||
.day-head { margin-top: 16px; }
|
||||
.day-ops { width: 100%; }
|
||||
.day-ops .btn { flex: 1; min-width: 0; }
|
||||
.day-ops .btn-primary { flex: 1.5; }
|
||||
.date-chip { min-width: 64px; }
|
||||
.plan-item { flex-wrap: wrap; padding: 12px; gap: 10px; }
|
||||
.pi-time { min-width: 0; padding-top: 0; }
|
||||
.pi-ops { width: 100%; justify-content: flex-start; gap: 8px; }
|
||||
.pi-ops .btn-xs { flex: 1; min-height: 32px; }
|
||||
.goal-card { position: relative; flex-direction: column; gap: 8px; }
|
||||
.goal-main { padding-right: 0; }
|
||||
.goal-line { padding-right: 72px; }
|
||||
.goal-ops { position: absolute; top: 10px; right: 8px; }
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -228,4 +228,11 @@ function undoPolish() {
|
||||
@media (max-width: 960px) {
|
||||
.report-grid { grid-template-columns: 1fr; }
|
||||
}
|
||||
@media (max-width: 720px) {
|
||||
.report-toolbar { gap: 8px; }
|
||||
.report-toolbar .seg { flex: 1 1 100%; display: flex; }
|
||||
.report-toolbar .seg-btn { flex: 1; }
|
||||
.w-date { flex: 1; min-width: 0; width: auto; }
|
||||
.md-editor { min-height: 300px; }
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -138,8 +138,13 @@ watch(date, d => { expStart.value = d; if (expRange.value === 'custom') expEnd.v
|
||||
|
||||
@media (max-width: 720px) {
|
||||
.tool-sep { display: none; }
|
||||
.nav-row { flex: 1; }
|
||||
.toolbar { padding: 10px 12px; gap: 10px; }
|
||||
.nav-row { flex: 1 1 100%; }
|
||||
.date-title { min-width: 0; flex: 1; text-align: left; }
|
||||
.w-date { flex: 1; min-width: 120px; width: auto; }
|
||||
.exp-row { width: 100%; }
|
||||
.exp-row .seg { flex: 1; display: flex; }
|
||||
.exp-row .seg-btn { flex: 1; padding: 0 6px; }
|
||||
.w-exp { flex: 1; min-width: 0; width: auto; }
|
||||
}
|
||||
</style>
|
||||
|
||||
Binary file not shown.
@@ -0,0 +1,52 @@
|
||||
// 表结构自愈冒烟：数组形态 + null 行 + 合法行混合 → 同步一次 → 治愈为 uuid 键对象且数据完整
|
||||
const BASE = 'http://127.0.0.1:3780'
|
||||
let pass = 0, fail = 0
|
||||
function check(name, ok, detail) {
|
||||
if (ok) { pass++; console.log(' PASS ' + name) } else { fail++; console.log(' FAIL ' + name + (detail ? ' -> ' + detail : '')) }
|
||||
}
|
||||
async function j(path, body, token) {
|
||||
const r = await fetch(BASE + path, { method: 'POST', headers: { 'Content-Type': 'application/json', ...(token ? { Authorization: 'Bearer ' + token } : {}) }, body: body ? JSON.stringify(body) : undefined })
|
||||
return { status: r.status, json: await r.json().catch(() => ({})) }
|
||||
}
|
||||
async function main() {
|
||||
const fsp = await import('fs')
|
||||
const reg = await j('/api/auth/register', { username: 'healtest', password: 'test123456' })
|
||||
const tok = reg.json.token
|
||||
const file = 'server/data/users/' + reg.json.userId + '.json'
|
||||
// 构造坏文件：work_log 是数组 + 含 null 槽位；attendance 数组含 null；memo 正常对象但混入 null 行
|
||||
const bad = {
|
||||
userId: reg.json.userId, cursor: 0,
|
||||
created_at: '2026-10-26T12:00:00.000Z',
|
||||
tables: {
|
||||
work_log: [ { uuid: 'wl1', date: '2026-10-20', created_at: '2026-10-20T00:00:00', updated_at: '2026-10-20T00:00:00' }, null, { uuid: 'wl2', date: '2026-10-21', created_at: '2026-10-21T00:00:00', updated_at: '2026-10-21T00:00:00' } ],
|
||||
attendance: [ null, { uuid: 'at1', date: '2026-10-20', created_at: '2026-10-20T00:00:00', updated_at: '2026-10-20T00:00:00' } ],
|
||||
memo: { m1: { uuid: 'm1', title: '幸存备忘', content: '', created_at: '2026-10-20T00:00:00', updated_at: '2026-10-20T00:00:00' }, bad: null },
|
||||
plan: []
|
||||
},
|
||||
tombstones: { memo: { g1: null }, work_log: {} }
|
||||
}
|
||||
fsp.mkdirSync('server/data/users', { recursive: true })
|
||||
fsp.writeFileSync(file, JSON.stringify(bad))
|
||||
|
||||
// 推送一行 work_log（自然键 date 扫描会遍历表）→ 修复前这里 500，修复后应 200
|
||||
const r1 = await j('/api/sync', { device: 't', tables: { work_log: [ { uuid: 'wl3', date: '2026-10-22', created_at: '2026-10-22T00:00:00', updated_at: '2026-10-22T00:00:00' } ] }, tombstones: [] }, tok)
|
||||
check('同步 200（不再读 null.date）', r1.status === 200, 'status=' + r1.status)
|
||||
|
||||
const healed = JSON.parse(fsp.readFileSync(file, 'utf8'))
|
||||
check('work_log 已转 uuid 键对象', !Array.isArray(healed.tables.work_log) && !!healed.tables.work_log.wl1 && !!healed.tables.work_log.wl3)
|
||||
check('null 行已剔除', !('1' in (healed.tables.work_log || {})) && !healed.tables.attendance['0'])
|
||||
check('attendance 幸存行保留', healed.tables.attendance && healed.tables.attendance.at1)
|
||||
check('memo 正常对象保留', healed.tables.memo && healed.tables.memo.m1)
|
||||
check('null 墓碑已清理', !healed.tombstones.memo || !healed.tombstones.memo.g1)
|
||||
check('全表均为对象形态', Object.values(healed.tables).every(x => x && !Array.isArray(x) && typeof x === 'object'))
|
||||
|
||||
// 推送 m1 更新（memo 无自然键）→ 再拉全量，快照中不得出现 null
|
||||
await j('/api/sync', { device: 't', tables: { memo: [ { uuid: 'm2', title: '新备忘', content: '', created_at: '2026-10-26T00:00:00', updated_at: '2026-10-26T00:00:00' } ] }, tombstones: [] }, tok)
|
||||
const r3 = await j('/api/sync', { device: 't', tables: {}, tombstones: [] }, tok)
|
||||
const flat = Object.values(r3.json.tables || {}).flat()
|
||||
check('权威快照不含 null/无uuid行', r3.status === 200 && flat.every(x => x && typeof x === 'object' && x.uuid), JSON.stringify(flat.filter(x => !x || !x.uuid)).slice(0, 100))
|
||||
|
||||
console.log('RESULT: ' + (fail === 0 ? 'ALL PASS ' + pass : 'FAIL ' + fail + '/' + (pass + fail)))
|
||||
if (fail) process.exit(1)
|
||||
}
|
||||
main().catch(e => { console.error('SMOKE ERROR', e); process.exit(1) })
|
||||
+52
-8
@@ -140,20 +140,60 @@ function userFile(userId) { return path.join(DATA_DIR, 'users', userId + '.json'
|
||||
function emptyUserData(userId) {
|
||||
return { userId, cursor: 0, tables: {}, tombstones: {}, created_at: '' }
|
||||
}
|
||||
// 表结构自愈：tables[t] 必须是「uuid -> 行对象」；
|
||||
// 兼容历史误存为数组的形态（并剔除 null / 非法行），避免自然键扫描在 null 上崩溃、避免序列化丢弃行
|
||||
function sanitizeTables(data) {
|
||||
let healed = false
|
||||
const src = data.tables && typeof data.tables === 'object' && !Array.isArray(data.tables) ? data.tables : null
|
||||
if (!src) { data.tables = {}; return true }
|
||||
const out = {}
|
||||
for (const t of Object.keys(src)) {
|
||||
const container = src[t]
|
||||
if (Array.isArray(container)) {
|
||||
healed = true
|
||||
const m = {}
|
||||
for (const row of container) {
|
||||
if (row && typeof row === 'object' && row.uuid) m[row.uuid] = row
|
||||
}
|
||||
out[t] = m
|
||||
continue
|
||||
}
|
||||
if (!container || typeof container !== 'object') { healed = true; out[t] = {}; continue }
|
||||
const m = {}
|
||||
for (const k of Object.keys(container)) {
|
||||
const row = container[k]
|
||||
if (!row || typeof row !== 'object' || Array.isArray(row) || !row.uuid) { healed = true; continue }
|
||||
m[k] = row
|
||||
}
|
||||
out[t] = m
|
||||
}
|
||||
data.tables = out
|
||||
if (!data.tombstones || typeof data.tombstones !== 'object' || Array.isArray(data.tombstones)) { data.tombstones = {}; healed = true }
|
||||
for (const t of Object.keys(data.tombstones)) {
|
||||
const bucket = data.tombstones[t]
|
||||
if (!bucket || typeof bucket !== 'object' || Array.isArray(bucket)) { delete data.tombstones[t]; healed = true; continue }
|
||||
for (const k of Object.keys(bucket)) {
|
||||
if (!bucket[k]) { delete bucket[k]; healed = true }
|
||||
}
|
||||
}
|
||||
return healed
|
||||
}
|
||||
function loadUserData(userId) {
|
||||
const full = userFile(userId)
|
||||
if (fs.existsSync(full)) {
|
||||
try {
|
||||
return JSON.parse(fs.readFileSync(full, 'utf-8'))
|
||||
const data = JSON.parse(fs.readFileSync(full, 'utf-8'))
|
||||
const healed = sanitizeTables(data)
|
||||
return { data, healed }
|
||||
} catch (e) {
|
||||
// 数据文件损坏：隔离保留原件并大声报错，绝不静默当作空数据（否则客户端同步会引发连锁覆盖）
|
||||
const quarantine = full + '.corrupt-' + new Date().toISOString().replace(/[:.]/g, '-')
|
||||
try { fs.renameSync(full, quarantine) } catch { /* 忽略 */ }
|
||||
console.error('[存储] 用户数据文件解析失败，已隔离：' + quarantine + '（' + (e && e.message) + '）')
|
||||
return emptyUserData(userId)
|
||||
return { data: emptyUserData(userId), healed: false }
|
||||
}
|
||||
}
|
||||
return emptyUserData(userId)
|
||||
return { data: emptyUserData(userId), healed: false }
|
||||
}
|
||||
// 墓碑回收：超过保留期的墓碑删除（全量快照重建的客户端不依赖过期墓碑也能收敛）
|
||||
function gcTombstones(data) {
|
||||
@@ -403,8 +443,9 @@ async function handle(req, res) {
|
||||
const auth = verifyToken(String(req.headers['authorization'] || '').replace(/^Bearer\s+/i, '').trim())
|
||||
if (!auth || !tokenUsable(auth)) { json(res, 401, { error: '未认证' }); return }
|
||||
const body = await readBody(req)
|
||||
const userData = loadUserData(auth.userId)
|
||||
let dirty = false
|
||||
const loaded = loadUserData(auth.userId)
|
||||
const userData = loaded.data
|
||||
let dirty = loaded.healed
|
||||
if (userData.cursor == null) { userData.cursor = 0; dirty = true }
|
||||
if (!userData.tables) { userData.tables = {}; dirty = true }
|
||||
if (!userData.tombstones) { userData.tombstones = {}; dirty = true }
|
||||
@@ -429,7 +470,9 @@ async function handle(req, res) {
|
||||
if (nkVal) {
|
||||
for (const u2 of Object.keys(userData.tables[t])) {
|
||||
if (u2 === row.uuid) continue
|
||||
if (String(userData.tables[t][u2][nk] || '') === nkVal) { conflictUuid = u2; break }
|
||||
const other = userData.tables[t][u2]
|
||||
if (!other || typeof other !== 'object') continue
|
||||
if (String(other[nk] || '') === nkVal) { conflictUuid = u2; break }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -484,7 +527,7 @@ async function handle(req, res) {
|
||||
const tombs = userData.tombstones[t] || {}
|
||||
for (const [u, deletedAt] of Object.entries(tombs)) {
|
||||
const row = userData.tables[t][u]
|
||||
if (row && String(row.updated_at || '') <= String(deletedAt)) delete userData.tables[t][u]
|
||||
if (row && typeof row === 'object' && String(row.updated_at || '') <= String(deletedAt)) delete userData.tables[t][u]
|
||||
}
|
||||
}
|
||||
if (gcTombstones(userData) > 0) dirty = true
|
||||
@@ -621,7 +664,8 @@ setInterval(doBackup, 24 * 60 * 60 * 1000)
|
||||
// ---------- HTTP 服务 ----------
|
||||
const server = http.createServer((req, res) => {
|
||||
handle(req, res).catch(err => {
|
||||
json(res, 500, { error: err.message || 'server error' })
|
||||
console.error('[api] ' + req.method + ' ' + req.url + ' -> 500: ' + ((err && (err.stack || err.message)) || String(err)))
|
||||
json(res, 500, { error: (err && err.message) || 'server error' })
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user