From fd28355f0f1623c9894d8889339846e0684d2f8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=BC=9F?= <250213850@qq.com>
Date: Fri, 16 Sep 2022 14:24:54 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E9=9D=A2=E8=AF=95=E9=98=B6?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api_v1/endpoints/interview.py |  4 +-
 api/api_v1/endpoints/user.py      | 92 +++++++++++++++----------------
 schemas/user.py                   |  7 ++-
 3 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/api/api_v1/endpoints/interview.py b/api/api_v1/endpoints/interview.py
index dd5c8f2..89e58c7 100644
--- a/api/api_v1/endpoints/interview.py
+++ b/api/api_v1/endpoints/interview.py
@@ -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,
diff --git a/api/api_v1/endpoints/user.py b/api/api_v1/endpoints/user.py
index 28153b5..aaed68b 100644
--- a/api/api_v1/endpoints/user.py
+++ b/api/api_v1/endpoints/user.py
@@ -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)
diff --git a/schemas/user.py b/schemas/user.py
index 4e629f2..9572ae6 100644
--- a/schemas/user.py
+++ b/schemas/user.py
@@ -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  # 密码