feat(deploy): 新增 .11 一键更新脚本 + 上游多模型/模型发现/用量统计

功能(本轮 5 项需求的落地):
- 上游可挂多模型:llm-upstreams.json 每上游新增 models 清单(仅用于模型发现,不参与路由)
- 模型发现:GET /v1/models(OpenAI {object:list} 形状,网关本地应答)+ /api/v1/models + /api/v1/upstreams
- 用量统计:/api/admin/usage(管理台「用量统计」Tab)+ /api/v1/usage + /me 的 llm_usage 摘要
  口径:只统计真正转发出去的请求,401/403/404/429 不计;与配额计数 st: 刻意分开
- 账号展示名 display_name(纯展示,不进 ukey:)
- 修复 /v1 版本段重复拼接(llm::join_target)→ 上游 base 自带 /v1 时不再 404 空体
- 修复删账号未清用量键(stats::forget)

部署脚本 deploy/update-ipass.sh:
- 拉镜像 → tar 备份数据 → 删旧容器 → 按旧容器复刻端口/挂载/网络起新容器 → 自检
- 参数从 docker inspect 静态配置读取(docker port 对停止态容器返回空,会让端口静默回落)
- 端口按 host:container 去重(inspect 同一映射含 IPv4/IPv6 两项,重复 -p 会 address already in use)
- --bg 用 setsid/start_new_session 真正脱离会话(仅 nohup & 会被父进程组连带杀掉)
- 旧镜像自动打 rollback-<时间> 标签,收尾打印回滚命令

回归:bash tests/run.sh all → 网关 78 + LLM 75 = 153 条断言全绿。
文档:readme §12.4 / §15 / §16、CLAUDE.md 常用操作 + 排障速查已同步。
This commit is contained in:
admin committed 2026-09-12 10:09:56 +08:00
1 parent 94a48bef6e
commit e38237dc4a
22 files changed
+1719 -93

No files matched your search

