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

+22
View File
@@ -0,0 +1,22 @@
# iPass 山海关 生产部署(192.168.1.11)
#
# 前置:
# docker load -i ipass-gateway-2.0.0.tar.gz
# mkdir -p /opt/ipass && tar -xzf ipass-data-2.0.0.tar.gz -C /opt/ipass
# chown -R 65534:65534 /opt/ipass/data # 容器 worker 是 nobody(uid 65534),必须可写
#
# 启动:
# docker compose -f compose.yml up -d
#
# 数据持久化在宿主机 /opt/ipass/data,容器随便删重建,状态不丢。
# 升级镜像:load 新 tar 后 `docker compose -f compose.yml up -d --force-recreate`。
services:
gateway:
image: ipass-gateway:2.0.0
container_name: ipass-gateway
ports:
- "88:18098" # 路由器 88 → .11:88;管理 mdm / LLM lm / 企业 *.dm 三域名同端口
# - "80:80" # 如需 *.yourdomain.com 明文转发再放开
volumes:
- /opt/ipass/data:/usr/local/nginx/data
restart: always
+330
View File
@@ -0,0 +1,330 @@
#!/usr/bin/env bash
# =============================================================================
# iPass 山海关 —— 一键更新脚本(在 .11 上运行)
#
# 干的事:拉新镜像 → 备份数据 → 删旧容器 → 复用原端口/挂载起新容器 → 自检
#
# 用法:
# bash update-ipass.sh # 前台跑
# bash update-ipass.sh --bg # 后台跑(日志落 ~/ipass-update-<时间>.log)
# bash update-ipass.sh --check # 只体检(打印探测结果),不改任何东西
#
# 私有仓库若未登录,先执行(或带凭据跑):
# docker login crpi-yscq976uwza88qap.cn-shenzhen.personal.cr.aliyuncs.com
# CR_USER=xxx CR_PASS=yyy bash update-ipass.sh
#
# 可覆盖的环境变量(一般不用动,脚本会自动探测旧容器):
# IMAGE=... 镜像地址
# NAME=... 容器名 (默认:自动探测含 ipass 的容器,兜底 ipass)
# HOST_PORT=... 宿主机端口 (默认:复用旧容器映射,兜底 18098)
# DATA_DIR=... 持久化目录 (默认:复用旧容器挂载,兜底 ~/ipass/data)
# KEEP_OLD=1|0 是否留存旧镜像做回滚标签(默认 1)
# =============================================================================
set -euo pipefail
IMAGE="${IMAGE:-crpi-yscq976uwza88qap.cn-shenzhen.personal.cr.aliyuncs.com/ssw188/nginx:ipass-1.0.0}"
COMPAT_TAG="${COMPAT_TAG:-ipass-gateway:2.0.0}" # 旧 compose 引用的本地名,顺带对齐
CONTAINER_DATA=/usr/local/nginx/data # 容器内数据目录(镜像内固定)
NAME="${NAME:-}"
HOST_PORT="${HOST_PORT:-}"
DATA_DIR="${DATA_DIR:-}"
KEEP_OLD="${KEEP_OLD:-1}"
TS="$(date +%Y%m%d-%H%M%S)"
c_ok() { printf '\033[32m✓\033[0m %s\n' "$*"; }
c_warn() { printf '\033[33m!\033[0m %s\n' "$*"; }
c_err() { printf '\033[31m✗\033[0m %s\n' "$*" >&2; }
step() { printf '\n\033[36m==> %s\033[0m\n' "$*"; }
# ---------------------------------------------------------------- 后台模式
if [ "${1:-}" = "--bg" ]; then
SELF="$(cd "$(dirname "$0")" && pwd)/$(basename "$0")"
LOG="$HOME/ipass-update-$TS.log"
# 光靠 nohup 不够:非交互 shell(ssh 直接执行、被父进程组回收)会把子进程一起带走。
# 优先 setsid 开新会话;没有 setsid 就用 python 的 start_new_session;最后才退回 nohup。
if command -v setsid >/dev/null 2>&1; then
setsid bash "$SELF" >>"$LOG" 2>&1 </dev/null &
BG_PID=$!
elif command -v python3 >/dev/null 2>&1; then
BG_PID="$(python3 - "$SELF" "$LOG" <<'PY'
import subprocess, sys
with open(sys.argv[2], "a") as f:
p = subprocess.Popen(["bash", sys.argv[1]], stdout=f, stderr=subprocess.STDOUT,
stdin=subprocess.DEVNULL, start_new_session=True)
print(p.pid)
PY
)"
else
nohup bash "$SELF" >>"$LOG" 2>&1 </dev/null &
BG_PID=$!
fi
disown 2>/dev/null || true
printf '已后台启动,PID %s\n日志:%s\n跟踪:tail -f %s\n' "$BG_PID" "$LOG" "$LOG"
exit 0
fi
CHECK_ONLY=0
[ "${1:-}" = "--check" ] && CHECK_ONLY=1
# ---------------------------------------------------------------- 选 docker 前缀
if docker info >/dev/null 2>&1; then
DOCKER="docker"
elif sudo -n docker info >/dev/null 2>&1; then
DOCKER="sudo docker"
else
c_err "当前用户既不能直连 docker,也无法免密 sudo。请用 root 跑,或把用户加入 docker 组。"
exit 1
fi
need_root() { if [ "$(id -u)" = "0" ]; then "$@"; else sudo -n "$@"; fi; }
# ---------------------------------------------------------------- 探测旧容器
OLD_NAME=""
if [ -n "$NAME" ]; then
OLD_NAME="$NAME"
else
for cand in ipass ipass-gateway; do
if $DOCKER inspect "$cand" >/dev/null 2>&1; then OLD_NAME="$cand"; break; fi
done
if [ -z "$OLD_NAME" ]; then
OLD_NAME="$($DOCKER ps -a --format '{{.Names}}' 2>/dev/null | grep -i ipass | head -1 || true)"
fi
[ -z "$OLD_NAME" ] && OLD_NAME="ipass"
fi
NAME="$OLD_NAME"
OLD_IMAGE=""; OLD_DATA=""; OLD_NET=""; OLD_COMPOSE=""; MAIN_PORT=""
PORT_ARGS=""; MOUNT_ARGS=""
if $DOCKER inspect "$NAME" >/dev/null 2>&1; then
OLD_IMAGE="$($DOCKER inspect -f '{{.Config.Image}}' "$NAME")"
OLD_DATA="$($DOCKER inspect -f "{{range .Mounts}}{{if eq .Destination \"$CONTAINER_DATA\"}}{{.Source}}{{end}}{{end}}" "$NAME" 2>/dev/null || true)"
# 复用旧容器的全部端口映射(80 / 443 / 18098 等一个都不丢)。
# 必须读 inspect 的 HostConfig 而不是 `docker port`:后者对「已停止/未启动」的
# 容器不返回任何映射,会导致端口静默回落到默认值。
SEEN_PORTS=""
while read -r cport hip hport; do
[ -z "$cport" ] && continue
[ -z "$hport" ] && continue
cport="${cport%%/*}" # 去掉 /tcp 后缀
case "$hip" in
""|"-"|"0.0.0.0"|"::") key="$hport:$cport" ;;
*) key="$hip:$hport:$cport" ;;
esac
case " $SEEN_PORTS " in *" $key "*) continue;; esac
SEEN_PORTS="$SEEN_PORTS $key"
PORT_ARGS="$PORT_ARGS -p $key"
[ "$cport" = "18098" ] && MAIN_PORT="$hport"
done < <($DOCKER inspect -f '{{range $p, $b := .HostConfig.PortBindings}}{{range $b}}{{$p}} {{if .HostIp}}{{.HostIp}}{{else}}-{{end}} {{.HostPort}}{{"\n"}}{{end}}{{end}}' "$NAME" 2>/dev/null || true)
# 复用数据目录以外的额外挂载(证书卷等)
while IFS=$'\t' read -r src dst; do
[ -z "$src" ] && continue
[ "$dst" = "$CONTAINER_DATA" ] && continue
MOUNT_ARGS="$MOUNT_ARGS -v $src:$dst"
done < <($DOCKER inspect -f '{{range .Mounts}}{{.Source}}{{"\t"}}{{.Destination}}{{"\n"}}{{end}}' "$NAME" 2>/dev/null || true)
OLD_NET="$($DOCKER inspect -f '{{.HostConfig.NetworkMode}}' "$NAME" 2>/dev/null || true)"
OLD_COMPOSE="$($DOCKER inspect -f '{{index .Config.Labels "com.docker.compose.project"}}' "$NAME" 2>/dev/null || true)"
c_ok "发现现有容器 $NAME"
printf ' 镜像 %s\n' "$OLD_IMAGE"
printf ' 端口 %s\n' "${PORT_ARGS:-<无映射>}"
printf ' 数据 %s -> %s\n' "${OLD_DATA:-<未挂载>}" "$CONTAINER_DATA"
[ -n "$MOUNT_ARGS" ] && printf ' 附加挂载 %s\n' "$MOUNT_ARGS"
if [ -n "$OLD_COMPOSE" ]; then
c_warn "该容器来自 compose 项目「${OLD_COMPOSE}」;本脚本会用 docker run 直接接管(参数按旧容器复刻)"
c_warn "如想继续用 compose 管理,请改跑:docker compose -f <compose文件> up -d --force-recreate"
fi
else
c_warn "未发现现有容器(首次部署?),走默认参数"
fi
# ---------------------------------------------------------------- 定端口
if [ -n "$HOST_PORT" ]; then
PORT_ARGS=" -p $HOST_PORT:18098"; MAIN_PORT="$HOST_PORT" # 显式指定则以它为准
elif [ -z "$PORT_ARGS" ]; then
PORT_ARGS=" -p 18098:18098"; MAIN_PORT="18098" # 首次部署兜底
fi
# ---------------------------------------------------------------- 定数据目录
if [ -z "$DATA_DIR" ]; then
if [ -n "$OLD_DATA" ]; then
DATA_DIR="$OLD_DATA" # 最安全:原样复用,绝不换地方
elif [ -f "$HOME/ipass/data/users.json" ] || [ -f "$HOME/ipass/data/domains.json" ]; then
DATA_DIR="$HOME/ipass/data"
elif [ -f "$HOME/ipass/users.json" ] || [ -f "$HOME/ipass/domains.json" ]; then
DATA_DIR="$HOME/ipass" # ~/ipass 本身就是数据目录
else
DATA_DIR="$HOME/ipass/data" # 全新:按 ~/ipass/data 约定创建
fi
fi
case "$DATA_DIR" in "~"*) DATA_DIR="$HOME${DATA_DIR#\~}";; esac
_p="$(dirname "$DATA_DIR")"; _b="$(basename "$DATA_DIR")"
[ -d "$_p" ] && DATA_DIR="$(cd "$_p" && pwd)/$_b" # 规范化;父目录不存在则先不动
# 附加网络
NET_ARG=""
[ -n "$OLD_NET" ] && [ "$OLD_NET" != "bridge" ] && [ "$OLD_NET" != "default" ] && NET_ARG=" --network $OLD_NET"
step "本次部署参数"
printf ' 镜像 %s\n' "$IMAGE"
printf ' 容器名 %s\n' "$NAME"
printf ' 端口 %s\n' "${PORT_ARGS:- -p 18098:18098}"
printf ' 数据目录 %s -> %s\n' "$DATA_DIR" "$CONTAINER_DATA"
printf ' 附加 %s\n' "${NET_ARG:-无}${MOUNT_ARGS:+ $MOUNT_ARGS}"
if [ -n "$OLD_DATA" ] && [ "$DATA_DIR" != "$OLD_DATA" ]; then
c_warn "数据目录与旧容器不一致!如需换地方请手动迁移;不想改就删掉 DATA_DIR=... 覆盖"
fi
if [ "$CHECK_ONLY" = "1" ]; then
step "体检模式:不动任何东西"
ls -la "$DATA_DIR" 2>/dev/null | head -12 || c_warn "$DATA_DIR 尚不存在"
exit 0
fi
# ---------------------------------------------------------------- 1. 拉镜像
step "1/6 拉取镜像"
pull() { $DOCKER pull "$IMAGE"; }
if [ "${SKIP_PULL:-0}" = "1" ]; then
$DOCKER image inspect "$IMAGE" >/dev/null 2>&1 \
&& c_warn "SKIP_PULL=1:跳过拉取,直接用本地镜像(仅供内网/离线调试)" \
|| { c_err "SKIP_PULL=1 但本地没有 $IMAGE"; exit 1; }
elif ! pull; then
CR_HOST="${IMAGE%%/*}"
if [ -n "${CR_USER:-}" ] && [ -n "${CR_PASS:-}" ]; then
printf '%s' "$CR_PASS" | $DOCKER login "$CR_HOST" -u "$CR_USER" --password-stdin
pull || { c_err "登录后仍拉取失败,检查网络/权限"; exit 1; }
else
c_err "拉取失败(多为私有仓库未登录)。请先执行:"
printf ' docker login %s\n' "$CR_HOST"
printf '或带凭据:CR_USER=xxx CR_PASS=yyy bash %s\n' "$0"
exit 1
fi
fi
NEW_ID="$($DOCKER image inspect -f '{{.Id}}' "$IMAGE")"
c_ok "已拉取 ${NEW_ID:0:19}"
# ---------------------------------------------------------------- 2. 备份数据
step "2/6 备份数据目录"
BACKUP=""
if [ -d "$DATA_DIR" ] && [ -n "$(ls -A "$DATA_DIR" 2>/dev/null || true)" ]; then
BACKUP="$HOME/ipass-data-backup-$TS.tar.gz"
if tar -czf "$BACKUP" -C "$(dirname "$DATA_DIR")" "$(basename "$DATA_DIR")" 2>/dev/null \
|| need_root tar -czf "$BACKUP" -C "$(dirname "$DATA_DIR")" "$(basename "$DATA_DIR")"; then
c_ok "已备份到 ${BACKUP}($(du -h "$BACKUP" 2>/dev/null | cut -f1))"
else
c_err "备份失败,中止(不冒数据风险)"; exit 1
fi
else
c_warn "$DATA_DIR 为空或不存在,跳过备份"
fi
# ---------------------------------------------------------------- 3. 留旧镜像
step "3/6 保留旧镜像做回滚"
ROLLBACK_TAG=""
if [ "$KEEP_OLD" = "1" ] && [ -n "$OLD_IMAGE" ] && [ "$OLD_IMAGE" != "$IMAGE" ]; then
if $DOCKER image inspect "$OLD_IMAGE" >/dev/null 2>&1; then
OLD_ID="$($DOCKER image inspect -f '{{.Id}}' "$OLD_IMAGE")"
ROLLBACK_TAG="${COMPAT_TAG%:*}:rollback-$TS"
if $DOCKER tag "$OLD_ID" "$ROLLBACK_TAG" 2>/dev/null; then
c_ok "旧镜像存为 $ROLLBACK_TAG"
else
c_warn "回滚标签创建失败(继续)"; ROLLBACK_TAG=""
fi
fi
else
c_warn "跳过(无旧镜像或不保留)"
fi
$DOCKER tag "$NEW_ID" "$COMPAT_TAG" >/dev/null 2>&1 && c_ok "本地标签 $COMPAT_TAG 已指向新镜像"
# ---------------------------------------------------------------- 4. 删旧容器
step "4/6 停止并删除旧容器"
if $DOCKER inspect "$NAME" >/dev/null 2>&1; then
$DOCKER rm -f "$NAME" >/dev/null && c_ok "已删除 $NAME" || { c_err "删除失败"; exit 1; }
else
c_warn "容器 $NAME 不存在,跳过"
fi
# ---------------------------------------------------------------- 5. 起新容器
step "5/6 启动新容器"
mkdir -p "$DATA_DIR"
# worker 是 nobody(65534);数据目录必须可写,否则写穿 JSON 会失败
if ! need_root chown -R 65534:65534 "$DATA_DIR" 2>/dev/null; then
c_warn "chown 65534 失败,退化为 0777(功能可用,权限略宽)"
chmod -R 0777 "$DATA_DIR" 2>/dev/null || true
fi
# 首次部署补种(挂载点会遮住镜像内数据,所以挂到另一个路径去取)
for f in users.json domains.json llm-upstreams.json; do
if [ ! -f "$DATA_DIR/$f" ]; then
c_warn "缺 ${f},从镜像补种"
$DOCKER run --rm --entrypoint sh -v "$DATA_DIR:/seed" "$IMAGE" \
-c "cp -n $CONTAINER_DATA/$f /seed/ 2>/dev/null || true" >/dev/null 2>&1 || true
fi
done
# shellcheck disable=SC2086
if ! $DOCKER run -d \
--name "$NAME" \
--restart always \
$PORT_ARGS \
-v "$DATA_DIR:$CONTAINER_DATA" \
$MOUNT_ARGS \
$NET_ARG \
"$IMAGE" >/dev/null; then
c_err "新容器启动失败,而旧容器已删除——数据在 $DATA_DIR,未受影响。"
RECOVER="${ROLLBACK_TAG:-${OLD_IMAGE:-$IMAGE}}"
printf '\n先确认端口没被别的进程占着:\n'
printf ' ss -lntp | grep %s # 或 lsof -i :%s\n' "${MAIN_PORT:-18098}" "${MAIN_PORT:-18098}"
printf '\n然后手动起回来(旧镜像):\n'
printf ' %s run -d --name %s --restart always %s -v %s:%s%s%s %s\n' \
"$DOCKER" "$NAME" "$PORT_ARGS" "$DATA_DIR" "$CONTAINER_DATA" "$MOUNT_ARGS" "$NET_ARG" "$RECOVER"
exit 1
fi
c_ok "容器已启动:$NAME"
# ---------------------------------------------------------------- 6. 自检
step "6/6 自检"
READY=0; CODE=""
for _ in $(seq 1 30); do
CODE="$($DOCKER exec "$NAME" curl -sk -o /dev/null -w '%{http_code}' \
-H 'Host: mdm.mayishangshu.cn' https://127.0.0.1:18098/api/admin/users 2>/dev/null || true)"
if [ -n "$CODE" ] && [ "$CODE" != "000" ]; then READY=1; break; fi
sleep 1
done
if [ "$READY" = "1" ]; then
c_ok "服务已就绪(容器内自测 HTTP ${CODE};401 = 模块正常,只是没会话)"
else
c_err "30 秒未就绪,查日志:$DOCKER logs --tail 50 $NAME"
fi
printf '\n-- nginx 配置语法 --\n'
$DOCKER exec "$NAME" /usr/local/nginx/sbin/nginx -t 2>&1 | sed 's/^/ /' || true
printf '\n-- 数据状态 --\n'
$DOCKER exec "$NAME" sh -c "ls -l $CONTAINER_DATA/*.json" 2>/dev/null | sed 's/^/ /' || true
UCNT="$($DOCKER exec "$NAME" sh -c "grep -o '\"username\"' $CONTAINER_DATA/users.json 2>/dev/null | wc -l" 2>/dev/null || echo 0)"
printf ' 账号数:%s\n' "${UCNT// /}"
printf '\n-- 宿主机探活 --\n'
HP="${MAIN_PORT:-18098}"
HCODE="$(curl -sk -o /dev/null -w '%{http_code}' -H 'Host: mdm.mayishangshu.cn' \
"https://127.0.0.1:$HP/api/admin/users" 2>/dev/null || echo 000)"
if [ "$HCODE" != "000" ]; then
c_ok "https://127.0.0.1:$HP 可达(HTTP ${HCODE})"
else
c_warn "宿主机 $HP 无响应(容器内正常则检查防火墙/映射)"
fi
cat <<EOF
============================================================
完成:$NAME 已换新镜像,原数据保留。
数据目录 $DATA_DIR
备份 ${BACKUP:-<无>}
启动参数 $PORT_ARGS -v $DATA_DIR:$CONTAINER_DATA$MOUNT_ARGS$NET_ARG
日志 $DOCKER logs -f $NAME
EOF
if [ -n "$ROLLBACK_TAG" ]; then
cat <<EOF
回滚:
$DOCKER rm -f $NAME
$DOCKER run -d --name $NAME --restart always $PORT_ARGS -v $DATA_DIR:$CONTAINER_DATA $MOUNT_ARGS$NET_ARG $ROLLBACK_TAG
EOF
fi
echo "============================================================"