Merge remote-tracking branch 'origin/master'

zhangxiao

2024-10-23 fa7bbd77cc161a3c91742adc910d8c5ccc8e3459

 app/api/excel.py

@@ -56,8 +56,7 @@
        if file.filename == '':
            return JSONResponse(content={"error": "没有选择文件"}, status_code=400)
        if file and allowed_file(file.filename):
            filename = secure_filename(file.filename)
            save_path = os.path.join(SOURCE_FILES_PATH, filename)
            save_path = os.path.join(SOURCE_FILES_PATH, file.filename)
            with open(save_path, 'wb') as buffer:
                shutil.copyfileobj(file.file, buffer)
            save_path_list.append(save_path)
@@ -90,7 +89,7 @@
                    file_name = os.path.basename(first_file)
                    file_url = f"./api/document/download/{first_file}"
                    await websocket.send_json({
                        "step_message": "文档合并成功！",
                        "message": "文档合并成功！",
                        "type": "stream",
                        "files": [{
                            "file_name": file_name,
@@ -98,7 +97,7 @@
                        }]
                    })
                    await websocket.send_json({
                        "step_message": "",
                        "message": "文档合并成功！",
                        "type": "close",
                    })
                else: