From aed0f687eb1eeecd7ec82ecb84ef8a4ec217989d Mon Sep 17 00:00:00 2001
From: SunFree <7934952@qq.com>
Date: Thu, 16 May 2024 17:17:53 +0800
Subject: [PATCH] add news

---
 internal/__pycache__/models.cpython-310.pyc   | Bin 2628 -> 2634 bytes
 internal/models.py                            |   7 +-
 .../__pycache__/blogmanage.cpython-310.pyc    | Bin 867 -> 1969 bytes
 .../__pycache__/typemanage.cpython-310.pyc    | Bin 660 -> 702 bytes
 .../__pycache__/usermanage.cpython-310.pyc    | Bin 1426 -> 1426 bytes
 routers/blogmanage.py                         |  74 +++++++++++++++---
 routers/typemanage.py                         |  23 +++---
 7 files changed, 82 insertions(+), 22 deletions(-)

diff --git a/internal/__pycache__/models.cpython-310.pyc b/internal/__pycache__/models.cpython-310.pyc
index 21138bf9209893b52bdde6eb083f8e23b988a3c0..224506a2259d064caf1c95e7e79528256320c1be 100644
GIT binary patch
delta 157
zcmX>ia!Q0ZpO=@50SG3QyQZ0J<gH?16qww>vVu`%vmxt0Mn?6?2J8*${6VS31^Ic!
zslKVj#fj;ux7dnH5=%;pZ?We>1z1uNOA;qvVOLbT#g?Cxm6}{q#0xYPiQofqwSk1)
nW)Y4WMpgqL(`E8hPHjem$p<;zfFuW(F(<o#hyb&IxCk2nNz^Gs

delta 132
zcmX>lazunTpO=@50SH8;T+%c)@>a1h@=oqxS;45d*^u=gBcsY>1NH_L9;clA^q|z@
zg8aPV)LU%DC5a`a#kbgVQ;Ule(^I2Zl7P~aud^#M6)8=w<CI|41{!F+S&E~EkyQ`K
fbeue!Q=3t5@^MZ#Aj!vN%*i4kBET#lF2V)?p+zEy

diff --git a/internal/models.py b/internal/models.py
index a52d42a..ce1eaf9 100644
--- a/internal/models.py
+++ b/internal/models.py
@@ -9,6 +9,9 @@ class Token(BaseModel):
 class TokenData(BaseModel):
     username: str = None
 
+
+
+
 # User相关的模型
 class User(BaseModel):
     username: Annotated[str,Field(
@@ -56,10 +59,10 @@ class Blog(BaseModel):
         description="备注允许为空"
     )]
 
-class BlogResponse(BaseModel):
+class ResponseMessage(BaseModel):
     status:int
     message:str
-    blog:Blog
+    data: object
     
 
 class TypeList(BaseModel):