+151 -18
View File
@@ -156,6 +156,9 @@
<div class="stat" data-page-node-id="QnBUXahkxZbQTi8gXxJaDL"><div class="k" data-page-node-id="biEB6In3h118H4V5ECoaXb">可用中</div><div class="v" id="statActive" data-page-node-id="ESD1zhtOm2oPCP5SNLvRSn">-</div></div>
<div class="stat" data-page-node-id="rM4VDYnqNtef8rrYjLpfpp"><div class="k" data-page-node-id="KzrxlyuUHFnYco2MsDxA7X">账号总数</div><div class="v" id="statUsers" data-page-node-id="BdM5dI5Vp9UxxvK5W9i5FE">-</div></div>
<div class="stat"><div class="k">LLM 上游</div><div class="v" id="statUpstreams">-</div></div>
<div class="stat"><div class="k">今日 LLM 调用</div><div class="v" id="statLlmtoday">-</div></div>
<div class="stat"><div class="k">累计调用</div><div class="v" id="statLlmtotal">-</div></div>
<div class="stat"><div class="k">可用模型</div><div class="v" id="statModels">-</div></div>
</div>
<div class="tabs" data-page-node-id="7ABRfKhVNVlMVMU2Gi78DH">
@@ -163,6 +166,7 @@
<button class="tab" data-tab="domains" data-page-node-id="nUBR1YPxmxtUxIA746xjJl">全部域名</button>
<button class="tab" data-tab="users" data-page-node-id="IxXKi6EQyukFwW3LxIKnW8">账号管理</button>
<button class="tab" data-tab="upstreams">LLM 上游</button>
<button class="tab" data-tab="usage">用量统计</button>
</div>
<!-- ---------- 审核队列 ---------- -->
@@ -217,7 +221,8 @@
<h2 data-page-node-id="HmAZqeWV69NADn9MEsEF0H">新建账号</h2>
<div class="desc" data-page-node-id="qePvQWPH7SpsWKbs0PNFFj">每个账号自动生成一个随机 API Key,用于调用申请接口。勾选「临时授权权限」后,该账号申请临时域名可免审核直接放行,权限本身 6 小时后失效。</div>
<form id="createUserForm" class="grid-form" data-page-node-id="kJOwZGdAi0vI8bUvMc5DkM">
<div data-page-node-id="zBcbvHBSXo0sqvkn07fTGk"><label for="cuName" data-page-node-id="htLO2FCisOsokt0XiAlYFP">账号名</label><input id="cuName" type="text" placeholder="alice" required data-page-node-id="XNSFkWJCAUrcjEZzdTzZbC"></div>
<div data-page-node-id="zBcbvHBSXo0sqvkn07fTGk"><label for="cuName" data-page-node-id="htLO2FCisOsokt0XiAlYFP">账号名</label><input id="cuName" type="text" placeholder="wuguirong" required data-page-node-id="XNSFkWJCAUrcjEZzdTzZbC"></div>
<div><label for="cuDisplay">展示名(中文姓名,可空)</label><input id="cuDisplay" type="text" placeholder="吴桂荣"></div>
<div data-page-node-id="1bQNi3Vf5H4hjG3EIAtg99"><label for="cuPass" data-page-node-id="bDW0kEhFjaoZ5uMq5AjvRQ">初始密码</label><input id="cuPass" type="text" placeholder="至少 6 位" required data-page-node-id="uq4xRFkyAW8dmn5Zezzro4"></div>
<div data-page-node-id="hjDBTD24FFHVfBHTg8kwiT">
<label for="cuRole" data-page-node-id="ItiQZ1ogDRF2C13J60vAPa">角色</label>
@@ -236,7 +241,7 @@
<div class="desc" data-page-node-id="6IbAE96NHAkWf0VDBOmsLE">API Key 完整值在创建时展示一次;此处可复制或重置。</div>
<table data-page-node-id="pvKkxJHvywRXJwHN0jwf5l">
<thead data-page-node-id="FU4xRIKjo3h5WFD7WUlO08"><tr data-page-node-id="LZOmsApzNXNlMM7wZCotCY">
<th data-page-node-id="8n6o4AIhJs0o3AqAj5CBu4">账号</th><th data-page-node-id="P97LhZzAaQNIcWPpVkGmai">角色</th><th data-page-node-id="4r8vdics0NPGH9jscptkqO">API Key</th><th data-page-node-id="Vpd5EpT7gDIgD9ZUtHzlkP">临时授权权限</th><th data-page-node-id="CR4nmRa6xymAXGFLyWgY6U">域名</th><th data-page-node-id="TyfRqT6C9w4DLeCPHiDXpR">操作</th>
<th data-page-node-id="8n6o4AIhJs0o3AqAj5CBu4">账号</th><th data-page-node-id="P97LhZzAaQNIcWPpVkGmai">角色</th><th data-page-node-id="4r8vdics0NPGH9jscptkqO">API Key</th><th>LLM 用量</th><th data-page-node-id="Vpd5EpT7gDIgD9ZUtHzlkP">临时授权权限</th><th data-page-node-id="CR4nmRa6xymAXGFLyWgY6U">域名</th><th data-page-node-id="TyfRqT6C9w4DLeCPHiDXpR">操作</th>
</tr></thead>
<tbody id="usersBody" data-page-node-id="eGBzCfof0bGb3VZaXKKzVN"></tbody>
</table>
@@ -247,12 +252,16 @@
<section id="tab-upstreams" hidden>
<div class="panel">
<h2>新建 / 更新 LLM 上游</h2>
<div class="desc">slot 即 URL 前缀:客户端访问 <code>https://llm.yourdomain.com/&lt;slot&gt;/v1/chat/completions</code> 并携带其账号 API Key,网关把 Key 换成本处配置的上游密钥后转发。保存后立即生效,无需重启。密钥留空表示不修改已有密钥。</div>
<div class="desc">slot 即 URL 前缀:客户端把 base_url 指向 <code>https://lm.mayishangshu.cn/&lt;slot&gt;/v1</code> 并携带其账号 API Key,网关把 Key 换成本处配置的上游密钥后转发。一家厂商通常挂很多模型,把模型名登记在这里,客户端就能通过 <code>GET /v1/models</code> 或 <code>GET /api/v1/models</code> 先列出可用模型再调用。保存后立即生效,无需重启。密钥/模型列表留空表示不修改已有值。</div>
<form id="upsertUpstreamForm" class="grid-form">
<div><label for="upSlot">slot(URL 前缀)</label><input id="upSlot" type="text" placeholder="openai" required></div>
<div><label for="upBase">上游地址</label><input id="upBase" type="text" placeholder="https://api.openai.com" required></div>
<div><label for="upAuth">上游密钥(新建必填,更新可留空)</label><input id="upAuth" type="text" placeholder="sk-..." autocomplete="off"></div>
<div><label for="upNote">备注</label><input id="upNote" type="text" placeholder="可选"></div>
<div style="grid-column:1/-1">
<label for="upModels">该上游挂载的模型(逗号 / 换行分隔,可留空)</label>
<textarea id="upModels" rows="3" placeholder="deepseek-chat, deepseek-reasoner" style="width:100%;padding:9px 11px;border:1px solid var(--border-strong);border-radius:var(--radius);font-family:ui-monospace,Menlo,Consolas,monospace;font-size:12.5px;outline:none;resize:vertical"></textarea>
</div>
<div><button class="btn-primary btn-block" type="submit">保存上游</button></div>
</form>
</div>
@@ -262,12 +271,37 @@
<div class="desc">停用的上游对客户端表现为 404;删除不可恢复,指向它的调用会立即失败。</div>
<table>
<thead><tr>
<th>slot</th><th>上游地址</th><th>密钥</th><th>备注</th><th>状态</th><th>创建时间</th><th>操作</th>
<th>slot</th><th>上游地址</th><th>密钥</th><th>模型</th><th>备注</th><th>状态</th><th>创建时间</th><th>操作</th>
</tr></thead>
<tbody id="upstreamsBody"></tbody>
</table>
</div>
</section>
<!-- ---------- 用量统计 ---------- -->
<section id="tab-usage" hidden>
<div class="panel">
<h2>按账号</h2>
<div class="desc">口径是<strong>请求数</strong>,且只统计真正转发给上游的请求(401/403/404/429 不计)。token 级用量需要网关缓冲 SSE 响应体,会破坏流式透传,因此不做。</div>
<table>
<thead><tr>
<th>账号</th><th>今日</th><th>累计</th><th>最近调用</th><th>分上游明细</th>
</tr></thead>
<tbody id="usageUsersBody"></tbody>
</table>
</div>
<div class="panel">
<h2>按模型 / 上游</h2>
<div class="desc">每条 = 一个上游 slot 的总量;「使用者」列出各账号的今日/累计。</div>
<table>
<thead><tr>
<th>slot</th><th>今日</th><th>累计</th><th>最近调用</th><th>使用者</th>
</tr></thead>
<tbody id="usageModelsBody"></tbody>
</table>
</div>
</section>
</div>
</div>
@@ -277,7 +311,7 @@
(function () {
"use strict";
var state = { me: null, users: [], domains: [], upstreams: [], pending: 0 };
var state = { me: null, users: [], domains: [], upstreams: [], usage: { total: {}, users: [], models: [] }, pending: 0 };
function arr(v) { return Array.isArray(v) ? v : []; }
@@ -386,13 +420,18 @@
return Promise.all([
api("GET", "/api/admin/domains"),
api("GET", "/api/admin/users"),
api("GET", "/api/admin/upstreams")
api("GET", "/api/admin/upstreams"),
api("GET", "/api/admin/usage").catch(function () {
// 老版本后端没有用量接口时不要让整个面板挂掉
return { data: { total: {}, users: [], models: [] } };
})
]);
}).then(function (res) {
state.domains = arr(res[0].data.items);
state.pending = res[0].data.pending || 0;
state.users = arr(res[1].data.items);
state.upstreams = arr(res[2].data.items);
state.usage = res[3].data || { total: {}, users: [], models: [] };
render();
}).catch(function (err) {
toast(err.message, true);
@@ -408,6 +447,20 @@
$("statUsers").textContent = state.users.length;
$("statUpstreams").textContent = state.upstreams.length;
var tot = state.usage.total || {};
$("statLlmtoday").textContent = tot.today || 0;
$("statLlmtotal").textContent = tot.total || 0;
// 可用模型 = 全部(启用中的)上游登记模型去重后的条数
var seen = {};
arr(state.usage.models).forEach(function (m) { seen[m.slot] = true; });
var distinct = {};
state.upstreams.forEach(function (u) {
if (!u.enabled) return;
arr(u.models).forEach(function (m) { distinct[m] = true; });
});
$("statModels").textContent = Object.keys(distinct).length;
var pill = $("pillPending");
if (state.pending > 0) { pill.hidden = false; pill.textContent = state.pending; }
else { pill.hidden = true; }
@@ -416,6 +469,51 @@
renderDomains();
renderUsers();
renderUpstreams();
renderUsage();
}
function renderUsage() {
var ub = $("usageUsersBody");
var rows = arr(state.usage.users);
if (!rows.length) {
ub.innerHTML = '<tr><td colspan="5" class="empty">还没有任何 LLM 调用</td></tr>';
} else {
ub.innerHTML = rows.map(function (u) {
var byModel = arr(u.models).length
? arr(u.models).map(function (m) {
return "<div class='muted nowrap'>" + esc(m.slot) + ":" + (m.today || 0) + " / " + (m.total || 0) + "</div>";
}).join("")
: "<span class='muted'>-</span>";
return "<tr>" +
"<td><b>" + esc(u.username) + "</b></td>" +
"<td>" + (u.today || 0) + "</td>" +
"<td>" + (u.total || 0) + "</td>" +
"<td class='muted nowrap'>" + esc(u.last_ts_text || "-") + "</td>" +
"<td>" + byModel + "</td>" +
"</tr>";
}).join("");
}
var mb = $("usageModelsBody");
var mrows = arr(state.usage.models);
if (!mrows.length) {
mb.innerHTML = '<tr><td colspan="5" class="empty">还没有任何 LLM 调用</td></tr>';
return;
}
mb.innerHTML = mrows.map(function (m) {
var users = arr(m.users).length
? arr(m.users).map(function (x) {
return "<div class='muted nowrap'>" + esc(x.username) + ":" + (x.today || 0) + " / " + (x.total || 0) + "</div>";
}).join("")
: "<span class='muted'>-</span>";
return "<tr>" +
"<td><b>" + esc(m.slot) + "</b></td>" +
"<td>" + (m.today || 0) + "</td>" +
"<td>" + (m.total || 0) + "</td>" +
"<td class='muted nowrap'>" + esc(m.last_ts_text || "-") + "</td>" +
"<td>" + users + "</td>" +
"</tr>";
}).join("");
}
function renderReview() {
@@ -482,7 +580,7 @@
function renderUsers() {
var body = $("usersBody");
if (!state.users.length) {
body.innerHTML = '<tr><td colspan="6" class="empty">还没有账号</td></tr>';
body.innerHTML = '<tr><td colspan="7" class="empty">还没有账号</td></tr>';
return;
}
@@ -497,23 +595,29 @@
var models = arr(u.allowed_models);
var modelsInfo = models.length
? "<div class='muted nowrap'>LLM: " + esc(models.join(", ")) + "</div>"
: "<div class='muted nowrap'>LLM: 不限</div>";
var limitsInfo = "<div class='muted nowrap'>LLM 今日 " + (u.llm_today || 0) + " 次 · 限 " +
(u.llm_rpm > 0 ? u.llm_rpm + "/分" : "不限") + " · " +
? "<div class='muted nowrap'>上游白名单:" + esc(models.join(", ")) + "</div>"
: "<div class='muted nowrap'>上游白名单:不限</div>";
var lu = u.llm_usage || {};
var usageCell = "<b>" + (lu.today || 0) + "</b> <span class='muted'>/ " + (lu.total || 0) + "</span>" +
"<div class='muted nowrap'>" + (lu.last_ts_text ? esc(lu.last_ts_text) : "从未调用") + "</div>" +
"<div class='muted nowrap'>限 " + (u.llm_rpm > 0 ? u.llm_rpm + "/分" : "不限") + " · " +
(u.llm_daily > 0 ? u.llm_daily + "/日" : "不限") + "</div>";
var displayName = u.display_name || "";
return "<tr>" +
"<td><b>" + esc(u.username) + "</b><div class='muted nowrap'>" + esc(u.created_at_text) + "</div>" + modelsInfo + limitsInfo + "</td>" +
"<td><b>" + esc(u.name || u.username) + "</b><div class='muted nowrap'>@" + esc(u.username) + " · " + esc(u.created_at_text) + "</div>" + modelsInfo + "</td>" +
"<td>" + (u.role === "admin" ? "<span class='badge b-blue'>管理员</span>" : "<span class='badge b-gray'>普通</span>") + "</td>" +
"<td><div class='key-cell'><code class='mono'>" + esc(u.api_key_masked) + "</code>" +
"<button class='btn-sm' data-act='copy-key' data-key='" + esc(u.api_key) + "'>复制</button>" +
"<button class='btn-sm' data-act='reset-key' data-user='" + esc(u.username) + "'>重置</button>" +
"</div></td>" +
"<td>" + usageCell + "</td>" +
"<td>" + grant + "</td>" +
"<td>" + esc(u.domain_count) + "</td>" +
"<td><div class='row-actions'>" +
"<button class='btn-sm' data-act='reset-pass' data-user='" + esc(u.username) + "'>改密码</button>" +
"<button class='btn-sm' data-act='set-display' data-user='" + esc(u.username) + "' data-display='" + esc(displayName) + "'>改展示名</button>" +
grantBtn +
"<button class='btn-sm' data-act='set-models' data-user='" + esc(u.username) + "'>可用上游</button>" +
"<button class='btn-sm' data-act='set-limits' data-user='" + esc(u.username) + "'>限额</button>" +
@@ -526,7 +630,7 @@
var sel = $("cdOwner");
var keep = sel.value;
sel.innerHTML = state.users.map(function (u) {
return "<option value='" + esc(u.username) + "'>" + esc(u.username) + "</option>";
return "<option value='" + esc(u.username) + "'>" + esc(u.name || u.username) + "</option>";
}).join("");
if (keep) sel.value = keep;
}
@@ -534,7 +638,7 @@
function renderUpstreams() {
var body = $("upstreamsBody");
if (!state.upstreams.length) {
body.innerHTML = '<tr><td colspan="7" class="empty">还没有配置任何 LLM 上游</td></tr>';
body.innerHTML = '<tr><td colspan="8" class="empty">还没有配置任何 LLM 上游</td></tr>';
return;
}
@@ -546,14 +650,23 @@
var key = u.auth_set
? "<code class='mono'>" + esc(u.auth_mask) + "</code>"
: "<span class='muted'>未设置</span>";
var models = arr(u.models);
var modelCell = models.length
? "<div class='muted' style='font-size:12px'>" + models.map(esc).join("<br>") + "</div>"
: "<span class='muted'>未登记</span>";
return "<tr>" +
"<td><b>" + esc(u.slot) + "</b><div class='muted nowrap'>/" + esc(u.slot) + "/v1/...</div></td>" +
"<td class='mono'>" + esc(u.base) + "</td>" +
"<td>" + key + "</td>" +
"<td>" + (models.length ? "<span class='badge b-blue'>" + models.length + " 个</span>" + modelCell : modelCell) + "</td>" +
"<td>" + esc(u.note || "-") + "</td>" +
"<td>" + (enabled ? "<span class='badge b-ok'>启用中</span>" : "<span class='badge b-gray'>已停用</span>") + "</td>" +
"<td class='muted nowrap'>" + esc(u.created_at_text) + "</td>" +
"<td><div class='row-actions'>" + toggle +
"<td><div class='row-actions'>" +
"<button class='btn-sm' data-act='edit-up' data-slot='" + esc(u.slot) + "'>编辑</button>" +
toggle +
"<button class='btn-sm btn-danger' data-act='del-up' data-slot='" + esc(u.slot) + "'>删除</button>" +
"</div></td>" +
"</tr>";
@@ -595,8 +708,8 @@
var slot = btn.getAttribute("data-slot");
if (act === "toggle-up") {
// 后端约定:save 省略 auth/note 即保留原值,enabled 缺省视为 true——
// 所以启停必须显式带 enabled,auth/note 一律不传,避免误清密钥
// 后端约定:save 省略 auth/note/models 即保留原值,enabled 缺省视为 true——
// 所以启停必须显式带 enabled,其余一律不传,避免误清密钥/模型清单
btn.disabled = true;
api("POST", "/api/admin/upstreams/save", {
slot: slot,
@@ -604,6 +717,16 @@
enabled: btn.getAttribute("data-enabled") === "1"
}).then(function (r) { toast(r.msg); return loadAll(); })
.catch(function (err) { toast(err.message, true); btn.disabled = false; });
} else if (act === "edit-up") {
var up = state.upstreams.filter(function (x) { return x.slot === slot; })[0];
if (!up) return;
$("upSlot").value = up.slot;
$("upBase").value = up.base;
$("upModels").value = arr(up.models).join(", ");
$("upNote").value = up.note || "";
$("upAuth").value = "";
$("upAuth").focus();
toast("已载入 " + slot + ",改完点「保存上游」;密钥留空表示不改");
} else if (act === "del-up") {
if (!confirm("确认删除上游 " + slot + "?删除后指向它的调用将立即 404。")) return;
btn.disabled = true;
@@ -643,6 +766,11 @@
var pwd = prompt("为账号 " + user + " 设置新密码(至少 6 位):");
if (!pwd) return;
req = api("POST", "/api/admin/users/password", { username: user, password: pwd });
} else if (act === "set-display") {
var curDisplay = btn.getAttribute("data-display") || "";
var dn = prompt("账号 " + user + " 的展示名(中文姓名,留空 = 清空):", curDisplay);
if (dn === null) return;
req = api("POST", "/api/admin/users/display", { username: user, display_name: dn.trim() });
} else if (act === "set-models") {
var me = state.users.filter(function (x) { return x.username === user; })[0] || {};
var cur = arr(me.allowed_models).join(", ");
@@ -692,12 +820,14 @@
e.preventDefault();
api("POST", "/api/admin/users/create", {
username: $("cuName").value.trim(),
display_name: $("cuDisplay").value.trim(),
password: $("cuPass").value,
role: $("cuRole").value,
grant_temp: $("cuGrant").checked
}).then(function (r) {
toast(r.msg + ",API Key:" + r.data.api_key);
$("cuName").value = "";
$("cuDisplay").value = "";
$("cuPass").value = "";
$("cuGrant").checked = false;
return loadAll();
@@ -724,6 +854,8 @@
var payload = {
slot: $("upSlot").value.trim(),
base: $("upBase").value.trim(),
// 模型清单总是显式提交:编辑框里就是"当前值",清空即清空(可预期)
models: $("upModels").value,
note: $("upNote").value.trim()
};
// 密钥留空时不传该字段:后端对「缺省」保留旧值,对「空串」是清空
@@ -734,6 +866,7 @@
$("upSlot").value = "";
$("upBase").value = "";
$("upAuth").value = "";
$("upModels").value = "";
$("upNote").value = "";
return loadAll();
}).catch(function (err) { toast(err.message, true); });
@@ -745,7 +878,7 @@
document.querySelectorAll(".tab").forEach(function (t) { t.classList.remove("active"); });
tab.classList.add("active");
["review", "domains", "users", "upstreams"].forEach(function (name) {
["review", "domains", "users", "upstreams", "usage"].forEach(function (name) {
$("tab-" + name).hidden = (name !== tab.getAttribute("data-tab"));
});
});