fix: 修掉十路审查发现的 9 个 P0 与一批 P1(数据正确性 / 越权 / 现场可用性)
P0(9 条全修): - 多通道项目奖牌重复计数:domain 层按 (EventID,CategoryID,EntryID/Subject) 去重, 通道优先级 athlete→team→id - 「只排名不计分」项目(scored:false)不再进奖牌榜,REST/WS/导出口径统一 - aggregate 流水 entry_id 恒 NULL 导致重算后分数翻倍:作废范围改按 event+category 定位 - 已发布成绩仍可被「存草稿」覆盖并清空 rank:服务端 409 STATE_INVALID + 前端禁编辑 - voidResult / 规则导入重算后名次不回写:接住 Ranked 调 applyComputedRanks - 赛事包覆盖导入可能「旧项目已删、新项目没成」:先改名成功再清理,失败回滚 - 导入赛事包可覆盖正在运行的赛事目录:name==当前项目直接 400 - Console spawn 失败后守护器永久卡死:清 child/pid + 调度重启 + stop 超时兜底 - /ws 快照向非 admin 下发 admin-only 配置:按角色裁剪 settings P1(计分口径 / 契约 / 现场): - standings.tieBreak 三处接线;profiles[].recordBonusMode 生效;破纪录校验 RecordEligible 与 entry 归属;破纪录登记校验已发布成绩 - export.loadRanked 与主路径对齐;ListBackups reason 解析;CLI backup 前缀修正 (原来只增不减会撑爆磁盘);单位积分明细/导出统一权重折算;停用单位展示 - 规则导入原子化(重算并入同一事务)+ 返回 compatible/affectedEventCount/ recalculatedLedgerRows;登录审计 user_id 修正 - WS 策略性断开用 Close(code,reason);HelloMessage 补 page/instanceId; 实例注册表清理;settings/单位/项目写操作补 change_log 触发大屏刷新 - 大屏:全量快照不再被版本守卫丢弃;个人积分榜刷新;公告返回页/轮播;行数截断; REST 竞态;1008 停止重连;握手超时;时区补 Z;401 仅 AUTH_REQUIRED 才登出 - 管理端:published 行禁编辑;saveDraft 补 unit(1:06.33 显示);前端预览改用服务端 points;空成绩行不再恒「已修改」;修订详情按 id 拉取;切项目请求序号与 dirty 保护; 发布后刷新项目状态;NAV/路由按角色过滤;recorder 不再打 admin-only 接口 - Console:大屏窗口销毁后重建;大屏 URL 复用 host 归一化;backup.bat 改纯 ASCII (已在 Meowhome 实跑验证) 自检:服务端 gofmt/build/vet 通过、12 包测试全绿;前端 vue-tsc + build 通过、 node --test 24/24;console check-syntax 12 文件通过。
This commit is contained in:
1 parent
96cf181ae3
commit
13f1f03cd0
124 files changed
+5658
-1820
No files matched your search
+16
-16
@@ -13,7 +13,7 @@ const {
|
||||
|
||||
const { loadConfig, resolveExecutable } = require('./config')
|
||||
const { LogBus } = require('./log-bus')
|
||||
const { ServiceSupervisor } = require('./service')
|
||||
const { ServiceSupervisor, healthHost } = require('./service')
|
||||
const { DisplayManager } = require('./displays')
|
||||
const { fetchDisplayInstances } = require('./instances')
|
||||
const { createTrayIcon } = require('./tray-icon')
|
||||
@@ -36,7 +36,6 @@ function main() {
|
||||
let tray = null
|
||||
let powerBlockerId = null
|
||||
let displayFallbackTimer = null
|
||||
let displaysEnabled = false
|
||||
let quitting = false
|
||||
let shutdownDone = false
|
||||
let exePath = null
|
||||
@@ -133,16 +132,14 @@ function main() {
|
||||
}
|
||||
|
||||
function adminPanelUrl() {
|
||||
// 复用服务端的地址推导:host 配成 0.0.0.0 时本机也要走回环
|
||||
// 复用服务端的地址推导:host 配成 0.0.0.0/:: 时本机也要走回环
|
||||
if (service) return service.status.adminUrl
|
||||
const host = (cfg.values.server.host || '127.0.0.1') === '0.0.0.0' ? '127.0.0.1' : cfg.values.server.host
|
||||
return `http://${host || '127.0.0.1'}:${cfg.values.server.port}/admin`
|
||||
return `http://${healthHost(cfg.values.server)}:${cfg.values.server.port}/admin`
|
||||
}
|
||||
|
||||
function serverHost() {
|
||||
if (service) return service.healthHost()
|
||||
const host = cfg.values.server.host || '127.0.0.1'
|
||||
return host === '0.0.0.0' || host === '::' ? '127.0.0.1' : host
|
||||
return healthHost(cfg.values.server)
|
||||
}
|
||||
|
||||
// 大屏实例看板:读服务端 GET /api/display/instances 并推给管理窗口。
|
||||
@@ -248,8 +245,7 @@ function main() {
|
||||
}
|
||||
|
||||
function ensureDisplays() {
|
||||
if (displaysEnabled || !displays) return
|
||||
displaysEnabled = true
|
||||
if (!displays || displays.enabled) return
|
||||
if (displayFallbackTimer) {
|
||||
clearTimeout(displayFallbackTimer)
|
||||
displayFallbackTimer = null
|
||||
@@ -392,7 +388,7 @@ function main() {
|
||||
return true
|
||||
})
|
||||
ipcMain.handle('display:relayout', () => {
|
||||
if (displays && displaysEnabled) displays.relayout()
|
||||
if (displays && displays.enabled) displays.relayout()
|
||||
return statusSnapshot()
|
||||
})
|
||||
ipcMain.handle('app:open-admin-window', () => {
|
||||
@@ -471,17 +467,16 @@ function main() {
|
||||
clearTimeout(displayFallbackTimer)
|
||||
displayFallbackTimer = null
|
||||
}
|
||||
if (displays && displaysEnabled) {
|
||||
if (displays && displays.enabled) {
|
||||
displays.closeAll()
|
||||
log.push('console', '服务已停止,大屏窗口已关闭')
|
||||
}
|
||||
displaysEnabled = false
|
||||
return
|
||||
}
|
||||
|
||||
if (!status.healthy) return
|
||||
// 服务端恢复后必须让大屏重新加载,否则页面还停在断线兜底画面上
|
||||
if (displaysEnabled) displays.relayout()
|
||||
if (displays.enabled) displays.relayout()
|
||||
else ensureDisplays()
|
||||
})
|
||||
|
||||
@@ -497,8 +492,13 @@ function main() {
|
||||
applyOpenAtLogin()
|
||||
|
||||
// 防熄屏要在服务端起来之前就生效,否则开机后第一段时间屏幕仍会休眠
|
||||
powerBlockerId = powerSaveBlocker.start('prevent-display-sleep')
|
||||
log.push('console', `防熄屏已启用(powerSaveBlocker=${powerBlockerId},生效=${powerSaveBlocker.isStarted(powerBlockerId)})`)
|
||||
try {
|
||||
powerBlockerId = powerSaveBlocker.start('prevent-display-sleep')
|
||||
log.push('console', `防熄屏已启用(powerSaveBlocker=${powerBlockerId},生效=${powerSaveBlocker.isStarted(powerBlockerId)})`)
|
||||
} catch (err) {
|
||||
powerBlockerId = null
|
||||
log.push('console', `防熄屏启用失败:${err.message}`)
|
||||
}
|
||||
|
||||
if (cfg.values.server.autoStart) {
|
||||
service.start()
|
||||
@@ -511,7 +511,7 @@ function main() {
|
||||
if (wait > 0) {
|
||||
displayFallbackTimer = setTimeout(() => {
|
||||
displayFallbackTimer = null
|
||||
if (!displaysEnabled) {
|
||||
if (displays && !displays.enabled) {
|
||||
log.push('console', `等待服务端就绪超过 ${Math.round(wait / 1000)} 秒,先打开大屏窗口`)
|
||||
ensureDisplays()
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user