From bae341e1bc3bbd873904a111e0a756c7967fed30 Mon Sep 17 00:00:00 2001 From: whm <973418690@qq.com> Date: Tue, 17 Mar 2026 21:51:41 +0800 Subject: [PATCH] 1 --- nginx/yuheng.docker.conf | 2 +- pull-and-restart.sh | 5 ++++- server/.env.example | 2 +- server/Dockerfile | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nginx/yuheng.docker.conf b/nginx/yuheng.docker.conf index bcf87be..d640e46 100644 --- a/nginx/yuheng.docker.conf +++ b/nginx/yuheng.docker.conf @@ -31,7 +31,7 @@ server { } location /api/ { - proxy_pass http://api:9527/; + proxy_pass http://api:8088/; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; diff --git a/pull-and-restart.sh b/pull-and-restart.sh index bafe589..a102d35 100644 --- a/pull-and-restart.sh +++ b/pull-and-restart.sh @@ -1,10 +1,12 @@ #!/usr/bin/env bash # 拉取代码并重启:缺什么自动安装(curl、Git、Docker、Docker Compose),再 git 拉取 + docker compose 构建启动 -# 用法:cd 项目根 && chmod +x pull-and-restart.sh && ./pull-and-restart.sh +# 用法:cd 项目根 && ./pull-and-restart.sh(若 Permission denied 则先执行 bash pull-and-restart.sh 或 chmod +x pull-and-restart.sh restart.sh) # 行尾:LF set -e ROOT="${PROJECT_ROOT:-$(cd "$(dirname "$0")" && pwd)}" cd "$ROOT" +# 拉取后可能无可执行权限,先自修复以便下次可直接 ./ 执行 +chmod +x "$ROOT/pull-and-restart.sh" "$ROOT/restart.sh" 2>/dev/null || true run_sudo() { sudo "$@"; } @@ -296,6 +298,7 @@ elif [ -f "$ROOT/nginx/$NGINX_DOMAIN/fullchain.pem" ] && [ -f "$ROOT/nginx/$NGIN run_sudo chmod 644 "$NGINX_SSL_DIR/fullchain.pem" run_sudo chmod 600 "$NGINX_SSL_DIR/privkey.pem" fi +compose_cmd down 2>/dev/null || true compose_cmd up -d --force-recreate echo "" diff --git a/server/.env.example b/server/.env.example index c43a157..9fa2d66 100644 --- a/server/.env.example +++ b/server/.env.example @@ -4,7 +4,7 @@ MONGODB_URI=mongodb://mongo:27017 MONGODB_DB=yxd-agent-testing -PORT=9527 +PORT=8088 GIN_MODE=release # 对外域名(CORS、日志),与 nginx 反代域名一致 ALLOWED_ORIGINS=https://yuheng.yuxindazhineng.com diff --git a/server/Dockerfile b/server/Dockerfile index bce0ad0..0c3ad84 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -16,5 +16,5 @@ WORKDIR /app RUN apk add --no-cache ca-certificates tzdata ENV TZ=Asia/Shanghai COPY --from=builder /app/server . -EXPOSE 9527 +EXPOSE 8088 ENTRYPOINT ["./server"]