add test
This commit is contained in:
parent
f1e48984d7
commit
25a096e781
|
|
@ -32,7 +32,7 @@ async def register(user: Annotated[UserFrom, Body(...)], db: Session = Depends(g
|
||||||
|
|
||||||
@router.post("/login", summary="用户登录", name="用户登录")
|
@router.post("/login", summary="用户登录", name="用户登录")
|
||||||
async def login(user: OAuth2PasswordRequestForm = Depends(), db: Session = Depends(get_db)):
|
async def login(user: OAuth2PasswordRequestForm = Depends(), db: Session = Depends(get_db)):
|
||||||
user = login_user(db, user.username, user.password)
|
user = await login_user(db, user.username, user.password)
|
||||||
if user[0]:
|
if user[0]:
|
||||||
expire_time = timedelta(minutes=settings.ACCESS.ACCESS_TOKEN_EXPIRE_MINUTES)
|
expire_time = timedelta(minutes=settings.ACCESS.ACCESS_TOKEN_EXPIRE_MINUTES)
|
||||||
token = create_token(AutomationResponse.model_to_dict(user[1]), expire_time)
|
token = create_token(AutomationResponse.model_to_dict(user[1]), expire_time)
|
||||||
|
|
@ -48,7 +48,7 @@ async def active(user: Annotated[ActiveUser, Body(...)], db: Session = Depends(g
|
||||||
status = 1
|
status = 1
|
||||||
if user.status == 1: # 正在禁用
|
if user.status == 1: # 正在禁用
|
||||||
status = 0
|
status = 0
|
||||||
active_user(db, user_id=user.id, status=status)
|
await active_user(db, user_id=user.id, status=status)
|
||||||
if status == 0: # 正在启用
|
if status == 0: # 正在启用
|
||||||
return success_200(data=dict(status=1), message="禁用成功")
|
return success_200(data=dict(status=1), message="禁用成功")
|
||||||
if status == 1: # 正在停用
|
if status == 1: # 正在停用
|
||||||
|
|
|
||||||
|
|
@ -27,15 +27,15 @@ def register_user(db: Session, user: UserFrom) -> dict:
|
||||||
return AutomationResponse.model_to_dict(us_er, "password")
|
return AutomationResponse.model_to_dict(us_er, "password")
|
||||||
|
|
||||||
|
|
||||||
def login_user(db: Session, username, password):
|
async def login_user(db: Session, username, password):
|
||||||
password = get_md5_pwd(password)
|
password = get_md5_pwd(password)
|
||||||
user = db.query(User).filter(User.username == username, User.password == password).first()
|
user = await db.query(User).filter(User.username == username, User.password == password).first()
|
||||||
if user.username and user.email:
|
if user.username and user.email:
|
||||||
return True, user
|
return True, user
|
||||||
return False, RegisterUser.LOGIN_USER_ERROR.value
|
return False, RegisterUser.LOGIN_USER_ERROR.value
|
||||||
|
|
||||||
|
|
||||||
def active_user(db: Session, user_id: int, status: int):
|
async def active_user(db: Session, user_id: int, status: int):
|
||||||
user = db.query(User).filter(User.id == user_id).first()
|
user = await db.query(User).filter(User.id == user_id).first()
|
||||||
user.status = status
|
user.status = status
|
||||||
db_save(db, user)
|
db_save(db, user)
|
||||||
Loading…
Reference in New Issue