diff --git a/backend/app/api/v1/endpoints/orders.py b/backend/app/api/v1/endpoints/orders.py index afc4b5b..57d1410 100644 --- a/backend/app/api/v1/endpoints/orders.py +++ b/backend/app/api/v1/endpoints/orders.py @@ -9,6 +9,7 @@ from sqlalchemy.orm import selectinload from app.core.database import get_db from app.models.production_order import ProductionOrder from app.schemas.order import OrderCreate, OrderResponse +from app.services.auth_service import get_current_user router = APIRouter(prefix="/orders", tags=["订单管理"]) @@ -27,7 +28,11 @@ async def list_orders( @router.post("/", response_model=OrderResponse, status_code=201) -async def create_order(data: OrderCreate, db: AsyncSession = Depends(get_db)): +async def create_order( + data: OrderCreate, + db: AsyncSession = Depends(get_db), + current_user: dict = Depends(get_current_user), +): order = ProductionOrder(**data.model_dump()) db.add(order) await db.commit() diff --git a/backend/app/api/v1/endpoints/print.py b/backend/app/api/v1/endpoints/print.py index c93e069..82a25ab 100644 --- a/backend/app/api/v1/endpoints/print.py +++ b/backend/app/api/v1/endpoints/print.py @@ -1,9 +1,10 @@ """标签打印 API — 预览 / 执行 / 打印机配置""" -from fastapi import APIRouter, HTTPException, status +from fastapi import APIRouter, Depends, HTTPException, status from pydantic import BaseModel, Field from app.services.label_service import generate_preview_image, send_to_printer from app.services.print_config import PrintConfigManager +from app.services.auth_service import get_current_user router = APIRouter(prefix="/print", tags=["标签打印"]) @@ -49,7 +50,10 @@ def print_preview(data: LabelPreviewRequest) -> dict: @router.post("/execute") -def print_execute(data: PrintExecuteRequest) -> dict: +def print_execute( + data: PrintExecuteRequest, + current_user: dict = Depends(get_current_user), +) -> dict: """发送打印指令到物理打标机""" payload = data.model_dump() copies = payload.pop("copies", 1) @@ -77,7 +81,10 @@ def get_printer_config() -> dict: @router.post("/config") -def update_printer_config(data: PrinterConfigUpdate) -> dict: +def update_printer_config( + data: PrinterConfigUpdate, + current_user: dict = Depends(get_current_user), +) -> dict: """更新打印机配置(IP/端口)""" current = PrintConfigManager.get_config() current["label_printer"] = { diff --git a/backend/app/api/v1/endpoints/records.py b/backend/app/api/v1/endpoints/records.py index 38eb511..8ac7531 100644 --- a/backend/app/api/v1/endpoints/records.py +++ b/backend/app/api/v1/endpoints/records.py @@ -8,6 +8,7 @@ from sqlalchemy.ext.asyncio import AsyncSession from app.core.database import get_db from app.models.task import TaskRecord from app.schemas.task import TaskRecordCreate, TaskRecordResponse +from app.services.auth_service import get_current_user router = APIRouter(prefix="/records", tags=["任务记录"]) @@ -25,6 +26,7 @@ async def update_record( record_id: int, data: TaskRecordCreate, db: AsyncSession = Depends(get_db), + current_user: dict = Depends(get_current_user), ): """更新任务记录(备注+图片)""" record = await _get_record_or_404(db, record_id) @@ -40,6 +42,7 @@ async def update_record( async def delete_record( record_id: int, db: AsyncSession = Depends(get_db), + current_user: dict = Depends(get_current_user), ): """删除任务记录""" record = await _get_record_or_404(db, record_id) diff --git a/backend/app/services/auth_service.py b/backend/app/services/auth_service.py index 606785e..170d614 100644 --- a/backend/app/services/auth_service.py +++ b/backend/app/services/auth_service.py @@ -23,21 +23,7 @@ def login(username: str, password: str) -> LoginResponse: """登录 — 签发双 Token(Access + Refresh)""" db = MomSessionLocal() try: - # 1. 超级管理员硬编码(和 MOM 系统一致) - if username == "IRIS" and password == "123321": - token_data = {"sub": "0", "role": "SUPER_ADMIN", "username": "IRIS", "display_name": "超级管理员"} - return LoginResponse( - access_token=create_access_token(data=token_data), - refresh_token=create_refresh_token(data=token_data), - user=UserResponse( - id="0", - username="IRIS", - display_name="超级管理员", - role="SUPER_ADMIN", - ), - ) - - # 2. 普通用户:LIKE '%/username' 模糊匹配 MOM sys_user 表 + # 1. 普通用户:LIKE '%/username' 模糊匹配 MOM sys_user 表 from sqlalchemy import text result = db.execute( text( @@ -57,14 +43,14 @@ def login(username: str, password: str) -> LoginResponse: user_id, full_username, department, role, password_hash = row - # 3. Werkzeug scrypt 密码验证 + # 2. Werkzeug scrypt 密码验证 if not check_password_hash(password_hash, password): raise HTTPException( status_code=status.HTTP_401_UNAUTHORIZED, detail="用户名或密码错误", ) - # 4. 解析 display_name("张三/zhangsan01" → "张三") + # 3. 解析 display_name("张三/zhangsan01" → "张三") display_name = full_username.split("/")[0] if "/" in full_username else full_username token_data = {