leguadmin/prs_server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1.优化面试阶段

Browse Source
This commit is contained in:
李伟 2022-09-16 14:24:54 +08:00
parent 8c9e29aa07
commit fd28355f0f
3 changed files with 52 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/api_v1/endpoints/interview.py
View File

@ -1447,11 +1447,11 @@ async def login(
'rank': user.rank, # 区分hr和面试官
'token': security.create_access_token(
expires_delta=access_token_expires, user_id=user.user_id, email=user.email,
tel=user.tel, name=user.name),
tel=user.tel, name=user.name, rank=user.rank),
"token_type": "bearer"},
'access_token': security.create_access_token(
expires_delta=access_token_expires, user_id=user.user_id, email=user.email,
tel=user.tel, name=user.name
tel=user.tel, name=user.name, rank=user.rank
),
"token_type": "bearer",
'code': 200,

92
api/api_v1/endpoints/user.py
View File

@ -15,52 +15,52 @@ from db import get_database
router = APIRouter()
@router.post("/login")
async def login(
# data: schemas.UserLogin,
data: OAuth2PasswordRequestForm = Depends(),
db: AsyncIOMotorDatabase = Depends(get_database)
) -> Any:
"""
OAuth2兼容令牌登录，获取将来令牌的访问令牌
"""
user = await crud.user.authenticate(db,
name=data.username, password=data.password
)
if not user:
# raise HTTPException(status_code=400, detail="Incorrect name or password")
return schemas.Msg(code=-1, msg='密码或用户名错误')
access_token_expires = timedelta(minutes=settings.ACCESS_TOKEN_EXPIRE_MINUTES)
# access_token_expires = timedelta(seconds=5)
await crud.user.update_login_time(db, data.username)
return {
'data': {
'name': user.name,
'nickname': user.nickname,
'email': user.email,
'tel': user.tel,
'userid':user.id,
'token': security.create_access_token(
expires_delta=access_token_expires, _id=str(user.id), email=user.email,
nickname=user.nickname,
is_superuser=user.is_superuser, name=user.name,
data_where=user.data_where,
),
"token_type": "bearer",
},
'access_token': security.create_access_token(
expires_delta=access_token_expires, _id=str(user.id), email=user.email,
nickname=user.nickname,
is_superuser=user.is_superuser, name=user.name, data_where=user.data_where
),
"token_type": "bearer",
'code': 0,
'msg': 'success',
}
# @router.post("/login")
# async def login(
# # data: schemas.UserLogin,
# data: OAuth2PasswordRequestForm = Depends(),
# db: AsyncIOMotorDatabase = Depends(get_database)
# ) -> Any:
# """
# OAuth2兼容令牌登录，获取将来令牌的访问令牌
# """
# user = await crud.user.authenticate(db,
# name=data.username, password=data.password
# )
# if not user:
# # raise HTTPException(status_code=400, detail="Incorrect name or password")
# return schemas.Msg(code=-1, msg='密码或用户名错误')
# access_token_expires = timedelta(minutes=settings.ACCESS_TOKEN_EXPIRE_MINUTES)
# # access_token_expires = timedelta(seconds=5)
# await crud.user.update_login_time(db, data.username)
#
# return {
# 'data': {
# 'name': user.name,
# 'nickname': user.nickname,
# 'email': user.email,
# 'tel': user.tel,
# 'userid':user.id,
#
# 'token': security.create_access_token(
# expires_delta=access_token_expires, _id=str(user.id), email=user.email,
# nickname=user.nickname,
# is_superuser=user.is_superuser, name=user.name,
# data_where=user.data_where,
# ),
# "token_type": "bearer",
#
# },
# 'access_token': security.create_access_token(
# expires_delta=access_token_expires, _id=str(user.id), email=user.email,
# nickname=user.nickname,
# is_superuser=user.is_superuser, name=user.name, data_where=user.data_where
# ),
# "token_type": "bearer",
#
# 'code': 0,
# 'msg': 'success',
# }
@router.get("/me", response_model=schemas.User)

7
schemas/user.py
View File

@ -61,14 +61,15 @@ class UserCreate(UserBase):
class UserDB(DBBase):
email: EmailStr = None
email: EmailStr = None # 邮箱
is_superuser: bool = False
name: str
name: str # 姓名
nickname: str = ''
tel: Any = ''
last_login_ts: str = '尚未登录'
data_where: dict = dict()
user_id: str # 钉钉id
rank: int # 区分hr和面试官
class UserDBRW(DBBase):
hashed_password: str # 密码