fix: 上传接口缺 request 参数致 500;Excel 导入 JSONResponse 解析崩溃
- modules/upload/router.py:三个上传端点补 request: Request 参数,permission_required 可正常取到当前用户 - modules/system/level/service.py:import_level 解析 upload_file 返回的 JSONResponse body 再取 filePath,修复 Excel 导入崩溃 - 实测:uploadImage 上传成功、level 导入 7 条成功;清理测试产生的重复 level 数据 Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -39,6 +39,7 @@
|
|||||||
# | 许可协议》附件为准。
|
# | 许可协议》附件为准。
|
||||||
# +======================================================================
|
# +======================================================================
|
||||||
import asyncio
|
import asyncio
|
||||||
|
import json
|
||||||
import os
|
import os
|
||||||
import random
|
import random
|
||||||
import time
|
import time
|
||||||
@@ -173,12 +174,13 @@ def update_level_status(request, data: LevelStatusForm):
|
|||||||
# 导入Excel
|
# 导入Excel
|
||||||
|
|
||||||
async def import_level(request, file):
|
async def import_level(request, file):
|
||||||
# 读取上传的文件
|
# 读取上传的文件(upload_file 返回 JSONResponse,需解析 body 判断业务结果)
|
||||||
result = await upload.upload_file(file, ".xls|.xlsx")
|
result = await upload.upload_file(file, ".xls|.xlsx")
|
||||||
if result.get('code') != 0:
|
body = json.loads(result.body) if result.body else {}
|
||||||
|
if body.get('code') != 0:
|
||||||
return result
|
return result
|
||||||
# 本地文件地址
|
# 本地文件地址
|
||||||
relative_path = result['data']['filePath']
|
relative_path = body['data']['filePath']
|
||||||
path = FASTAPI_UPLOAD_DIR + relative_path
|
path = FASTAPI_UPLOAD_DIR + relative_path
|
||||||
|
|
||||||
def _import():
|
def _import():
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
from fastapi import APIRouter, UploadFile, File
|
from fastapi import APIRouter, UploadFile, File
|
||||||
|
from starlette.requests import Request
|
||||||
|
|
||||||
from core.middleware import check_demo
|
from core.middleware import check_demo
|
||||||
from core.middleware import permission_required
|
from core.middleware import permission_required
|
||||||
@@ -12,7 +13,7 @@ router = APIRouter()
|
|||||||
@router.post('/uploadImage', summary='上传图片')
|
@router.post('/uploadImage', summary='上传图片')
|
||||||
@permission_required("sys:upload:image")
|
@permission_required("sys:upload:image")
|
||||||
@check_demo
|
@check_demo
|
||||||
async def upload_image(file: UploadFile = File(...)):
|
async def upload_image(request: Request, file: UploadFile = File(...)):
|
||||||
return await upload.upload_image(file)
|
return await upload.upload_image(file)
|
||||||
|
|
||||||
|
|
||||||
@@ -20,7 +21,7 @@ async def upload_image(file: UploadFile = File(...)):
|
|||||||
@router.post('/uploadFile', summary='上传文件')
|
@router.post('/uploadFile', summary='上传文件')
|
||||||
@permission_required("sys:upload:file")
|
@permission_required("sys:upload:file")
|
||||||
@check_demo
|
@check_demo
|
||||||
async def upload_file(file: UploadFile = File(...)):
|
async def upload_file(request: Request, file: UploadFile = File(...)):
|
||||||
return await upload.upload_file(file)
|
return await upload.upload_file(file)
|
||||||
|
|
||||||
|
|
||||||
@@ -28,7 +29,7 @@ async def upload_file(file: UploadFile = File(...)):
|
|||||||
@router.post('/uploadEditImage', summary='富文本图片上传')
|
@router.post('/uploadEditImage', summary='富文本图片上传')
|
||||||
@permission_required("sys:upload:image")
|
@permission_required("sys:upload:image")
|
||||||
@check_demo
|
@check_demo
|
||||||
async def upload_edit_image(file: UploadFile = File(...)):
|
async def upload_edit_image(request: Request, file: UploadFile = File(...)):
|
||||||
result = await upload.upload_image(file)
|
result = await upload.upload_image(file)
|
||||||
# 兼容富文本编辑器返回格式
|
# 兼容富文本编辑器返回格式
|
||||||
if result.status_code == 200:
|
if result.status_code == 200:
|
||||||
|
|||||||
Reference in New Issue
Block a user