diff --git a/main.py b/main.py index 1335ec4..2d2ddb6 100644 --- a/main.py +++ b/main.py @@ -11,10 +11,10 @@ app.include_router(typemanage.router) app.include_router(blogmanage.router) app.add_middleware( CORSMiddleware, - allow_origins=['http://localhost:5173'], # 允许的源 + allow_origins=['http://localhost:5173'], allow_credentials=True, - allow_methods=['GET', 'POST'], # 允许的请求方法 - allow_headers=['Authorization', 'Content-Type'], # 允许的请求头 + allow_methods=['GET', 'POST'], + allow_headers=['Authorization', 'Content-Type'], ) # # 用户登录 diff --git a/routers/blogmanage.py b/routers/blogmanage.py index e655264..e86984d 100644 --- a/routers/blogmanage.py +++ b/routers/blogmanage.py @@ -1,6 +1,7 @@ from fastapi import Depends, APIRouter, status,Query from internal.models import * from dependencies import get_current_active_user, execute_query +from datetime import datetime router = APIRouter( prefix="/blogs", @@ -34,10 +35,10 @@ async def blog_list(): async def blog_list_bytitle( blogtitle: str= Query(None, description="博客标题"), typename: str = Query(None, description="博客类型"), - # start_date:str=Query(None,description="开始时间"), - # end_date:str=Query(None,description="开始时间"), - + start_date:str=Query(None,description="开始时间"), + end_date:str=Query(None,description="结束时间"), ): + print(f"Start Date: {type(start_date)}, End Date: {end_date}") select_query = "SELECT blogtitle, blogcontent, typename, create_at, update_at, blogs.descr FROM blogs LEFT JOIN `types` ON blogs.typeid = types.id WHERE 1=1" params = [] @@ -49,13 +50,13 @@ async def blog_list_bytitle( select_query += " AND typename LIKE %s" params.append(f"%{typename}%") - # if start_date: - # select_query += " AND create_at >= %s" - # params.append(start_date) + if start_date: + select_query += " AND create_at >= %s" + params.append(start_date) - # if end_date: - # select_query += " AND create_at <= %s" - # params.append(end_date) + if end_date: + select_query += " AND create_at <= %s" + params.append(end_date) # 添加排序条件 select_query += " ORDER BY create_at DESC"