From 2f6c02a7f13947a4c2bdc1ad04a663af57083a4d Mon Sep 17 00:00:00 2001
From: SunFree <7934952@qq.com>
Date: Sat, 11 May 2024 16:54:32 +0800
Subject: [PATCH] add new

---
 __pycache__/dependencies.cpython-310.pyc      | Bin 2646 -> 2660 bytes
 __pycache__/main.cpython-310.pyc              | Bin 1884 -> 1712 bytes
 dependencies.py                               |   2 +-
 internal/__pycache__/database.cpython-310.pyc | Bin 784 -> 784 bytes
 internal/__pycache__/models.cpython-310.pyc   | Bin 1890 -> 1859 bytes
 internal/models.py                            |   2 +-
 main.py                                       |   4 +---
 .../__pycache__/usermanage.cpython-310.pyc    | Bin 1206 -> 1426 bytes
 routers/usermanage.py                         |   7 ++++++-
 9 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/__pycache__/dependencies.cpython-310.pyc b/__pycache__/dependencies.cpython-310.pyc
index a78ebeb11631c9c279ed19328eb824e2bdb282d8..bc09fcc689f442f781790756e82e5b1b218b25b8 100644
GIT binary patch
delta 443
zcmca6@<fC;pO=@50SL+z?bB2y^4{|nPnAw%N|8vBY+;R(P32CNZDvekOp!_z1d2+h
z$N)v<Qe;!)S{S0_Q{+<=fV4u2NUC&-B2XVoic*Sl3rmz@ib^nprs`%hMkPkhDjxmP
z;?$yI{mD^G_t->$b`^<EwqsUfl%Jf+?8&G&c|CK#kvvdXlc|UwB+Cn8GZ!fVsavdt
zrKv@gx7dnOi%WA#ia^RBgu>(k7DaAVu$q$m?9{x?Q(1T!8I>k4W;Ich1u2sQ$uXy=
zmK5=TxU3)oq#kUrCR>r(<iD&cN+4UJxWFdFrzDmn-eLhc7R4fGwv*h*7K^jbLgDXW
z&qm=Jag=C-EwTjJW&tFizA3T>2^fF~Wb-a^TwsH^c=B>iYi>oL{4M6<lA<Ej$!|Gj
O1rSQXEQQHZTs8pivtRrG

delta 412
zcmaDNa!rIcpO=@50SK-rh^5I+<h|$3mnxmclp>xY(ZU)fo64Ok+sv58m?D`f2o#k{
zkp_y&rO2enwlGA=r^uzq18Id6kyPmv1)x5b6vY&!7M3W*6y;zBO_j}Nj7p45w^%19
zGTmbn1zJ)hHrbU~jZtB84znkt(&TN-{YDBvVNIqYevm9Lh|OH245V(c7M7+KRo-GN
zN-ZwUDJfC_$%6^S$>l7HENVdh=EW?$jEu^YH?o?j$${kMfy6E5^wg3f9uSumM1T~6
zP1Iy75}wS>rUKMpz$V7601^iiijxD`PNMKt*=M2fPqAmC@Etfxw87?Df()?$5>Qtc
zS%U-&K!gIEP@H_9;{qGRfs?m#T5~G_rEW17mlPGLP5#X(D}Yc6W+_hA;IaV#6suF+

diff --git a/__pycache__/main.cpython-310.pyc b/__pycache__/main.cpython-310.pyc
index 242291203e30169aa9f6c3057cb3687a728d51e2..8f2c2019b54993863d3a96a5fe44b2332d79c829 100644
GIT binary patch
delta 158
zcmcb^w}F>0pO=@50SF=$?9)zhP2`hddcrVK=ZMMzsT7fgjH#@tV$F<cj47h25@}2+
zVkzP+tj&y3(kT+b44RUgEg0uB%M0k27N-^!>*uEGXO^Vq7VF>QNiHoaO3f>Y2T4pW
zXZ2^)oUG3(Hu*Lyzo;e9u3{D-!PLOVR3r;z_-V>){?E$7IGKZ8iBW5^HoGPZhmZ^-
E04L)o<p2Nx

delta 299
zcmdnMdxwuNpO=@50SKyeEz;t-C-TWKaWGEQIpUEel_HWVks{j5l**ba*36j3m?D-c
zk;arFo+8o0+RPXwohrCMDn)W3BbvNaiZobWCPgNgK~r|K2;+R_XfFNI;?$yI{oGW2
zO~xp`qSWGo{Ji4S_}u)I)SO#9$)!a_sd**wAVtZHAm=~<hz-Jrfw-6rNHj9mFaV8Z
z^ed78@>VhyNl#8>6PD#IN=-}wYcGz^O*IFpW&sjR4J=GWvXj@dh)%x5;?Gnh15!NM
tf|Xy?8li-bsYo8k^8>myhLwepQGRj^n;N6u<YqQa4jussMh<2fMgT^TLtg*@

