fix: 按单次取件过期问题
This commit is contained in:
+1
-1
@@ -33,7 +33,7 @@ class FileCodes(Model):
|
|||||||
return self.expired_at < await get_now()
|
return self.expired_at < await get_now()
|
||||||
# 按次数
|
# 按次数
|
||||||
else:
|
else:
|
||||||
return self.expired_count != -1 and self.expired_count == 0
|
return self.expired_count <= 0
|
||||||
|
|
||||||
async def get_file_path(self):
|
async def get_file_path(self):
|
||||||
return f"{self.file_path}/{self.uuid_file_name}"
|
return f"{self.file_path}/{self.uuid_file_name}"
|
||||||
|
|||||||
+4
-4
@@ -77,14 +77,14 @@ async def share_file(expire_value: int = Form(default=1, gt=0), expire_style: st
|
|||||||
|
|
||||||
|
|
||||||
# 根据code获取文件
|
# 根据code获取文件
|
||||||
async def get_code_file_by_code(code):
|
async def get_code_file_by_code(code, check=True):
|
||||||
# 查询文件
|
# 查询文件
|
||||||
file_code = await FileCodes.filter(code=code).first()
|
file_code = await FileCodes.filter(code=code).first()
|
||||||
# 检查文件是否存在
|
# 检查文件是否存在
|
||||||
if not file_code:
|
if not file_code:
|
||||||
return False, '文件不存在'
|
return False, '文件不存在'
|
||||||
# 检查文件是否过期
|
# 检查文件是否过期
|
||||||
if await file_code.is_expired():
|
if await file_code.is_expired() and check:
|
||||||
return False, '文件已过期',
|
return False, '文件已过期',
|
||||||
return True, file_code
|
return True, file_code
|
||||||
|
|
||||||
@@ -143,9 +143,9 @@ async def download_file(key: str, code: str, ip: str = Depends(error_ip_limit)):
|
|||||||
# 添加IP到限制列表
|
# 添加IP到限制列表
|
||||||
error_ip_limit.add_ip(ip)
|
error_ip_limit.add_ip(ip)
|
||||||
# 获取文件
|
# 获取文件
|
||||||
has, file_code = await get_code_file_by_code(code)
|
has, file_code = await get_code_file_by_code(code, False)
|
||||||
# 检查文件是否存在
|
# 检查文件是否存在
|
||||||
if not file_code:
|
if not has:
|
||||||
# 返回API响应
|
# 返回API响应
|
||||||
return APIResponse(code=404, detail='文件不存在')
|
return APIResponse(code=404, detail='文件不存在')
|
||||||
# 如果文件是文本,返回文本内容,否则返回文件响应
|
# 如果文件是文本,返回文本内容,否则返回文件响应
|
||||||
|
|||||||
@@ -3,13 +3,11 @@
|
|||||||
# @File : main.py
|
# @File : main.py
|
||||||
# @Software: PyCharm
|
# @Software: PyCharm
|
||||||
import asyncio
|
import asyncio
|
||||||
import os
|
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from fastapi import FastAPI
|
from fastapi import FastAPI
|
||||||
from starlette.middleware.cors import CORSMiddleware
|
from starlette.middleware.cors import CORSMiddleware
|
||||||
from starlette.responses import HTMLResponse, FileResponse
|
from starlette.responses import HTMLResponse, FileResponse
|
||||||
from starlette.staticfiles import StaticFiles
|
|
||||||
from tortoise.contrib.fastapi import register_tortoise
|
from tortoise.contrib.fastapi import register_tortoise
|
||||||
|
|
||||||
from apps.base.views import share_api
|
from apps.base.views import share_api
|
||||||
|
|||||||
Reference in New Issue
Block a user