From df99f1410692feab3306115649bc8159f22745af Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期三, 25 十二月 2024 17:25:53 +0800
Subject: [PATCH] 合并excel相关api修改
---
app/api/excel.py | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/app/api/excel.py b/app/api/excel.py
index f581508..0622cb0 100644
--- a/app/api/excel.py
+++ b/app/api/excel.py
@@ -1,6 +1,9 @@
-from fastapi import APIRouter, File, UploadFile, Form, BackgroundTasks
+from fastapi import APIRouter, File, UploadFile, Form, BackgroundTasks, Depends
from fastapi.responses import JSONResponse, FileResponse
from starlette.websockets import WebSocket
+
+from app.api import get_current_user, get_current_user_websocket
+from app.models import UserModel
from app.utils.excelmerge.conformity import run_conformity
import shutil
import os
@@ -39,7 +42,8 @@
@router.post('/excel/upload')
-async def upload_file(files: list[UploadFile] = File(...), user_id: str = Form(...)):
+async def upload_file(files: list[UploadFile] = File(...), current_user: UserModel = Depends(get_current_user)):
+ user_id = str(current_user.id)
if not any(file.filename for file in files):
return JSONResponse(content={"error": "娌℃湁鏂囦欢閮ㄥ垎"}, status_code=400)
if not user_id:
@@ -67,9 +71,10 @@
# ws://localhost:9201/api/document/ws/excel
-@router.websocket("/ws/excel/{user_id}")
-async def ws_excel(websocket: WebSocket, user_id: str):
+@router.websocket("/ws/excel")
+async def ws_excel(websocket: WebSocket, current_user: UserModel = Depends(get_current_user_websocket)):
await websocket.accept()
+ user_id = str(current_user.id)
user_source = user_file_path(user_id, SOURCE_FILES_PATH)
user_excel = user_file_path(user_id, EXCEL_FILES_PATH)
@@ -131,7 +136,9 @@
@router.get("/download/{filename}")
-async def download_file(filename: str, user_id: str, background_tasks: BackgroundTasks):
+async def download_file(filename: str, background_tasks: BackgroundTasks,
+ current_user: UserModel = Depends(get_current_user)):
+ user_id = str(current_user.id)
user_excel = user_file_path(user_id, EXCEL_FILES_PATH)
user_source = user_file_path(user_id, SOURCE_FILES_PATH)
file_path = os.path.join(user_excel, filename)
--
Gitblit v1.8.0