diff --git a/routers/blogtype.py b/routers/blogtype.py index d17b750..229ae73 100644 --- a/routers/blogtype.py +++ b/routers/blogtype.py @@ -54,7 +54,7 @@ async def type_del(id: str = Path(description="类型id")): return response_success() # 根据id查询语录 -@router.get("/list/search/{id}") +@router.get("/search/{id}") async def type_search_id(id:str=Path(description="类型id")): select_query="SELECT * FROM blogtypes WHERE id=%s" type_query=fetch_one(select_query,(id,)) diff --git a/routers/diarymanage.py b/routers/diarymanage.py index bcffd75..dc1983f 100644 --- a/routers/diarymanage.py +++ b/routers/diarymanage.py @@ -23,7 +23,7 @@ async def diary_list(page: int = Query(None), page_size: int = Query(None)): limit_clause = f"LIMIT {page_size} OFFSET {offset}" # 列表参数:日记名称、日记内容、创建时间、日记图片、日记查看时间、日记阅读次数、日记字数、类型名称、标签名列表 select_query = f""" - SELECT diarys.id,diarys.diarytitle, diarys.diarycontent, diarys.create_at, diarys.imglink, + SELECT diarys.id,diarys.diarytitle, diarys.diarycontent,diarys.readnum, diarys.create_at, diarys.imglink, diarys.wordcount, diarytypes.typename FROM diarys LEFT JOIN `diarytypes` ON diarys.typeid = diarytypes.id ORDER BY create_at DESC @@ -133,7 +133,7 @@ async def diary_list_search( # 根据id查询日记 -@router.get("/list/search/{id}") +@router.get("/search/{id}") async def get_id_diary(id: str = Path(description="日记id")): select_query = """SELECT diarys.id, diarytitle, diarycontent,wordcount, diarys.typeid, diarys.descr,imglink FROM diarys LEFT JOIN `diarytypes` ON diarys.typeid = diarytypes.id diff --git a/routers/diarytype.py b/routers/diarytype.py index 791fd46..cdd727c 100644 --- a/routers/diarytype.py +++ b/routers/diarytype.py @@ -23,7 +23,7 @@ async def type_add(type:Type): return response_success(data=type,message="type create success") # 单条数据查询 -@router.get("/list/search") +@router.get("/search") async def type_search(typename:str=Query(description="类型名称")): select_query="SELECT id,typename,descr FROM diarytypes WHERE 1=1 " params=[] @@ -54,7 +54,7 @@ async def type_del(id: str = Path(description="类型id")): return response_success() # 根据id查询语录 -@router.get("/list/search/{id}") +@router.get("/search/{id}") async def type_search_id(id:str=Path(description="类型id")): select_query="SELECT * FROM diarytypes WHERE id=%s" type_query=fetch_one(select_query,(id,)) diff --git a/routers/photomanage.py b/routers/photomanage.py index b6c1880..ee8e4f2 100644 --- a/routers/photomanage.py +++ b/routers/photomanage.py @@ -19,7 +19,7 @@ REMOTE_HOST = "111.229.38.129" REMOTE_PORT = 6000 # 默认为 22 REMOTE_USERNAME = "root" REMOTE_PASSWORD = "zl981023" -REMOTE_BASE_DIRECTORY = "/home/blog" +REMOTE_BASE_DIRECTORY = "/home/blog/imgs" def file_exists(sftp, remote_file_path: str) -> bool: diff --git a/routers/statistic.py b/routers/statistic.py index 91e6e0d..74d5394 100644 --- a/routers/statistic.py +++ b/routers/statistic.py @@ -65,6 +65,7 @@ async def search_homepage_data(title: str = Query("", description="Title to sear blogs.blogcontent, blogs.create_at, blogs.imglink, + blogs.readnum, blogs.wordcount, blogtypes.typename, JSON_ARRAYAGG(labels.labelname) AS labelnames @@ -90,7 +91,8 @@ async def search_homepage_data(title: str = Query("", description="Title to sear SELECT diarys.id, diarys.diarytitle, - diarys.diarycontent, + diarys.diarycontent, + diarys.readnum, diarys.imglink, diarytypes.typename, diarys.create_at,