diff --git a/routers/__pycache__/blogmanage.cpython-310.pyc b/routers/__pycache__/blogmanage.cpython-310.pyc
index 28b9ff67932e5adb829eada36b9de86b4d78cdfa..390a539e6dde55fa2f4c8719618136270c69f4c8 100644
GIT binary patch
literal 1969
zcmd5-&2Jnv6d!xMv$J3MYCc;&CPG17v`X4ukbol6W~+vzo3h!0SXG)%$KG_K*$-?l
zYDOCglnM?Ii6f$blHPiW#DNn>Zu|+pq7e08s6^n|yGfP`?pWjJXFvNr`}aPkmCL0q
zXg~i}tW{E$^}C)7HU}o}K^F%=s6|m^HBc2ba1}S~s@)(}g7i9$5*0n#k<&<4lMT1(
zB8y>4Xkr6VXBSsfEVY@YNtU7RE@p@&cTf${6wA^y%hd?Y(Cnkc4yq2Z)ZQ@7?ISuw
zhaXw6GGbOn_7Nj=l#bDJa9(rcnyX<t!A9vM8wDLxblT_`qoeCqe&!k6*~$}@Tw-n3
zq(Y?@Z!ecy9m%+IgbZXysKf^y#<%iFp*QkaO>HpghaJvYQ~E(D>z^{eBVc=uJ!Byq
z^gq$tV`t%h)Y=f8EEqW4{qFGK$<e|7(Kla!3a8Ckt^QCE8ElA{ECiH-_94zhyVVrT
zZ?q_j6w&7u@<Xie*lz?z-G7BHt^oNQQM8S_)}{p=LD#%pBiptlUEH;IFtTJ~)1k0V
z?eA@PG%3X^%cb>Vx#BICDr=s(r*}~gvMwW5&|KJRN_b&GZnasR7AO-T&wC#(uHGrG
zdl%<K;pEH5GkU)lau!JDiB1?YA!?l{+M0c8bA4HrY`{{m!4#o^4Dv~pIyI&;1J;z&
zGp7>99(UnzPebNrrE=T9a_N%4wvs1YgUWMSbyl#5g|Y{F)#&xLk*5})0{QdV;#+sM
z1wUxl?{ec<VHO%e6K*u$-coK)PH6@Xh!G(8GlIua8WD^UM$Vsn1{UMQLR1$r1opIP
z*POb;gNbp6CBYdKQ+pS0BZ)R4#=D3n4ERnde!N~>Encq}+<Sl<_5^WHW6%s5tkB2Q
z4`jjXwBc3Eu==`U-XP@ND6ie>J8-plqvE~4wp{Y=X$|6@w^r(j=6k4mSB+{hU#H$$
zd8t_Tu6=xF!doh?Uw^v-f#}wl3?Bqh6rb0oJi!7UJ}{o`oVu0|!E5vOnTz;@Uch`3
zhMs?Y4VUpkk4%GvUjU*VBlLNVbM_2nEsJvo<%RoO2Aa}9{`|4`<+CT>!UZ$t?e(^-
zx0(a;qn~~`{P8P33R;wV0^&ciCjlbeP4;X8)61R>YuoNxe7uV(e$#?%viBfYy4GW$
zKiK;SSzW|m11TAhq5&zU2`!OGXB>5Ca@XD_5^vhn?Gl<Yj!&23um1;*|LA71T=Xtq
zy&O+^i>0NrAoNz3SBl=8c#h`c2_rgz@I(?%|5w;lOi>GX&=CAQz#3mLfz$WlzeWyG
zPSDmR_r(ZG7zgr~L5+ze{;KA5XuJ?gYSiSd4l=)QX%=>gSAalZxdZ~sMPq&HW`=BH
z_tRPL%b!!pS^y=!UFSNDxvhy#X0Ag-4cDOn@@5dtn{q5vmYQD#Yld|ucv5fF^+`Fs
zs-j4{C8QcI_pA7=lahB0a!8Ro@QW~IMA`5IG4D|}qzBh`8F-n_4X!gqx$l7CPQ>0t
nFcYr>nYLUsf-n>%f}G>5^Ad71Y2>ET7)sSKyzMWHM~?pn9V{B(

delta 372
zcmY+7u}i~16vp#ju6IeB#3HRI6cn7|<lrcRQV<uFs!O)Qy%Z&B!d*IwLtQ&aMkoIS
zar8gA)k$!47VmKK4c~jekH`1Du6^*NisP<l=i+pnzu;3cddMwFPeS39kU@zVmVV}g
z^RQsoZu>>2<QXqTCcq<<Om=1<`3kdug1b-(>dIh+1jLt+gAA!ByA<V2_GI+fSwa@e
z_{vL@PgkA#MvSSZxzr{+?q8lwszpP}aNSIsg?<a*0EVfrnEf@PB(0}2QawxU1ouF+
z_qfR&s;GU&Z5XugxDR3bg<GQyYoDiy5&6`n)wc@WpYMdV-+Z^??i5xGSAVsvu5@Ff
zlcJhUNY~X|lVOewyV0bSi&TUEGIRmKVOhyVK}TRouUi>-0rUY8fdT)C*be*xt^Za!

diff --git a/routers/__pycache__/typemanage.cpython-310.pyc b/routers/__pycache__/typemanage.cpython-310.pyc
index 3d7f162e46865cbd2a912dc3b932830fa45c4e6a..2bc0a43585d2e6c684799de069fca9f43fd82f43 100644
GIT binary patch
delta 532
zcmYjN&ubGw6rMLTJG+~-X%R2tCDM9W5E{hZL@F9kEH&6YEkao`lNi}GVP+PZ&{D-x
zdMUQVqX&yO1;Ml6#s6aPCMEbsD88`>eek}S_suu&*W2J*us58auMxB#AKJYdCFG|M
zE*i&R4c&AQB#}^%5;7=hMoX44@Ek38>Q7b#rN~4XW+4y-lFOhEQXJ7NQqlWZhNmDS
z8Sj(Vkkw>ulO#*^UznC8%*A&*51$MxtF#O6tC4ykjT6S^wmSLP+M9?KJ02-h&7u12
z@L=}k>+JLC?D!y|PK>nb4YnP(dEZQem11CQ*Ju52I2Q3^d`CA;gjXP8msqlctxI-9
zcfrDQD)|n`;2p!Z#KvTKv%TKFmo^9Th8<6z!u9pZ72iVBs9blSHBHs+Dr0(8QH-x8
zO#1>ZERo9l%5j<79N7@r^QZcQH0^BNY_+x?KT7EI4P1rB^b@S!icw-32=pbVbHFJD
z3gWk3L~0|cyRetz8b$-{$I#3JpT=}475?fAIHAuM$NI|t`=@=r3$Wl-(d}|5t3urY
VjLap3%OrwDtVV%@_!9*U_zMmHdJX^p

literal 660
zcmYjPPm9w)6rVRq)3i;rCq?j3Z$_5&Dk`FA1z}xfw_d_RjG5OOnWS}QB6it@6=m^K
z@GE%qB6t>0ev7$^6u*KOeUnAm2k*_i|8IV8=5gF-L`VAC^cyht!zrh!L&|Mp{gi}Y
z0wk*-g^H&foX({;ai=H!s*`rAAPs;a2!95mvx2mX-4~$<u!sE%OmtTqId<N{6hw%F
zDHlD_e@A*6iNP*QqF>a7CEWJzJbth<ZwxBiy@v~|g-*c26>^=Qp~;FyDXdMF7p8oL
zS)(a1#@AR-O7^lrwQM4)^z;4k`peh#=a1_T$CU4ze5Ut%SIu&Pvebr5XB6tiyw;di
zbAi%ARuByT$)lT3{GC{zBk=|V9D-p7Ah_^W{E#1T8r<LBzq~u%8sD9ap2_*F6dSHb
zomaRaP#0=+f9KJ|k+bO=6KWey(G<^fDHBiul}$X=qa%$pN-WID6VlKnWEAy@sR6lv
zUm9QEbM>=)QSPZ0AHC;-s=Ur;xVc!`SYa-*e~BSwX(#xR&m-_b#iVQ}vF%QCZK#am
zWKiy%_H0=b;B_uHTP(DVL<>FEMTuIuuh0%_gOk?Qqg7bnA!)-2O|j)}{u5e8+oqlQ
flyDod;Y}*uNWA4>)<Y6Q7QzrX4Hx_w`WN9Z5BRaM

diff --git a/routers/__pycache__/usermanage.cpython-310.pyc b/routers/__pycache__/usermanage.cpython-310.pyc
index 4ee3b5b0377618263bf5b78f908eff527de5bb2d..6abb9e23aeb25e95941629c835ca4bf357761622 100644
GIT binary patch
delta 20
acmbQlJ&Bt;pO=@50SL0HT{d#JvjPAsXaq_C

delta 20
acmbQlJ&Bt;pO=@50SLA#+Hd4;X9WN&Km;}b

diff --git a/routers/blogmanage.py b/routers/blogmanage.py
index c763a55..e655264 100644
--- a/routers/blogmanage.py
+++ b/routers/blogmanage.py
@@ -1,18 +1,70 @@
-from fastapi import Depends,APIRouter,status
+from fastapi import Depends, APIRouter, status,Query
 from internal.models import *
-from dependencies import get_current_active_user,execute_query
+from dependencies import get_current_active_user, execute_query
 
-router=APIRouter(
+router = APIRouter(
     prefix="/blogs",
     tags=['博客管理']
 )
-@router.post('/add',response_model=BlogResponse)
-async def blog_add(blog:Blog,_:User=Depends(get_current_active_user)):
-    select_query="INSERT INTO blogs (blogtitle,blogcontent,typeid,descr) VALUES (%s,%s,%s,%s)"
-    blog_data=(blog.blogtitle,blog.blogcontent,blog.typeid,blog.descr)
-    execute_query(select_query,blog_data)
+
+
+@router.post('/add', response_model=ResponseMessage)
+async def blog_add(blog: Blog, _: User = Depends(get_current_active_user)):
+    select_query = "INSERT INTO blogs (blogtitle,blogcontent,typeid,descr) VALUES (%s,%s,%s,%s)"
+    blog_data = (blog.blogtitle, blog.blogcontent, blog.typeid, blog.descr)
+    execute_query(select_query, blog_data)
+    return {
+        'status': status.HTTP_200_OK,
+        'message': 'blog create successfully!',
+        'data': blog
+    }
+
+
+@router.get("/list")
+async def blog_list():
+    select_query = "SELECT blogtitle, blogcontent, typename, create_at, update_at, blogs.descr FROM blogs LEFT JOIN `types` ON blogs.typeid = types.id ORDER BY create_at DESC;"
+    blog_list = execute_query(select_query, fetchall=True)
+    return {
+        'status': status.HTTP_200_OK,
+        'message': 'blog search succuessfully!',
+        'data': blog_list
+    }
+
+@router.get("/list/bytitle")
+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="开始时间"),
+    
+    ):
+    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 = []
+
+    if blogtitle:
+        select_query += " AND blogtitle LIKE %s"
+        params.append(f"%{blogtitle}%")
+
+    if typename:
+        select_query += " AND typename LIKE %s"
+        params.append(f"%{typename}%")
+
+    # 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)
+
+    # 添加排序条件
+    select_query += " ORDER BY create_at DESC"
+
+    # 执行查询
+    blog_list = execute_query(select_query, params=params, fetchall=True)
+
     return {
-        'status':status.HTTP_200_OK,
-        'message':'blog create successfully!',
-        'blog':blog
+        'status': status.HTTP_200_OK,
+        'message': 'blog bytitle succuessfully!',
+        'data': blog_list
     }
\ No newline at end of file
diff --git a/routers/typemanage.py b/routers/typemanage.py
index a3e1cfa..bf12239 100644
--- a/routers/typemanage.py
+++ b/routers/typemanage.py
@@ -1,12 +1,17 @@
-from fastapi import APIRouter,Depends
-from internal.models import*
-from dependencies import get_current_active_user,execute_query
-router=APIRouter(
+from fastapi import APIRouter, Depends, status
+from internal.models import *
+from dependencies import get_current_active_user, execute_query
+router = APIRouter(
+    prefix="/types",
     tags=["分类管理"]
 )
 
-@router.get("/typelist",response_model=list[TypeList])
-async def read_type_all(_:User=Depends(get_current_active_user)):
-    select_query="SELECT blogid,typename,descr FROM types;"
-    type_all=execute_query(select_query,fetchall=True)
-    return type_all
+@router.get("/list")
+async def read_type_all():
+    select_query = "SELECT id,typename,descr FROM types;"
+    type_all = execute_query(select_query, fetchall=True)
+    return {
+        "status": status.HTTP_200_OK,
+        "message": "type search successfully!",
+        "data": type_all
+    }