From a9891901e9d5425f9290439204ece2168c4292de Mon Sep 17 00:00:00 2001 From: jiangwanying <109360174+jiangwanying@users.noreply.github.com> Date: Thu, 22 Oct 2026 14:39:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(panel):=20=E8=BF=90=E8=A1=8C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=AD=9B=E9=80=89=E5=A2=9E=E5=BC=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 积分历史：新增账号下拉（uid 过滤）与时间范围（今天/近24h/3d/7d/30d/全部/自定义），默认全部历史 - 请求记录：新增账号下拉，走服务端 account 过滤；后端把 uid 翻译为归档里的昵称 - 前端在归档关闭时按昵称做客户端兜底过滤 - 测试：新增 11 个时间/账号组合用例 + uid 翻译用例；go test ./internal/panel 全绿 --- internal/panel/app.js | 52 +++++++++++++++++++++++++-- internal/panel/credit_history_test.go | 44 +++++++++++++++++++++++ internal/panel/index.html | 7 ++++ internal/panel/panel.go | 24 +++++++++++-- internal/panel/timerange_test.go | 43 ++++++++++++++++++++++ 5 files changed, 164 insertions(+), 6 deletions(-) diff --git a/internal/panel/app.js b/internal/panel/app.js index 77ae884d5..577d0d157 100644 --- a/internal/panel/app.js +++ b/internal/panel/app.js @@ -13,7 +13,7 @@ let refTimer = null; let mdFilter = { q: '', realm: '', cap: '', effort: '', promo: '', sort: 'default' }; let mdAll = [], mdProbes = {}, mdProbeOf = () => undefined; let mdLocks = [], mdRecent = []; -let reqFilter = { q: '', outcome: '' }; +let reqFilter = { q: '', outcome: '', accountName: '' }; let reqEntries = []; let usDim = 'account', usCreditDim = 'account', usSort = 'total'; let usageData = null; @@ -525,6 +525,7 @@ async function loadOverview(quiet) { const up = Math.floor(d.uptime_sec); $('subMeta').textContent = '运行 ' + (up >= 86400 ? Math.floor(up / 86400) + ' 天 ' : '') + Math.floor(up % 86400 / 3600) + ' 时 ' + Math.floor(up % 3600 / 60) + ' 分'; renderAccounts(d.accounts || []); + ensureAccountSelects(); renderModelLocks(d.model_locks); // 到期卡片跟随首页统计同步刷新（用同一份响应里的按日批次，不额外发请求）。 // 2 分钟内的实时明细最新且更全，保留；过期后由 state 快照接管，避免点过一次 @@ -865,12 +866,20 @@ async function loadLogs() { // 「最近 N 条」里根本不会有那些记录，必须让服务端按时间取。 const rq = trangeQuery('reqRange', false); rq.set('limit', limit); + // 账号筛选走服务端（account 参数）：归档读取是先逐行过滤再取最近 N 条， + // 客户端过滤只能看到"最近 N 条里恰好属于该账号的"，老账号会凭空变空。 + const reqAccountUid = $('reqAccount') ? $('reqAccount').value : ''; + if (reqAccountUid) rq.set('account', reqAccountUid); + // 客户端兜底：归档关闭时后端只能回内存里的最近记录（不带 account 过滤）， + // 这里按昵称再筛一遍，保证下拉框在两种部署形态下行为一致。 + const reqAccountChoice = accountChoices().find(a => a.uid === reqAccountUid); + reqFilter.accountName = reqAccountChoice ? reqAccountChoice.name : ''; try { const [d, metrics, requestRows, credit] = await Promise.all([ api('logs'), api('request_metrics').catch(() => ({})), api('request_logs?' + rq.toString()).catch(() => ({ entries: [] })), - api('credit_history?limit=' + creditLimitValue()).catch(() => null), + api('credit_history?' + creditQuery().toString()).catch(() => null), ]); // 归档开启时以归档为准——「区间内没有记录」是一个真实结果，不能回落成内存里 // 的最近 100 条（那会把筛选条件之外、时间范围之外的请求显示出来）。 @@ -981,9 +990,41 @@ function creditLimitValue() { const n = el ? Number(el.value) : 100; return n === 300 || n === 1000 ? n : 100; } + +/* accountChoices 账号下拉的数据源（overview 的账号快照，只取展示字段）。 */ +function accountChoices() { + return ((overviewData && overviewData.accounts) || []).map(a => ({ uid: a.uid, name: a.nickname || a.uid })); +} + +/* fillAccountSelect 重建账号下拉：保留当前选择；选中账号已删除时回退「全部账号」。 */ +function fillAccountSelect(id) { + const el = $(id); + if (!el) return; + const choices = accountChoices(); + const cur = el.value; + el.innerHTML = '' + + choices.map(a => '').join(''); + el.value = choices.some(a => a.uid === cur) ? cur : ''; +} + +/* ensureAccountSelects overview 刷新后同步两处账号下拉（覆盖账号增删与选中回退）。 */ +function ensureAccountSelects() { + fillAccountSelect('reqAccount'); + fillAccountSelect('creditAccount'); +} + +/* creditQuery 积分历史查询串：条数 + 账号 + 时间范围（默认「全部历史」，与改造前一致）。 */ +function creditQuery() { + const q = trangeQuery('creditRange', false); + q.set('limit', String(creditLimitValue())); + const uid = $('creditAccount') ? $('creditAccount').value : ''; + if (uid) q.set('uid', uid); + return q; +} + async function loadCreditHistory() { let d = null; - try { d = await api('credit_history?limit=' + creditLimitValue()); } catch (e) { d = null; } + try { d = await api('credit_history?' + creditQuery().toString()); } catch (e) { d = null; } renderCreditHistory(d); } @@ -992,6 +1033,7 @@ async function loadCreditHistory() { function reqMatch(e, f) { f = f || reqFilter; if (f.outcome && String(e && e.outcome || '') !== f.outcome) return false; + if (f.accountName && String(e && e.account || '') !== f.accountName) return false; if (f.q) { const text = [e && e.client_ip, e && e.user_agent, e && e.model, e && e.account, e && e.request_id] .filter(Boolean).join(' ').toLowerCase(); @@ -1072,11 +1114,15 @@ if ($('reqOutcome')) $('reqOutcome').onchange = () => { renderRequestTable(); }; if ($('reqLimit')) $('reqLimit').onchange = loadLogs; +if ($('reqAccount')) $('reqAccount').onchange = loadLogs; if ($('btnReqReload')) $('btnReqReload').onclick = loadLogs; // 时间范围：默认「全部历史」——请求记录页的历史行为就是"取最近 N 条"， // 加一个默认收窄的区间会让打开页面时看到的条数凭空变少。 if ($('reqRange')) trangeBind('reqRange', loadLogs, '0'); if ($('creditLimit')) $('creditLimit').onchange = loadCreditHistory; +if ($('creditAccount')) $('creditAccount').onchange = loadCreditHistory; +// 积分历史同样默认「全部历史」：与改造前"最近 N 条"的口径一致。 +if ($('creditRange')) trangeBind('creditRange', loadCreditHistory, '0'); if ($('btnCreditReload')) $('btnCreditReload').onclick = loadCreditHistory; function requestLogText(e) { diff --git a/internal/panel/credit_history_test.go b/internal/panel/credit_history_test.go index 266d95629..6b17a808e 100644 --- a/internal/panel/credit_history_test.go +++ b/internal/panel/credit_history_test.go @@ -3,8 +3,10 @@ package panel import ( "encoding/json" "net/http/httptest" + "strconv" "strings" "testing" + "time" "github.com/linguo2625469/workbuddy2api-panel/internal/auth" "github.com/linguo2625469/workbuddy2api-panel/internal/credithist" @@ -167,3 +169,45 @@ func TestCreditHistoryRequiresAuth(t *testing.T) { t.Fatalf("无 key 应回 401，得到 %d", rr.Code) } } + +// 时间与账号筛选：from/to 为秒级时间戳，闭区间；与 uid 组合时先并集筛选再截断。 +func TestCreditHistoryTimeAndAccountFilter(t *testing.T) { + l := credithist.New("", 100) + l.Observe("u1", 1000) // 基线不记流水 + l.Observe("u1", 1100) // +100（唯一一条流水） + + now := time.Now() + past := now.Add(-time.Hour).Unix() + future := now.Add(time.Hour).Unix() + + cases := []struct { + name string + query string + want int + }{ + {"无筛选", "", 1}, + {"起点在过去", "?from=" + strconv.FormatInt(past, 10), 1}, + {"起点在未来", "?from=" + strconv.FormatInt(future, 10), 0}, + {"终点在过去", "?to=" + strconv.FormatInt(past, 10), 0}, + {"终点在未来", "?to=" + strconv.FormatInt(future, 10), 1}, + {"区间覆盖", "?from=" + strconv.FormatInt(past, 10) + "&to=" + strconv.FormatInt(future, 10), 1}, + {"区间不覆盖", "?from=" + strconv.FormatInt(future, 10) + "&to=" + strconv.FormatInt(future+60, 10), 0}, + {"账号命中", "?uid=u1", 1}, + {"账号不命中", "?uid=u2", 0}, + {"账号+时间命中", "?uid=u1&from=" + strconv.FormatInt(past, 10), 1}, + {"非法时间参数忽略", "?from=abc&to=xyz", 1}, + } + for _, c := range cases { + code, body := creditGet(t, creditPanel(t, l), c.query) + if code != 200 { + t.Fatalf("%s: 状态 %d %s", c.name, code, body) + } + var out creditResp + if err := json.Unmarshal([]byte(body), &out); err != nil { + t.Fatalf("%s: JSON 解析失败 %v", c.name, err) + } + if len(out.Entries) != c.want { + t.Fatalf("%s: 条目 %d，期望 %d（%s）", c.name, len(out.Entries), c.want, body) + } + } +} diff --git a/internal/panel/index.html b/internal/panel/index.html index d26173e0b..8e425054f 100644 --- a/internal/panel/index.html +++ b/internal/panel/index.html @@ -1176,6 +1176,9 @@

请求记录 调用来源：IP 取 X-Forwarded-For 首段 + + + +