From ac9dc50f6b8403c4f4b0918432e11d7268fcadf1 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 26 十二月 2024 17:28:18 +0800
Subject: [PATCH] 登录过程密码加密
---
app/api/excel.py | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/app/api/excel.py b/app/api/excel.py
index 5f35b5a..9c13103 100644
--- a/app/api/excel.py
+++ b/app/api/excel.py
@@ -1,6 +1,9 @@
-from fastapi import APIRouter, File, UploadFile, Form
+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)
@@ -130,13 +135,38 @@
await websocket.close()
-@router.get("/download/{filename}")
-async def download_file(filename: str, user_id: str):
+@router.get("/download/excel")
+async def download_file(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)
+
+ if not os.path.exists(user_excel):
+ return JSONResponse(status_code=404, content={"error": "鐢ㄦ埛鐩綍涓嶅瓨鍦�"})
+
+ excel_files = [f for f in os.listdir(user_excel) if os.path.isfile(os.path.join(user_excel, f))]
+ excel_files.sort(key=lambda x: os.path.getmtime(os.path.join(user_excel, x)), reverse=True)
+ if not excel_files:
+ return JSONResponse(status_code=404, content={"error": "鐢ㄦ埛鐩綍鍐呮病鏈夋枃浠�"})
+
+ filename = excel_files[0]
file_path = os.path.join(user_excel, filename)
- if not os.path.exists(file_path):
- return JSONResponse(status_code=404, content={"error": "鏂囦欢涓嶅瓨鍦�"})
+ def delete_files_in_directory(directory):
+ for root, dirs, files in os.walk(directory, topdown=False):
+ for name in files:
+ os.remove(os.path.join(root, name))
+ for name in dirs:
+ os.rmdir(os.path.join(root, name))
+
+ def delete_file():
+ try:
+ delete_files_in_directory(user_excel)
+ delete_files_in_directory(user_source)
+ except OSError as e:
+ print(f"Error deleting file {file_path}: {e}")
+
+ background_tasks.add_task(delete_file)
return FileResponse(file_path, filename=filename,
media_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
--
Gitblit v1.8.0