diff --git a/dependencies.py b/dependencies.py
index a57f9c0..262d5d5 100644
--- a/dependencies.py
+++ b/dependencies.py
@@ -12,7 +12,7 @@ ALGORITHM = "HS256"
 ACCESS_TOKEN_EXPIRE_MINUTES = 30
 
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
-oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token")
+oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/users/token")
 
 # 创建访问令牌
 def create_access_token(data: dict, expires_delta: timedelta):
diff --git a/internal/__pycache__/database.cpython-310.pyc b/internal/__pycache__/database.cpython-310.pyc
index 2c0218f2d2d79d7b46b6e325c8732bff8a698e4d..5de8857513793df62dff6dc7882e47213c4a21dc 100644
GIT binary patch
delta 20
acmbQhHi3;hpO=@50SH*G+iv7$Wd;B!odc%;

delta 20
acmbQhHi3;hpO=@50SI^tEH-kpG6Mi6Sp!4>

diff --git a/internal/__pycache__/models.cpython-310.pyc b/internal/__pycache__/models.cpython-310.pyc
index 782f6da38928942d7e980366212136318a3d2f4e..f4b751eaf6a934e1b26ae387deff7a8e10afc2c6 100644
GIT binary patch
delta 631
zcmZ`$ze~eV5Y96%Kby3vZLLB}D-=s{P!JdK2cn`lh$uL?Nadv}rj5L&(7~<ZUf$;4
z;Naxy;O;EhbZ~NW5I65qtx#%0KJI(>y}R!&ukpvY?c25~!BZ}-)Pk;^Cl}r6!ojA*
zWJa$fMqSd84;A1FQ-P}ySAlCx2d+n418y)Axan%3*MY~F1>B1A2DA62O1yhJB_7B`
z_w!n{p(VFPhm<l3g!na808`S5MYtmFXihwng$*5r1_IjTNrV`Jh0rV0kK!0P0C?ep
z0+^CRxC7PF;(X+dB*mWG&W=GMH0#y&k>@r}f>WM_13oTZ<k=YJetC}O*9Q7y&0c>Q
zqsT-aqL3c@zBklQN?g)8k^&ETk`Pa{v^r3;*suBTOa+ikqHGkQ@H3Agc9ok%2983F
zxwUG`3t);bWt*hMx;no!&<DMT@>wI`f8L{24%_0SxL0R1?734h#k*SG!oBho0=nUm
eogp_veX;Jdmgg=LkTvm_IFdyi*`e^J)ABb+b8Gnk

delta 699
zcmah`&ubGw6rPuzo&AyB&9<hkg{F<AR6-TK6iR889z^ia9_*=?vSB7QxSPOa1345F
z6z|Ji#De%&cour{?rAU5{tMoE^1ZDngn&Ej$NT1eGw*%#E~D!x9EPFK@O%4kr&knV
z3(kwJwXS5+O6|-(v4K5jl1uwNleU6))`>taq=Ve4xP#o49&)eZE^=Sik=K=rdJlOZ
zL*!wV_hs~wbsEK&&7cFNE0bL1{Y;q)zFhqLAR_EVN9HwbEC>v3{6`e{%!L57FdzAf
z`3AesJQ7mtx=t`p5D<g}x7YlQ8WhbT(5YV>!Dlh(IrFr31M_Crnk+5hX6a|i<TO=-
zv;395iyL~`e77FIq1+!%Dz7(A)6+qcsbe(IA0^#X$-|DPr+T6~w>?=DRgJCE1-v^P
zrZanNVw!ZLO$46_r~wBv;cL)D=PiiMSH5vDRp%aR|Kq)ll1g@mv~Bd=GCTIC#v;<v
zk*b%B(;VGi*)L$hJP_OaQ#Hs-Y4r!W{^zB7?pZIrZa#}g&N?1B?9|N<asP-$SPejv
jL)|8z{H#YP-Mwrm$EkV(s2IfvF$-||aV_S!noa9BSPglf

diff --git a/internal/models.py b/internal/models.py
index 564d59a..a5c278a 100644
--- a/internal/models.py
+++ b/internal/models.py
@@ -1,6 +1,6 @@
 from pydantic import BaseModel,Field
 from typing import Annotated
-from datetime import datetime
+
 # Token相关的模型
 class Token(BaseModel):
     access_token: str
diff --git a/main.py b/main.py
index 6fac410..f6a7f48 100644
--- a/main.py
+++ b/main.py
@@ -52,9 +52,7 @@ async def register_user(user: UserInDB, _: User = Depends(get_current_active_use
     # 返回创建的用户信息
     return {"status":status.HTTP_200_OK,"message":"users create successfully!"}
 
-@app.get("/users/me/", response_model=User)
-async def read_users_me(current_user: User = Depends(get_current_active_user)):
-    return current_user
+
 
 @app.get("/users/me/items/")
 async def read_own_items(current_user: User = Depends(get_current_active_user)):
diff --git a/routers/__pycache__/usermanage.cpython-310.pyc b/routers/__pycache__/usermanage.cpython-310.pyc
index 11b42764ec59380a8a5cba0b49aff35f13e4d7fa..4ee3b5b0377618263bf5b78f908eff527de5bb2d 100644
GIT binary patch
delta 430
zcmYjL%}N4M6rOwMI`}g>>ZnDyFs2`-7QR5)8we3?+=zJ3h>=-$oCpajjA)URO^dcc
zi`uk_>H*pWErOQw0QnZ$nF*l-=iKj{^WF1(uaWCmq8*P%C5)HZHA@c-5_$45Shg!X
z(jYwArxgvftt5|u%GEvv+LJ88<G^?VREu$qCr?8?Qb{2z%~PQNu^`hU$V-E6QLgh$
zz{&FLhGgaj-xo$#DLOU?+fh+@c=Pac{x*EN8(y86)Khi^Sj~gyJ@QG2=B~<x@C>pZ
zC1JQAmvD418%Ogv>at=Bik@0`gn*q+)jwG$xR`{G{d~u?6)Y#@P(lx+EDY>SA{Ouo
z@L!q3){6_M@!*(UZ9xG?Hp4=X85N5N%4W`UzvSC>--9PNpyRPkl=h|&Rwrg^^-gmi
vf-}Lde=5GV2&BR*tu}YIq2#-?m)uL1ou-5lWuz*MvN0ueOsP6jlX>zBZ2@Y1

delta 252
zcmbQly^WJEpO=@50SF>3_0!T>Ci2NJE}E!aY?98H!r99h#h=QbC6L0E%9Fy~%aqF0
z%#g;I!jsC9!kfyI#*)I9!r#K$%ort@A`r}=DLC;*k8mju(5&ZERy^z2{(RlS=M&mA
z88<IyJk6-d2Nb`>Qd*o^6eW_FoSa%*9AA>3othV)T2YW$lv-RQ2~@C>p-5@+Y-T$~
zzR9<kmDyE*LVlV;ldD-~`h(a-N~nY~kb8^6CO1E&G$+-L5y&eBDHCAeVFW=5Mh-B|
Y#K^+P_MeB9g^A@q6C=}qCMJP@07JYz>Hq)$

diff --git a/routers/usermanage.py b/routers/usermanage.py
index 88105dd..6dbdd7e 100644
--- a/routers/usermanage.py
+++ b/routers/usermanage.py
@@ -7,6 +7,7 @@ from dependencies import *
 from internal.models import Token
 from fastapi.middleware.cors import CORSMiddleware
 router=APIRouter(
+    prefix="/users",
     tags=["用户管理"]
 )
 
@@ -26,4 +27,8 @@ async def login_for_access_token(
     access_token = create_access_token(
         data={"sub": user.username}, expires_delta=access_token_expires
     )
-    return {"access_token": access_token, "token_type": "bearer"}
\ No newline at end of file
+    return {"access_token": access_token, "token_type": "bearer"}
+
+@router.get("/me/", response_model=User)
+async def read_users_me(current_user: User = Depends(get_current_active_user)):
+    return current_user
\ No newline at end of file