修改查看图片的问题

app/api/business/project_train_api.py

@@ -30,6 +30,12 @@ def get_type_list(session: Session = Depends(get_db)):
 
 @project.post("/list")
 def project_pager(info: ProjectInfoPager, session: Session = Depends(get_db)):
+    """
+
+    :param info:
+    :param session:
+    :return:
+    """
     pager = pic.get_project_pager(info, session)
     return rc.response_success_pager(pager)
 
@@ -120,7 +126,9 @@ def del_label(label_id: int, session: Session = Depends(get_db)):
 
 
 @project.post("/up_proj_img")
-def upload_project_image(project_id: int = Form(...), files: List[UploadFile] = File(...), session: Session = Depends(get_db)):
+def upload_project_image(project_id: int = Form(...),
+                         files: List[UploadFile] = File(...),
+                         session: Session = Depends(get_db)):
     """
     上传项目图片
     :param files: 文件图片

app/api/common/view_img.py

@@ -1,20 +1,41 @@
 import os
-from fastapi import APIRouter, HTTPException
+from fastapi import APIRouter, HTTPException, Depends
 from starlette.responses import FileResponse
+from sqlalchemy.orm import Session
 
+from app.model.crud.project_image_crud import get_img_url
 from app.config.config_reader import images_url
+from app.db.db_session import get_db
 
 view = APIRouter()
 
 
-@view.get("/{file_path:path}")
-def view_img(file_path):
+@view.get("/view_img/{image_id}")
+def view_img(image_id: int, session: Session = Depends(get_db)):
     """
     查看图片
-    :param file_path: 图片路径
+    :param session:
+    :param image_id: 图片id
     :return:
     """
-    image_path = os.path.join(images_url, file_path)
+    sour_url, thumb_url = get_img_url(image_id, session)
+    image_path = os.path.join(images_url, sour_url)
+    # 检查文件是否存在以及是否是文件
+    if not os.path.isfile(image_path):
+        raise HTTPException(status_code=404, detail="Image not found")
+    return FileResponse(image_path, media_type='image/jpeg')
+
+
+@view.get("/view_thumb/{image_id}")
+def view_thumb(image_id: int, session: Session = Depends(get_db)):
+    """
+    查看图片
+    :param session:
+    :param image_id: 图片id
+    :return:
+    """
+    sour_url, thumb_url = get_img_url(image_id, session)
+    image_path = os.path.join(images_url, thumb_url)
     # 检查文件是否存在以及是否是文件
     if not os.path.isfile(image_path):
         raise HTTPException(status_code=404, detail="Image not found")