diff --git a/.env.example b/.env.example index 6b60c21..1a441ae 100644 --- a/.env.example +++ b/.env.example @@ -13,6 +13,8 @@ AI_TEMPERATURE=0.2 # ---- 服务 ---- PORT=8770 +# 监听地址:默认 0.0.0.0(局域网可访问);只想本机访问就设 127.0.0.1 +HOST=0.0.0.0 # ---- 登录账号(首次启动时用来创建管理员,之后以数据库里的为准)---- ADMIN_USERNAME=admin diff --git a/README.md b/README.md index 754144f..feb5f1d 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ cd /path/to/unis_manager ./scripts/run.sh ``` -打开 +打开 。服务默认监听 **0.0.0.0**:同事在局域网里用 `http://<本机IP>:8770` 直接访问(脚本启动时会把这行地址打印出来);只想本机访问就 `HOST=127.0.0.1 ./scripts/run.sh`。 首次运行 `scripts/run.sh` 会自动完成:检查 Python 3.10+ → 建项目内 `.venv` → 缺依赖自动安装(默认源失败会依次切国内镜像)→ 缺 `.env` 时从 `.env.example` 生成 → 建库 → 启动并打开浏览器。已有 `data/board.db` 时直接复用,不会覆盖数据。 @@ -139,7 +139,7 @@ cd /path/to/unis_manager ./scripts/deploy.sh up # 构建镜像 + 后台启动 + 等健康检查 ``` -打开 。首次启动自动建表、预置分类,并创建内置角色与 `admin` 账号(密码见 `.env`)。 +打开 (局域网访问 `http://<本机IP>:8770`,监听地址由 `.env` 的 `HOST` 控制,默认 `0.0.0.0`)。首次启动自动建表、预置分类,并创建内置角色与 `admin` 账号(密码见 `.env`)。 | 文件 | 作用 | |---|---| @@ -204,7 +204,7 @@ docker compose up -d - **数据只落在 `./data`**:重建镜像、`down` 再 `up` 都不动数据;备份依旧是拷走 `data/board.db`。 - **时区必须设**:容器默认 UTC,而周期/周次/入库时间都按本地日期算,所以 compose 固定传 `TZ=Asia/Shanghai`,别删。 - **容器内端口固定 8770**:`.env` 的 `PORT` 是本机 `scripts/run.sh` 用的,compose 里覆盖成 8770;要换端口只改 `HOST_PORT`。 -- **别和 `scripts/run.sh` 同时跑**:一是 SQLite 是文件库,同一份 `board.db` 不要同时被本机进程和容器读写;二是本机进程绑的是 `127.0.0.1:8770`,比 Docker 发布的 `*:8770` 更精确,浏览器和 `curl 127.0.0.1:8770` 会全打到本机服务上(症状:`/health` 里 `dev` 是 `true`,而容器是 `false`)。两者要共存就给容器换端口:`HOST_PORT=8899 ./scripts/deploy.sh up`。 +- **别和 `scripts/run.sh` 同时跑**:一是 SQLite 是文件库,同一份 `board.db` 不要同时被本机进程和容器读写;二是默认两边都监听全部网卡的 8770(run.sh 的 `HOST=0.0.0.0` × compose 的 `HOST_PORT=8770`),后启动的那个会直接撞端口。两者要共存就给一边换端口:`HOST_PORT=8899 ./scripts/deploy.sh up` 或 `PORT=8899 ./scripts/run.sh`。 - **换 MySQL**:放开 `Dockerfile` 里 `pymysql` 那行重新 build,再把 `.env` 的 `DATABASE_URL` 指过去(见「迁移到 MySQL」)。 ### 带着现有数据部署 diff --git a/app/routers/ai.py b/app/routers/ai.py index 9093791..5403ee1 100644 --- a/app/routers/ai.py +++ b/app/routers/ai.py @@ -5,7 +5,7 @@ import json from fastapi import APIRouter, Depends, HTTPException from sqlalchemy.orm import Session -from .. import ai_parser +from .. import ai_parser, constants from ..db import get_db from ..models import ImportLog, Period, Project, Task, Update from ..schemas import AICommitIn, AIParseIn @@ -120,8 +120,13 @@ def ai_commit(payload: AICommitIn, db: Session = Depends(get_db)): created.append(u) if parsed.get("progress") is not None: - project.progress = float(parsed["progress"]) or 0 + try: + project.progress = float(parsed["progress"]) or 0 + except (TypeError, ValueError): + raise HTTPException(400, "进度必须是数字") if parsed.get("status"): + if parsed["status"] not in constants.STATUS_CODES: + raise HTTPException(400, "状态不认识:" + str(parsed["status"])) project.status = parsed["status"] db.add( diff --git a/app/routers/custom.py b/app/routers/custom.py index 67adfc9..aa90bb8 100644 --- a/app/routers/custom.py +++ b/app/routers/custom.py @@ -142,10 +142,18 @@ def _sort_by_update(projects): return sorted(projects, key=key, reverse=True) +def _num(v, label: str) -> float: + """把接口传来的数值安全转 float;脏值给 400 中文,不裸抛 float('abc') 变 500。""" + try: + return float(v) + except (TypeError, ValueError): + raise HTTPException(400, f"{label}必须是数字") + + def _add_delta(cp: CustomProject, field: str, delta) -> None: """本期新增量累加进项目台账(下单金额 / 计收金额同一套口径)。""" if delta: - setattr(cp, field, max(0.0, float(getattr(cp, field) or 0.0) + float(delta))) + setattr(cp, field, max(0.0, float(getattr(cp, field) or 0.0) + _num(delta, "金额"))) def _rebase_delta(cp: CustomProject, field: str, prev, new) -> None: @@ -331,6 +339,20 @@ def patch_custom_project(cid: int, payload: dict, db: Session = Depends(get_db)) payload["name"] = new_name if "region" in payload: payload["region"] = normalize_region(payload.get("region")) + # 脏数值 / 脏布尔先转成模型能吃的形状,报 400 中文,别让 flush 阶段炸 500 + for k, lbl in (("amount", "订单金额"), ("progress", "进度"), ("manual_ratio", "人工占比"), + ("revenue_amount", "计收金额"), ("invoice_amount", "开票金额"), ("received_amount", "回款金额")): + if payload.get(k) not in (None, ""): + payload[k] = _num(payload[k], lbl) + for k in ("is_key", "archived"): + if k in payload and not isinstance(payload[k], bool): + s = str(payload[k]).strip().lower() + if s in ("true", "1", "yes", "是"): + payload[k] = True + elif s in ("false", "0", "no", "否", ""): + payload[k] = False + else: + raise HTTPException(400, "是/否字段只认真假值") changed = False for k, v in payload.items(): if k in allowed: @@ -389,10 +411,12 @@ def create_custom_update(payload: dict, db: Session = Depends(get_db)): if not pid or not db.get(Period, pid): raise HTTPException(400, "请选择记录所属周期") # 先把项目状态 / 进度按本次记录更新,再取推导出的阶段存进记录,历史轨迹才对得上 + if not any((payload.get(k) or "").strip() for k in ("content", "summary", "raw_text")): + raise HTTPException(400, "记录内容不能为空") if payload.get("project_status") is not None: cp.project_status = (payload["project_status"] or "").strip() or None if payload.get("progress") is not None: - cp.progress = float(payload["progress"]) + cp.progress = _num(payload["progress"], "进度") _sync_stage(cp, stage_hint=payload.get("stage")) u = CustomUpdate( custom_project_id=payload["custom_project_id"], @@ -434,10 +458,10 @@ def patch_custom_update(uid: int, payload: dict, db: Session = Depends(get_db)): for k in ("content", "summary", "risk", "next_step", "owner"): if k in payload: setattr(u, k, payload[k] or None) - for k in ("progress", "amount_delta", "revenue_delta"): + for k, lbl in (("progress", "进度"), ("amount_delta", "金额"), ("revenue_delta", "计收金额")): if k in payload: v = payload[k] - setattr(u, k, None if v in (None, "") else float(v)) + setattr(u, k, None if v in (None, "") else _num(v, lbl)) if "period_id" in payload: if not payload["period_id"]: raise HTTPException(400, "周期不能为空") @@ -445,7 +469,7 @@ def patch_custom_update(uid: int, payload: dict, db: Session = Depends(get_db)): raise HTTPException(404, "周期不存在,请重新选择周期") u.period_id = int(payload["period_id"]) if payload.get("progress") is not None and cp: - cp.progress = float(payload["progress"]) + cp.progress = _num(payload["progress"], "进度") if cp and ("project_status" in payload or payload.get("stage")): if "project_status" in payload: cp.project_status = (payload["project_status"] or "").strip() or None diff --git a/info b/info new file mode 100644 index 0000000..50a82fa --- /dev/null +++ b/info @@ -0,0 +1 @@ +loglevel- diff --git a/scripts/run.sh b/scripts/run.sh index 344e2ac..396ecf7 100755 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -2,8 +2,9 @@ # DMS管理平台 · 本地启动脚本(macOS / Linux / Windows Git Bash 均可) # # 用法: -# ./scripts/run.sh 正常启动(默认开热更新) +# ./scripts/run.sh 正常启动(默认开热更新,监听 0.0.0.0 供局域网访问) # PORT=8771 ./scripts/run.sh 换端口 +# HOST=127.0.0.1 ./scripts/run.sh 只监听本机(默认是 0.0.0.0,同机可写 http://本机IP:端口) # DEV=0 ./scripts/run.sh 关闭热更新 # NO_OPEN=1 ./scripts/run.sh 启动后不打开浏览器 # AUTO_INSTALL=0 ./scripts/run.sh 缺环境时不尝试自动安装,只打印安装命令 @@ -53,6 +54,9 @@ run_root() { # ---------- 配置 ---------- PORT="${PORT:-$(env_get PORT)}" PORT="${PORT:-8770}" +# 默认监听所有网卡:局域网同事用 http://<本机IP>: 直接访问(无 TLS,仅限内网) +HOST="${HOST:-$(env_get HOST)}" +HOST="${HOST:-0.0.0.0}" DEV="${DEV:-$(env_get DEV)}" DEV="${DEV:-1}" export DEV @@ -291,7 +295,23 @@ open_url() { } URL="http://127.0.0.1:${PORT}" +# 探测本机局域网 IP(UDP connect 不发包,只挑默认路由的源地址) +LAN_IP="$("$PY_SYS" - <<'PY' 2>/dev/null || true +import socket +s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) +try: + s.connect(("10.255.255.255", 1)) + print(s.getsockname()[0]) +except Exception: + pass +finally: + s.close() +PY +)" echo "==> 启动服务: $URL" +if [ "$HOST" = "0.0.0.0" ] && [ -n "$LAN_IP" ]; then + echo " 局域网访问: http://${LAN_IP}:${PORT} (监听 0.0.0.0;HOST=127.0.0.1 可改回仅本机)" +fi echo " API 文档: $URL/api/docs" echo " 热更新: $([ "$DEV" = "1" ] && echo 开启 || echo 关闭)" echo " 停止服务: Ctrl+C" @@ -301,5 +321,5 @@ if [ "$NO_OPEN" != "1" ]; then ( sleep 3; open_url "$URL" ) & fi -exec "$VENV_PY" -m uvicorn app.main:app --host 127.0.0.1 --port "$PORT" \ +exec "$VENV_PY" -m uvicorn app.main:app --host "$HOST" --port "$PORT" \ ${RELOAD_ARGS[@]+"${RELOAD_ARGS[@]}"} diff --git a/tests/test_api_contract.py b/tests/test_api_contract.py index 6f603f0..e144021 100644 --- a/tests/test_api_contract.py +++ b/tests/test_api_contract.py @@ -199,3 +199,39 @@ def test_写操作抛500也留审计(h): hit = [x for x in logs["items"] if x["path"] == "/api/boom-test"] assert hit and hit[0]["status"] == 500 + +def test_脏数值与空内容报400中文(h): + """写入口对畸形输入给 400 中文,不裸抛 float('abc') 变 500(README「报错一律中文」)。""" + pid = h.today_period_id + cp = h.custom("脏数据靶子") + bad = [ + ("/api/custom/updates", {"custom_project_id": cp["id"], "period_id": pid, "content": "x", "progress": "abc"}), + ("/api/custom/updates", {"custom_project_id": cp["id"], "period_id": pid, "content": "x", "amount_delta": "好多"}), + ] + for url, body in bad: + r = h.admin.post(url, json=body) + assert r.status_code == 400 and "数字" in r.json()["detail"], r.text + # 正文/摘要/原文全空 → 400,不写出全空记录 + r = h.admin.post("/api/custom/updates", json={"custom_project_id": cp["id"], "period_id": pid}) + assert r.status_code == 400 and "空" in r.json()["detail"] + # 项目 PATCH 脏数值 / 脏布尔 + assert "数字" in h.admin.patch(f"/api/custom/projects/{cp['id']}", json={"progress": "高"}).json()["detail"] + assert h.admin.patch(f"/api/custom/projects/{cp['id']}", json={"is_key": "也许"}).status_code == 400 + # 是/否能接受 0/1/true 字符串 + assert h.admin.patch(f"/api/custom/projects/{cp['id']}", json={"is_key": 1}).json()["is_key"] is True + + +def test_AI落库校验状态与进度(h): + """POST /api/ai/commit:非法状态 400(与 POST /updates 同口径),进度非数字 400。""" + p = h.project("AI靶项目") + pid = h.today_period_id + r = h.admin.post("/api/ai/commit", json={ + "project_id": p["id"], "period_id": pid, "raw_text": "推进", "mode": "rule", + "parsed": {"status": "外星状态", "progress": 50, "updates": []}}) + assert r.status_code == 400 and "状态" in r.json()["detail"], r.text + r = h.admin.post("/api/ai/commit", json={ + "project_id": p["id"], "period_id": pid, "raw_text": "推进", "mode": "rule", + "parsed": {"progress": "五成", "updates": []}}) + assert r.status_code == 400 and "数字" in r.json()["detail"], r.text + +