fastapi+minio:v5

这是对minio进行了桶优化版本
可以解决防止一直在一个目录下存文件

config/config.json

@@ -4,13 +4,6 @@
         "access_key": "minioadmin",
         "secret_key": "minioadmin",
         "secure": false
-    },
-    "buckets": [
-        "file1",
-        "file2",
-        "file3",
-        "file4",
-        "file5"
-    ]
+    }
 }
 

config/config.py

@@ -1,3 +1,9 @@
+"""
+    encoding: UTF-8
+    @author:clx
+    @file:config.py.py
+    @time:2023/5/31 12:48
+"""
 import json
 from minio import Minio
 
@@ -14,8 +20,8 @@ class MinioOperate:
         self.minio_client = Minio(**self.__config["minio"])
         return self.minio_client
 
-    def create_bucket(self):
-        for bucket_name in self.__config['buckets']:
+    def create_bucket(self,buckets:[]):
+        for bucket_name in buckets:
             if not self.minio_client.bucket_exists(bucket_name):
                 try:
                     self.minio_client.make_bucket(bucket_name)
@@ -23,3 +29,5 @@ class MinioOperate:
                     print(f"Bucket creation failed: {e}")
             else:
                 print(f"Bucket {bucket_name} already exists")
+
+

routers/files.py

@@ -1,27 +1,27 @@
 import os
 import re
 import time
-from datetime import datetime, timedelta
+from datetime import timedelta
+import datetime
 from io import BytesIO
 from fastapi import Depends, FastAPI, HTTPException, status, UploadFile, APIRouter, File
 from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
 from starlette.responses import StreamingResponse
 from config import config
 from models.model import *
-from utils.jwt import authenticate_user, ACCESS_TOKEN_EXPIRE_MINUTES, create_access_token, get_current_active_user
-
-
-
+from utils.jwt import authenticate_user, ACCESS_TOKEN_EXPIRE_MINUTES, create_access_token, get_current_active_user, \
+    fake_users_db
 
 # 创建minio对象
 minio_class = config.MinioOperate()
 # 连接minio
 minio_client = minio_class.link_minio()
 # 创建bucket
-minio_class.create_bucket()
+minio_class.create_bucket(["file", "image"])
 
 router = APIRouter()
 
+
 @router.post("/token", response_model=Token)
 async def login_for_access_token(form_data: OAuth2PasswordRequestForm = Depends()):
     user = authenticate_user(fake_users_db, form_data.username, form_data.password)
@@ -31,7 +31,9 @@ async def login_for_access_token(form_data: OAuth2PasswordRequestForm = Depends(
             detail="Incorrect username or password",
             headers={"WWW-Authenticate": "Bearer"},
         )
+    # 设置令牌过期时间
     access_token_expires = timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
+    # 创建访问令牌
     access_token = create_access_token(
         data={"sub": user.username}, expires_delta=access_token_expires
     )
@@ -40,8 +42,8 @@ async def login_for_access_token(form_data: OAuth2PasswordRequestForm = Depends(
 
 # minio ?上传文件时在重复时，需要修改文件名
 @router.post("/file")
-async def create_file(file: UploadFile = File(...),current_user: User = Depends(get_current_active_user)):
-    timestamp = str(time.time())
+async def create_file(file: UploadFile = File(...)):
+    timestamp = str(time.time()).ljust(18,"0")
     uid = re.sub(r"\.", "", timestamp)
     front, ext = os.path.splitext(file.filename)
 
@@ -50,16 +52,17 @@ async def create_file(file: UploadFile = File(...),current_user: User = Depends(
     file_stream = BytesIO(initial_bytes=data)
     size = len(data)
 
-    uri = os.path.join("/file/", file_name)
+    date = str(datetime.date.today())
+    object_path = date + "/{}".format(file_name)
     if (minio_client.put_object(
-            "file1",
-            file_name,
+            "image",
+            object_path,
             file_stream,
             size
     )):
-        return {"status": 200, "path": uri}
+        return {"status": 200, "data": [file_name], "msg": ""}
     else:
-        return {"msg": "上传失败", "status": 400}
+        return {"status": 400, "data": [], "msg": "Post Failed!"}
 
 
 # 图片预览
@@ -69,23 +72,33 @@ async def create_file(file: UploadFile = File(...),current_user: User = Depends(
 @router.get("/file/{uid}")
 async def download_file(uid: str):
     try:
-        file_obj = minio_client.get_object("file1", uid)
+        timestamp, ext = os.path.splitext(uid)
+        timestamp = float(str(float(timestamp) / 10000000).ljust(18,"0"))
+        object_path = str(time.localtime(timestamp).tm_year) + "-" + str(time.localtime(timestamp).tm_mon).rjust(2,
+                                                                                                                 "0") + "-" \
+                      + str(time.localtime(timestamp).tm_mday).rjust(2, "0") + "/{}".format(uid)
+        file_obj = minio_client.get_object("image", object_path)
         file_content = BytesIO(file_obj.read())
         # response = StreamingResponse(file_content,
         #                              media_type='application/octet-stream',
         #                              headers={"Content-Disposition": f"attachment; filename={uid}"})
         response = StreamingResponse(file_content, media_type='image/png')
     except Exception as e:
-        return {"error": str(e)}
+        return {"status": 400, "data": [], "msg": "Get Failed!"}
     return response
 
 
-# 删除
+# 删除  鉴权 current_user: User = Depends(get_current_active_user)
 @router.delete("/file/{uid}")
-async def delete_file(uid: str,current_user: User = Depends(get_current_active_user)):
+async def delete_file(uid: str):
     try:
-        minio_client.get_object("file1", uid)
-        minio_client.remove_object("file1", uid)
-        return {"msg": "删除图片成功！", "status": 200}
+        timestamp, ext = os.path.splitext(uid)
+        timestamp = float(str(float(timestamp) / 10000000).ljust(18,"0"))
+        object_path = str(time.localtime(timestamp).tm_year) + "-" + str(time.localtime(timestamp).tm_mon).rjust(2,
+                                                                                                                 "0") + "-" \
+                      + str(time.localtime(timestamp).tm_mday).rjust(2, "0") + "/{}".format(uid)
+        minio_client.get_object("image", object_path)
+        minio_client.remove_object("image", object_path)
+        return {"status": 200, "data": [], "msg": "Delete Success！"}
     except:
-        return {"msg": "Not Found", "status": 404}
+        return {"status": 404, "data": [], "msg": "Not Found"}