From 0c682f78212378797547c2033b25a880d3fbda4b Mon Sep 17 00:00:00 2001 From: "mula.liu" Date: Fri, 13 Nov 2026 16:51:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.example | 6 +++--- README.md | 10 +++++----- docker-compose.yml | 8 ++++---- docker/Dockerfile.api | 2 +- docker/Dockerfile.web | 2 +- docker/README.md | 4 ++-- docker/api-entrypoint.sh | 4 ++-- docker/nginx.conf | 4 ++-- scripts/deploy.sh | 2 +- scripts/dev.sh | 4 ++-- scripts/nginx-nex-buddy.conf | 6 +++--- scripts/start.sh | 2 +- server/app/api/device_v1.py | 4 ++-- server/app/core/config.py | 6 +++--- server/scripts/smoke.py | 4 ++-- server/scripts/smoke_firmware.py | 4 ++-- server/scripts/smoke_weblogin.py | 4 ++-- web/vite.config.ts | 4 ++-- 18 files changed, 40 insertions(+), 40 deletions(-) diff --git a/.env.example b/.env.example index 876f5e7..ffcebc5 100644 --- a/.env.example +++ b/.env.example @@ -5,10 +5,10 @@ APP_VERSION=0.1.0 # ---- 端口 ---- # 开发:scripts/dev.sh 监听 BACKEND_PORT,Vite 监听 FRONTEND_PORT。 -# Docker:这两个值是宿主机映射端口,容器内仍是 8100 / 80。 +# Docker:这两个值是宿主机映射端口,容器内固定为 8000 / 5173。 # localhost 的 CORS 源会自动跟随 FRONTEND_PORT;同域部署不需要额外配置 CORS。 -BACKEND_PORT=8100 -FRONTEND_PORT=5174 +BACKEND_PORT=8000 +FRONTEND_PORT=5173 # ---- 数据库 ---- # 注意:Docker 容器里的 127.0.0.1 是容器自己,不是宿主机。 diff --git a/README.md b/README.md index 9172df3..9e048a5 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ ```bash cd 01-开发工作区/服务平台/nex_buddy cp .env.example .env # 首次:填数据库/Redis/和风凭据 -./scripts/dev.sh # 后端:建 venv → alembic upgrade head → uvicorn :8100 +./scripts/dev.sh # 后端:建 venv → alembic upgrade head → uvicorn :8000 # 媒体、固件等运行时资源统一放在根目录 data/(可用 DATA_DIR 覆盖) # 首次初始化:码表(3442 条行政区划 + 12 星座)、月度运势、管理员 @@ -22,10 +22,10 @@ cd server ../.venv/bin/python scripts/seed_fortunes.py ../.venv/bin/python scripts/create_admin.py --account admin@nexbuddy.com --password 'NexBuddy2026' -cd ../web && npm install && npm run dev # 前端 5174,/api 与 /device 代理到 8100(端口都在根 .env) +cd ../web && npm install && npm run dev # 前端 5173,/api 与 /device 代理到 8000(端口都在根 .env) ``` -- 前端 ;接口文档 +- 前端 ;接口文档 - 健康检查 `GET /healthz` → `{ok, db, redis, weather_ready}`(设备配网页的「测试连通」就是打它) - 端到端自测:`cd server && ../.venv/bin/python scripts/smoke.py` 会创建 `smoke*@test.local` 用户与 `SMOKE*` 设备,跑完按 `../03-服务端开发文档.md` §10.3 清理 @@ -195,7 +195,7 @@ nex_buddy/ | `QWEATHER_KEY` / `QWEATHER_HOST` | 和风凭据;也可在管理端「平台设置」里改(库里优先) | | `WEB_BASE_URL` | 二维码里 Web 地址的**覆盖值**;空则按设备请求 Host 推导(同域部署不用配) | | `DATA_DIR` | 运行时资源根目录,默认项目根 `data/`;服务器/容器部署可指向宿主机挂载点 | -| `BACKEND_PORT` / `FRONTEND_PORT` | 端口(默认 8100 / 5174):开发时是监听端口,Docker 部署时是宿主机映射端口;容器内固定为 8100 / 80。localhost 的 CORS 源自动跟随 | +| `BACKEND_PORT` / `FRONTEND_PORT` | 端口(默认 8000 / 5173):开发时是监听端口,Docker 部署时是宿主机映射端口;容器内固定为 8000 / 5173。localhost 的 CORS 源自动跟随 | | `CORS_ORIGINS` | **一般不用配**:同域部署不需要;仅 Web 与 API 分离域时设置,如 `https://app.example.com`。配了 `WEB_BASE_URL` 时其源会自动放行 | | `SESSION_TTL_SECONDS` / `PAIR_CODE_TTL_SECONDS` / `WEB_LOGIN_TTL_SECONDS` | 会话 7 天 / 配对码 10 分钟 / 扫码票据 5 分钟 | | `DEFAULT_CITY` | 用户没填城市时的兜底(默认杭州) | @@ -207,4 +207,4 @@ nex_buddy/ 1. **Redis 快照写盘失败**(`rdb_last_bgsave_status=err`,`dir=/data`):已临时 `CONFIG SET stop-writes-on-bgsave-error no`(重启失效)。 业务数据在 PG,丢快照只影响登录态;根治要在服务器查 `df -h /data` 与 Redis 日志。 2. **开发机 IP 用 DHCP**:设备 `net.server` 与截图脚本里的地址会变,改配置以设备 NVS/命令行参数为准。 -3. **后端偶发事件循环卡死**(端口在听但请求超时):`lsof -i :8100` 找 PID → `kill -9` → 重新 `./scripts/dev.sh`;排查见 `03` §10。 +3. **后端偶发事件循环卡死**(端口在听但请求超时):`lsof -i :8000` 找 PID → `kill -9` → 重新 `./scripts/dev.sh`;排查见 `03` §10。 diff --git a/docker-compose.yml b/docker-compose.yml index 10c5887..7af76e7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,18 +22,18 @@ services: # 容器内固定使用 /app/data,宿主机路径由下面的 volumes 决定 DATA_DIR: /app/data # 容器内端口固定;宿主机映射端口由 .env 的 BACKEND_PORT 决定 - BACKEND_PORT: "8100" + BACKEND_PORT: "8000" FORWARDED_ALLOW_IPS: "*" WEB_CONCURRENCY: "${WEB_CONCURRENCY:-2}" volumes: # 默认挂载项目根 data/;要换宿主机磁盘就改这里,或用 NEX_BUDDY_DATA_DIR 指定 - "${NEX_BUDDY_DATA_DIR:-./data}:/app/data" ports: - # 宿主机端口由 .env 的 BACKEND_PORT 决定;容器内始终是 8100 + # 宿主机端口由 .env 的 BACKEND_PORT 决定;容器内始终是 8000 - "${BACKEND_PORT:-8000}:8000" restart: unless-stopped healthcheck: - test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://127.0.0.1:8100/healthz', timeout=3)"] + test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://127.0.0.1:8000/healthz', timeout=3)"] interval: 10s timeout: 5s retries: 20 @@ -49,7 +49,7 @@ services: NGINX_IMAGE: "${NGINX_IMAGE:-nginx:latest}" image: nex-buddy-web:latest ports: - # 宿主机端口由 .env 的 FRONTEND_PORT 决定;容器内始终是 80 + # 宿主机端口由 .env 的 FRONTEND_PORT 决定;容器内始终是 5173 - "${FRONTEND_PORT:-5173}:5173" depends_on: api: diff --git a/docker/Dockerfile.api b/docker/Dockerfile.api index 48619d1..044a581 100644 --- a/docker/Dockerfile.api +++ b/docker/Dockerfile.api @@ -49,6 +49,6 @@ RUN chmod +x /usr/local/bin/api-entrypoint \ && mkdir -p /app/data/media /app/data/firmware VOLUME ["/app/data"] -EXPOSE 8100 +EXPOSE 8000 ENTRYPOINT ["/usr/local/bin/api-entrypoint"] diff --git a/docker/Dockerfile.web b/docker/Dockerfile.web index 2c0df3b..4a2f5fc 100644 --- a/docker/Dockerfile.web +++ b/docker/Dockerfile.web @@ -22,4 +22,4 @@ FROM ${NGINX_IMAGE} COPY docker/nginx.conf /etc/nginx/conf.d/default.conf COPY --from=build /app/web/dist /usr/share/nginx/html -EXPOSE 80 +EXPOSE 5173 diff --git a/docker/README.md b/docker/README.md index 658cfeb..389c410 100644 --- a/docker/README.md +++ b/docker/README.md @@ -97,8 +97,8 @@ services: | 变量 | 宿主机端口 | 容器内端口 | 服务 | |---|---|---|---| -| `FRONTEND_PORT` | `5174`(示例) | `80` | Web / Nginx | -| `BACKEND_PORT` | `8100`(示例) | `8100` | API | +| `FRONTEND_PORT` | `5173`(示例) | `5173` | Web / Nginx | +| `BACKEND_PORT` | `8000`(示例) | `8000` | API | 只通过 Nginx 的 `/api`、`/device` 访问后端时,`BACKEND_PORT` 的宿主机映射可以删除; 需要直接访问接口文档或设备直连 API 时保留。 diff --git a/docker/api-entrypoint.sh b/docker/api-entrypoint.sh index 30fd5ea..7d200ae 100755 --- a/docker/api-entrypoint.sh +++ b/docker/api-entrypoint.sh @@ -29,10 +29,10 @@ if [ "${RUN_MIGRATIONS:-1}" = "1" ]; then python -m alembic upgrade head fi -echo ">> uvicorn :${BACKEND_PORT:-8100} (workers=${WEB_CONCURRENCY:-2})" +echo ">> uvicorn :${BACKEND_PORT:-8000} (workers=${WEB_CONCURRENCY:-2})" exec python -m uvicorn app.main:app \ --host 0.0.0.0 \ - --port "${BACKEND_PORT:-8100}" \ + --port "${BACKEND_PORT:-8000}" \ --workers "${WEB_CONCURRENCY:-2}" \ --proxy-headers \ --forwarded-allow-ips "${FORWARDED_ALLOW_IPS:-*}" diff --git a/docker/nginx.conf b/docker/nginx.conf index 8356315..cfd8973 100644 --- a/docker/nginx.conf +++ b/docker/nginx.conf @@ -1,5 +1,5 @@ server { - listen 80; + listen 5173; server_name _; root /usr/share/nginx/html; @@ -10,7 +10,7 @@ server { # Docker 内置 DNS:api 容器重建后也能重新解析 resolver 127.0.0.11 valid=10s ipv6=off; - set $api_upstream http://api:8100; + set $api_upstream http://api:8000; location /api/ { proxy_pass $api_upstream$request_uri; diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 162328f..397e91e 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -97,7 +97,7 @@ if [ "$DO_WEB" = 1 ]; then fi PORT="$(grep -E '^BACKEND_PORT=' .env 2>/dev/null | tail -1 | cut -d= -f2 | tr -d '[:space:]' || true)" -PORT="${PORT:-8100}" +PORT="${PORT:-8000}" SERVICE_NAME="${SERVICE_NAME:-nex-buddy}" STARTED=0 diff --git a/scripts/dev.sh b/scripts/dev.sh index 68813fc..ae24ee5 100755 --- a/scripts/dev.sh +++ b/scripts/dev.sh @@ -1,13 +1,13 @@ #!/usr/bin/env bash # 开发期启动:scripts/dev.sh [端口] -# 后端端口默认取 .env 的 BACKEND_PORT(没有就用 8100);命令行参数优先级更高。 +# 后端端口默认取 .env 的 BACKEND_PORT(没有就用 8000);命令行参数优先级更高。 set -euo pipefail cd "$(dirname "$0")/.." PORT="${1:-}" if [ -z "$PORT" ]; then PORT="$(grep -E '^BACKEND_PORT=' .env 2>/dev/null | tail -1 | cut -d= -f2 | tr -d '[:space:]' || true)" - PORT="${PORT:-8100}" + PORT="${PORT:-8000}" fi if [ ! -d .venv ]; then diff --git a/scripts/nginx-nex-buddy.conf b/scripts/nginx-nex-buddy.conf index 2a3a78a..506386f 100644 --- a/scripts/nginx-nex-buddy.conf +++ b/scripts/nginx-nex-buddy.conf @@ -12,7 +12,7 @@ server { client_max_body_size 40m; location /api/ { - proxy_pass http://127.0.0.1:8100; + proxy_pass http://127.0.0.1:8000; proxy_read_timeout 300s; proxy_send_timeout 300s; proxy_set_header Host $host; @@ -22,7 +22,7 @@ server { } location /device/ { - proxy_pass http://127.0.0.1:8100; + proxy_pass http://127.0.0.1:8000; proxy_read_timeout 300s; proxy_send_timeout 300s; proxy_set_header Host $host; @@ -32,7 +32,7 @@ server { } location = /healthz { - proxy_pass http://127.0.0.1:8100; + proxy_pass http://127.0.0.1:8000; proxy_set_header Host $host; proxy_set_header X-Forwarded-Proto $scheme; } diff --git a/scripts/start.sh b/scripts/start.sh index 97f0539..f1cb4e8 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -7,7 +7,7 @@ cd "$(dirname "$0")/.." PORT="${1:-}" if [ -z "$PORT" ]; then PORT="$(grep -E '^BACKEND_PORT=' .env 2>/dev/null | tail -1 | cut -d= -f2 | tr -d '[:space:]' || true)" - PORT="${PORT:-8100}" + PORT="${PORT:-8000}" fi if [ ! -x .venv/bin/python ]; then diff --git a/server/app/api/device_v1.py b/server/app/api/device_v1.py index b5df23b..6c02357 100644 --- a/server/app/api/device_v1.py +++ b/server/app/api/device_v1.py @@ -373,8 +373,8 @@ def _web_base(request: Request) -> str: 不再单独配置:设备里配的「服务端地址」就是它请求我们的 Host,同域拼接天然 正确(正式部署 Web 与 API 同一个入口)。只有两种情况需要干预: - * 前后端分离开发:设备直连 API 端口(.env 的 ``BACKEND_PORT``,默认 8100), - 页面在 ``FRONTEND_PORT``(默认 5174),按这两个端口换算; + * 前后端分离开发:设备直连 API 端口(.env 的 ``BACKEND_PORT``,默认 8000), + 页面在 ``FRONTEND_PORT``(默认 5173),按这两个端口换算; * Web 与 API 真的不同域(CDN 等):用 .env 的 ``WEB_BASE_URL`` 覆盖。 """ base = settings.web_base_url.strip() diff --git a/server/app/core/config.py b/server/app/core/config.py index 68733c5..8098999 100644 --- a/server/app/core/config.py +++ b/server/app/core/config.py @@ -42,10 +42,10 @@ class Settings(BaseSettings): # 默认按设备请求的 Host 推导——设备里配的「服务端地址」就是它,同域部署不用配。 # 仅当 Web 与 API 确实不同域时才在这里(.env)覆盖。 web_base_url: str = "" - # 端口(开发期):scripts/dev.sh 起后端、vite 起前端都从 .env 读这两个值, + # 端口:scripts/dev.sh 起后端、vite 起前端都从 .env 读这两个值, # 改了 FRONTEND_PORT 后,localhost 的 CORS 源会自动跟着换(见 cors_list) - backend_port: int = 8100 - frontend_port: int = 5174 + backend_port: int = 8000 + frontend_port: int = 5173 # 扫码登录票据有效期:够扫码 + 手机打开,过期就在设备上重开一次 web_login_ttl_seconds: int = 300 pair_claim_window_seconds: int = 120 # 码消费后 2 分钟内必须换 token diff --git a/server/scripts/smoke.py b/server/scripts/smoke.py index 0492140..5602bc7 100644 --- a/server/scripts/smoke.py +++ b/server/scripts/smoke.py @@ -1,7 +1,7 @@ """端到端冒烟:注册 → 发码 → 绑定 → 换 token → 资料/星盘 → 天气 → 解绑 → 码表管理。 用法: - ../.venv/bin/python scripts/smoke.py [http://127.0.0.1:8100] + ../.venv/bin/python scripts/smoke.py [http://127.0.0.1:8000] 管理端用例需要管理员账号,默认取环境变量 ADMIN_ACCOUNT / ADMIN_PASSWORD, 不传则跳过那几条(不算失败)。 @@ -17,7 +17,7 @@ import time import httpx -BASE = (sys.argv[1] if len(sys.argv) > 1 else "http://127.0.0.1:8100").rstrip("/") +BASE = (sys.argv[1] if len(sys.argv) > 1 else "http://127.0.0.1:8000").rstrip("/") ADMIN_ACCOUNT = os.getenv("ADMIN_ACCOUNT", "admin@nexbuddy.com") ADMIN_PASSWORD = os.getenv("ADMIN_PASSWORD", "NexBuddy2026") CHIP = f"SMOKE{random.randint(0x10000000, 0x7FFFFFFF):08X}" # 13 chars,模拟 efuse MAC diff --git a/server/scripts/smoke_firmware.py b/server/scripts/smoke_firmware.py index a6e74bf..54f12d7 100644 --- a/server/scripts/smoke_firmware.py +++ b/server/scripts/smoke_firmware.py @@ -1,7 +1,7 @@ """固件发布链路端到端冒烟:上传 → 发布 → 设备 check → 下载 → 上报 → 再 check。 用法(后端已 ./scripts/dev.sh 起来): - .venv/bin/python scripts/smoke_firmware.py [http://127.0.0.1:8100] + .venv/bin/python scripts/smoke_firmware.py [http://127.0.0.1:8000] 管理端用例需要管理员账号,默认 admin@nexbuddy.com / NexBuddy2026。 脚本会在库里留下一个 SMOKE-OTA 设备和一个 9.9.9 的固件包,跑完自动清掉。 @@ -17,7 +17,7 @@ import time import httpx -BASE = (sys.argv[1] if len(sys.argv) > 1 else "http://127.0.0.1:8100").rstrip("/") +BASE = (sys.argv[1] if len(sys.argv) > 1 else "http://127.0.0.1:8000").rstrip("/") ADMIN_ACCOUNT = os.getenv("ADMIN_ACCOUNT", "admin@nexbuddy.com") ADMIN_PASSWORD = os.getenv("ADMIN_PASSWORD", "NexBuddy2026") CHIP = f"SMOKEOTA{random.randint(0x100000, 0xFFFFFF):06X}" diff --git a/server/scripts/smoke_weblogin.py b/server/scripts/smoke_weblogin.py index d004e7f..9ab0650 100644 --- a/server/scripts/smoke_weblogin.py +++ b/server/scripts/smoke_weblogin.py @@ -1,7 +1,7 @@ """扫码免登录端到端:注册 → 配对 → 设备取票 → 手机端换会话 → 一次性校验。 用法: - ../.venv/bin/python scripts/smoke_weblogin.py [http://127.0.0.1:8100] + ../.venv/bin/python scripts/smoke_weblogin.py [http://127.0.0.1:8000] """ from __future__ import annotations @@ -12,7 +12,7 @@ import time import httpx -BASE = (sys.argv[1] if len(sys.argv) > 1 else "http://127.0.0.1:8100").rstrip("/") +BASE = (sys.argv[1] if len(sys.argv) > 1 else "http://127.0.0.1:8000").rstrip("/") CHIP = f"QRLOG{random.randint(0x10000000, 0x7FFFFFFF):08X}" ACCOUNT = f"qr{int(time.time())}@test.local" PASSWORD = "qr-pass-123" diff --git a/web/vite.config.ts b/web/vite.config.ts index 6bbe65f..81225c5 100644 --- a/web/vite.config.ts +++ b/web/vite.config.ts @@ -23,8 +23,8 @@ function readRootEnv(): Record { } const env = readRootEnv() -const BACKEND_PORT = Number(env.BACKEND_PORT) || 8100 -const FRONTEND_PORT = Number(env.FRONTEND_PORT) || 5174 +const BACKEND_PORT = Number(env.BACKEND_PORT) || 8000 +const FRONTEND_PORT = Number(env.FRONTEND_PORT) || 5173 const proxy = { '/api': { target: `http://127.0.0.1:${BACKEND_PORT}`, changeOrigin: true },