From 7340b2d79a2da6aacb9709525cd3b13567dd137d Mon Sep 17 00:00:00 2001 From: SunFree <17315650350@163.com> Date: Sun, 5 May 2024 20:59:52 +0800 Subject: [PATCH] new --- __pycache__/dependencies.cpython-310.pyc | Bin 2646 -> 2646 bytes __pycache__/main.cpython-310.pyc | Bin 1915 -> 1884 bytes internal/__pycache__/__init__.cpython-310.pyc | Bin 125 -> 125 bytes internal/__pycache__/database.cpython-310.pyc | Bin 784 -> 784 bytes internal/__pycache__/models.cpython-310.pyc | Bin 2375 -> 1890 bytes internal/models.py | 38 +++++------------- main.py | 1 - routers/__pycache__/__init__.cpython-310.pyc | Bin 124 -> 124 bytes .../__pycache__/typemanage.cpython-310.pyc | Bin 675 -> 656 bytes .../__pycache__/usermanage.cpython-310.pyc | Bin 1206 -> 1206 bytes routers/typemanage.py | 4 +- 11 files changed, 13 insertions(+), 30 deletions(-) diff --git a/__pycache__/dependencies.cpython-310.pyc b/__pycache__/dependencies.cpython-310.pyc index a78ebeb11631c9c279ed19328eb824e2bdb282d8..b6e9a00f046792dfb3a8200222178fca010a6c0b 100644 GIT binary patch delta 20 acmca6a!rIgpO=@50SJB;n{MRx<^ljYzXc@# delta 20 acmca6a!rIgpO=@50SK-rh;8Kd<^ljVF9ePN diff --git a/__pycache__/main.cpython-310.pyc b/__pycache__/main.cpython-310.pyc index 92730ad7e45a9972fe529d2601e0fc1bc3c6302f..f5f6e95949730d9cd870d313126cd723c7601f6f 100644 GIT binary patch delta 489 zcmZ8cJxjw-6wQrkt(v4wKWv(|6cS!>USFuQ$!{i7kMzaHG0H!F97TFCA)0i2? z2H+ORYCD)E8*^9cuWpt#D(2B1R;8%OPdZo_3;Gr~Sd2nSSlUq*%i$*6Jif!Fx{~5G zgvH<*bkg#JR=4T(eG(!kdwQ$OJn)YCBu?EaIqc0Qk+pZ+^;!XS{MA3N zsfr3$+q_Obej7f;_qH6aUniOrh_Z~5jxt<%H)A#DIF{3Qlm(ZPlU=zLS5 HJ303S9~E$T delta 519 zcmZ8cyH3ME5cD2)2*zg;lbAS80#pc5Kt~Xdf({AMfP|DLJa%IxBt$v~K?hQxLKMgp zlu%Oh8+3FLe?kFk0|If<&CSiu&fUJ*@3!npX==Q7mgXB*x3Ubm+quJY)G*yPJK0(m zG)ncgnnTXRIE}S(kHAXIGe5kQCy65gpoybs1p+17jAJ)O;&d_d2xQPi9~yvJDxgDN zL&tH1cKr#}H2v2I}i diff --git a/internal/__pycache__/__init__.cpython-310.pyc b/internal/__pycache__/__init__.cpython-310.pyc index 394be32225196d4657ba4f39c51c08bcd7363353..1e80e35e41926cb5aaf38b2c207ea96fec4e6d6c 100644 GIT binary patch delta 17 Wcmb=e<<95ju^oWlypO=@50SNkQ%+n^aPUMqeteL1?&6dI!%%I7?anBMK#)QdtTqg(%&F|DtSM|M?CFdt94VYBT)iw%S$4QAcM4Mq50XA!8-^4npuv2% zI6^85QhhRuOG-I_mOt&C^>p2$%oM*;5hUKz{`F6GFMYCO*YlOTCKs}a$+0EnR(d>Adcz6MCO7-*Ahg1Zdi1F*aRkHjw@$?awx^D3yR41yMU$kzGWMqlgnI zTmEGxJJ{m_b}#5WzD!fn8Bg3CQGPU}IzgL%zRktW1n75cVH7Hi)Ru z-y)DQKTYn*r#KuYr?3kv-{P>z%}*)KNws4H$`lI#2>}KkMjl21CIJ>86cJ$t0P7%S A)c^nh delta 733 zcmZ8fZEMp|6i(9grmyMCy3Vm7_%>FY6NU)NVCokUq#*jK9|Yaar07~n6Gewisp|w= zx_Z&dhJsQ>Ws4gQiS5*n{)c{3a?=(B|G*}mBvPsg_vD=O+~=HgpPL`zx2Tv627L@X z7mgjCDF_vDm@QTg&c#nNSj3_G3=T=Yyes9$;qy!)vawp@*+=A@dw>+V$UHa6NG^$& z+!$d2d$70Un&Ac+31Od&2!Qwj3G^UA8}R@F^>Mhw{bfYDwW7f2>tVzu87x5e{-)>D zwd|F%>71f^VPYzlmZ|oVE|pTA%K(rebZ9hS0d~H%(V)*CCe>a4W$41awx*Ns?%{cx zrrf$N+4b7m*G^UIESA-NpmZZzes45h8G60-wx06bNJ}?!8Ff~*8;mjvSYn>i4mwQGzClLlNdWkbTlq3Q0-I7Z^=BJ%_vevxh-5ApPLxF zvtJ#BF$}%b&VP2s{k2terk^nMcjkj9=E^3mEz`AXYxT8kNt;XvvUP#7_2bEY%kbn3 z-$!1c*uD`6r(oqoFukXXZp#*yOa#bJbb=iL2?ofN5Q#fJU> DmBsYL diff --git a/internal/models.py b/internal/models.py index 4626aba..564d59a 100644 --- a/internal/models.py +++ b/internal/models.py @@ -33,37 +33,21 @@ class User(BaseModel): class UserInDB(User): hashed_password: str = None -class BlogList(BaseModel): - blogname:Annotated[str,Field( - title="博客名", - examples=['blogname'], - pattern=r'^.{2,50}$', - description="允许2-50个字符" - )] - blogtype:Annotated[str,Field( - title="博客类型", - default=None, - description="博客类型允许为空" - )] - viewsnum:Annotated[int,Field( - title="访问量", +class TypeList(BaseModel): + blogid:Annotated[int,Field( + title="博客id", default=None, - description="访问量可以为空" + description="博客id可以为空" )] - addtime:Annotated[datetime,Field( - title="发布时间", - description="数据库中提供了默认值" + typename:Annotated[str,Field( + title="类型名称", + examples=['typename'], + pattern=r'^.{2,50}$', + description="允许2-50个字符" )] descr:Annotated[str,Field( title="备注", default=None, - description="备注允许为空" + description="博客类型允许为空" )] - -class BlogAdd(BlogList): - blogcontent:Annotated[str,Field( - title="博客内容", - examples=['blogcontent'], - pattern=r'^.{2,}$', - description="不能为空，允许2个或更多字符" - )] \ No newline at end of file + \ No newline at end of file diff --git a/main.py b/main.py index 37a1e9e..6fac410 100644 --- a/main.py +++ b/main.py @@ -5,7 +5,6 @@ from dependencies import * from internal.models import Token from fastapi.middleware.cors import CORSMiddleware from routers import usermanage,typemanage -from internal.models import BlogList app=FastAPI() app.include_router(usermanage.router) app.include_router(typemanage.router) diff --git a/routers/__pycache__/__init__.cpython-310.pyc b/routers/__pycache__/__init__.cpython-310.pyc index 8cb2262f3f95cc1c9127245a7b31a4a774289aa4..0001bfb6bad51b73e23b51378ae5d28ae06b8cf8 100644 GIT binary patch delta 17 Wcmb=a;m+sft`Y3&n>4Ed?n6 delta 20 acmdnSxs8)MpO=@50SF>3^*3^_W&r>$Qv^u> diff --git a/routers/typemanage.py b/routers/typemanage.py index 692672d..92d554f 100644 --- a/routers/typemanage.py +++ b/routers/typemanage.py @@ -5,8 +5,8 @@ router=APIRouter( tags=["分类管理"] ) -@router.get("/typelist",response_model=list[BlogList]) +@router.get("/typelist",response_model=list[TypeList]) def read_type_all(_:User=Depends(get_current_active_user)): - select_query="SELECT blogname,blogtype,viewsnum,addtime,descr FROM blogs;" + select_query="SELECT blogid,typename,descr FROM types;" type_all=execute_query(select_query,fetchall=True) return type_all