From fd4a2dd5293511b50d54ea221abe6641bd9032c7 Mon Sep 17 00:00:00 2001 From: sunfree <17315650350@163.com> Date: Mon, 29 Apr 2024 00:36:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- __pycache__/dependencies.cpython-310.pyc | Bin 2646 -> 2646 bytes __pycache__/main.cpython-310.pyc | Bin 2725 -> 1915 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 2284 -> 2375 bytes internal/models.py | 9 +++- main.py | 49 +++++++++--------- routers/__pycache__/__init__.cpython-310.pyc | Bin 124 -> 124 bytes .../__pycache__/typemanage.cpython-310.pyc | Bin 654 -> 675 bytes .../__pycache__/usermanage.cpython-310.pyc | Bin 1226 -> 1206 bytes routers/typemanage.py | 11 ++-- routers/usermanage.py | 1 - 12 files changed, 36 insertions(+), 34 deletions(-) diff --git a/__pycache__/dependencies.cpython-310.pyc b/__pycache__/dependencies.cpython-310.pyc index 97b03e04a9afb2c188e1c0865dd4fed36ec008f2..d7846f8a16baffbfa79782d9b3d723d74ff15c5b 100644 GIT binary patch delta 180 zcmca6a!rIgpO=@50SLCJ>uuzYXJ&MpoXvcK@z!J$mRLsh&68N-7#Y-F102ODv<>=1DAZjEriNKeA3|G@RVY zmdK_7R9d7t`2(9cqtRpzc3Vc1$!_e^7%eB?W!K>_1xji%6`4&Ifgc5cN8a^HDp^m(zSWX$1#VD#eHcs!)Z*0gha_Srx|ZOe{x9oUU!Du32)*@EgN!#r***oZ+5 z+fc{ONP`A6PxA}rcCkM0frTAtovHtI8>CU84V}{+DYB_#54v}ZR)QYbnMoh|ua)hA zIA#}OOI_5;4#yyj6XecPOJn5XxAw(auEmL;q_KAx0lGS1;)fIQHUFc$EK1SLpQ1R@ zUocmE*Y6+HXcW9o;F@?$X5lRGq>Q)Zoe|E6C*Dzt{KPHE2M_$jzfyRI-v2aSKHWc< zM1kke!~Llr&W7`orFq*{X7oTfh0S|CQok!Z(ja!G=xj5$!ZDslrJTEq^J&JGC6_syM z^or*Axb(@+`SZD331^3s6wu>QO4D@p)hT|JTHfE9cXS5iaTSFWtj$H!^~#c24y++2Fm=Q ziJ0O}iH*Q88$G089%x&H6+mZ27~V427%M$B4~RPs#pfk9{v!bsCJqQ8*&jJmyP3wm8Tx zZwEvr>*O(THgWulL)1`wO{BJ`?GPOFfbNq$B8pO%#*WDdqf8G8GY<7{h_vJoGY`o= zl_}P@_Q(zi$sT1xhjd@x(^-n8zo+PErq-KVZU+(P5Xf>@0B`#(C`Y{9@r8I4an{Rk zY;4?E?8d9_h3&5FgNSv} z-E?Sds8HQ3Jnn>;2@g|%pVsEFJsR775P%R~lCC(DOrG5BfRlDd{4+jy%GEe^>TsMo zb(dS1B|e109lKYrKk(jp`&QpuuPv_E@2#vZyVX0KD&_Rz(o%J8&8x3`TCI82&mSzW zR=xYnwe@;+%`F5RFi`KTH;%zakr*55Ot*Me<(-7Xrx5T$G8GPuP)Ohv zK8G8F$Mj`}7jebM)aPye7n9H6>N}%K;=x_x(z=52izrmuks7ueN%r_jj!6*5qKvpWdwOody*l{Kn9pBD1$v}7qSAuOz&77~PX+&ia0jPzZ1^nU z3$F$5BSNSGr%w#Z7Y04^i@x%lUpt42eS_5KQQHe8w8ZWIxH-yi;8)MAG%>gUm#-gn z(dvLD975%Yk$p||kLna`1neGc0i)KtwO0MCx>PUs)rF}BxULqe?ymcc$q+Xfh=7;x zuCClKE1jrgGpDvd2HSqK=@5Pe%{$ahDUxzTwX^6p<@q^KC=ZE?$}?552DS0dQ@n!f zno}N(TR)6gh{DU_IoykNztb7~Zk5cW4hDZ(*ZL~`vEBg57jTtiA>p4nQe6fwD_rVB z{NZ$)@R9nxh>ua&noTB1irDz(6KN4ce_eXSdS#~#Y8+8Qk0`bONsY`9JC6)~g5>oa F`4^nXh7kY& diff --git a/internal/__pycache__/__init__.cpython-310.pyc b/internal/__pycache__/__init__.cpython-310.pyc index 394be32225196d4657ba4f39c51c08bcd7363353..25d0efac029144a771adeb9d1326f7d940ce4973 100644 GIT binary patch delta 22 ccmb=e<<95jc^EXFXlF=;?&sD2}9@{K@}W?HK(gyR)fy-C|EkO-n4zDJhZ! zDg(==msA#{f_1%ExBunzbuZidOGSZ_aNg7Y^-p#$eX?WM^Od`zILb0p%Zu|$b0?Rw zg-pJ{CeC?_H6^t;xk!_9@+&rF_FK%Ec_l@xlQ(dPa~CNAjZp#OVw1^+?4q(vj7*Gt rf7w_;G=jzVkBtS$pB%~lnNu^hS_3pO=@50SG>E>!opR{k?#*18-&gGmyH!H@{f%LA|mv+NNMr` q7Lm#4*>A|I05w_xaWNm72||C0R3;zcaAQ=NoWL$VS&37HQ49b`^+h}Y diff --git a/internal/models.py b/internal/models.py index 860aed4..4626aba 100644 --- a/internal/models.py +++ b/internal/models.py @@ -42,16 +42,21 @@ class BlogList(BaseModel): )] blogtype:Annotated[str,Field( title="博客类型", - examples=['blogtype'], + default=None, description="博客类型允许为空" )] + viewsnum:Annotated[int,Field( + title="访问量", + default=None, + description="访问量可以为空" + )] addtime:Annotated[datetime,Field( title="发布时间", description="数据库中提供了默认值" )] descr:Annotated[str,Field( title="备注", - examples=['descr'], + default=None, description="备注允许为空" )] diff --git a/main.py b/main.py index 8ae1d12..37a1e9e 100644 --- a/main.py +++ b/main.py @@ -6,10 +6,9 @@ from internal.models import Token from fastapi.middleware.cors import CORSMiddleware from routers import usermanage,typemanage from internal.models import BlogList -from typing import List app=FastAPI() -# app.include_router(usermanage.router) -# app.include_router(typemanage.router) +app.include_router(usermanage.router) +app.include_router(typemanage.router) app.add_middleware( CORSMiddleware, allow_origins=['http://localhost:5173'], # 允许的源 @@ -18,23 +17,23 @@ app.add_middleware( allow_headers=['Authorization', 'Content-Type'], # 允许的请求头 ) -# 用户登录 -@app.post("/token", response_model=Token) -async def login_for_access_token( - form_data: OAuth2PasswordRequestForm = Depends(), -) -> Token: - user = authenticate_user(form_data.username, form_data.password) - if not user: - raise HTTPException( - status_code=status.HTTP_401_UNAUTHORIZED, - detail="Incorrect username or password", - headers={"WWW-Authenticate": "Bearer"}, - ) - access_token_expires = timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES) - access_token = create_access_token( - data={"sub": user.username}, expires_delta=access_token_expires - ) - return {"access_token": access_token, "token_type": "bearer"} +# # 用户登录 +# @app.post("/token", response_model=Token) +# async def login_for_access_token( +# form_data: OAuth2PasswordRequestForm = Depends(), +# ) -> Token: +# user = authenticate_user(form_data.username, form_data.password) +# if not user: +# raise HTTPException( +# status_code=status.HTTP_401_UNAUTHORIZED, +# detail="Incorrect username or password", +# headers={"WWW-Authenticate": "Bearer"}, +# ) +# access_token_expires = timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES) +# access_token = create_access_token( +# data={"sub": user.username}, expires_delta=access_token_expires +# ) +# return {"access_token": access_token, "token_type": "bearer"} # 注册新用户 @app.post("/register/") @@ -62,8 +61,8 @@ async def read_users_me(current_user: User = Depends(get_current_active_user)): async def read_own_items(current_user: User = Depends(get_current_active_user)): return [{"item_id": "Foo", "owner": current_user.username}] -@app.get("/list",response_model=List[BlogList]) -def read_type_all(): - typelist="SELECT blogname,blogtype,addtime,descr FROM blogs" - result=execute_query(typelist,fetchall=True) - return result \ No newline at end of file +# @app.get("/list",response_model=list[BlogList]) +# def read_type_all(): +# select_query="SELECT blogname,blogtype,addtime,descr FROM blogs;" +# result=execute_query(select_query,fetchall=True) +# return result \ No newline at end of file diff --git a/routers/__pycache__/__init__.cpython-310.pyc b/routers/__pycache__/__init__.cpython-310.pyc index 8cb2262f3f95cc1c9127245a7b31a4a774289aa4..d887dd14ebe5fefac7e8eee05378d3d6196ce1f0 100644 GIT binary patch delta 22 ccmb=a;m+sfV!Z delta 22 ccmb=a;m+sfZ)r<1R->&#u39SZ4UWPXC^ z)FtrTH|QgHjqoD`U22|(aA4;B=FQCS_vSrlFIv1EiG&ogcyGV<0gCb|lXcT5IU*P5 z(|Gcr4qTf+Ie>vHo%=C}p_sx06NU`6Tc`ooF^>02xDtU%nY*FAa z0#_LVXWTboBQ|6ts1^pPVm6=6ly)!dcD+?;;$}i3DU|3n@LIII=Bx{`bgD$6dJWy` zWyQ8laQsAS`kWvgWkaBiRoCiz==96FoVKXzRdK>p{@FX3%^|t16BcqzWd^9=Lb0Qp&yfWULy5OptI^&QLF{|Jq!Jiw)SjH%bi7(LR8Tq3XFLDzfpAu{s0#K BXtDqR delta 416 zcmYjN&r1S96rMNkuA}anbSS#nDHbE?)*&JiFJfM-ix<&mR;;y^nH5Tm4u*6w6#s(g z)FtTDp<92(LZ=A-hYryjA@B|F<9olpnR!pH^%vRN1$qO0aK zm*3-N3%E6=wYZ3%GaeTS&c;+wVGh9qp1?RMlAgg++`hwHEybNGansXD>9%j?!|Sf- z*{Jq?KbpV3&tD$rlaWg!t1E@qzKV>n(Nfsww^isul$JtugG(jqoq!7;%QzoF{fwf- zzr~Q~xPY!Q2pn!`NCtEWKn4VFrjV%|X{-+z0 zdKof>5HVfV4|yii!NkvIarOcE^#pRIyA8^~0J(y+;@UGtOULX8Rm(UN8K+9fMQt&> g1ZnJ#*gpQK=ZgbeIZ>+!8Nwg~6psPcuWe@G55q=Ypa1{> diff --git a/routers/__pycache__/usermanage.cpython-310.pyc b/routers/__pycache__/usermanage.cpython-310.pyc index 280641135b739250f39c457552c05634b7afbdf1..435ce1635479c1b791be8cab4dcb4af694f5d37d 100644 GIT binary patch delta 208 zcmX@bxs8)IpO=@50SNf?_0rNO^2#zUny6iDlFpdI*~=KkpUR&lkiwP9lfvE0l*-i1 zkj9w8lgg69o63{MlERn5-@@9=7$uk@5X_({IPpr4a48SasOM8wJnPv0eBHw56WTNx zH#ak$W@O}>?9Z&gCkd2Y$xx&Oq<$&7O|E6O07`6QR%TS0e2aO$h6+#|EQv%Y1I2D} p*yQG?l;)(`F#>tTDw7wohzhYVvi;{_Wnp6Z&&0^|pNUD}9{{>?G)e#f delta 228 zcmdnSd5V)apO=@50SIb&_0no5^2#zUnW$ZCmcp6Nn8MY|6vdy)pCypOoywEK)60~~ z)Xb2^n8KUNlERnDlg5(5pCZu0+RPXwm?9X=peZ!*Qjc;Kn|^6=YEf}1575x(Q&v3d z*#3Oo!sip(G?{L(6%?hWWmar1WIWBt$UoVZS%FUqsA?rckus3_rRX|2o7n;=v4mNf zQFZbO=J^_`Kyk1n5}^VVyTxIXo1apelWNBZ