fix(auth): resolve conflicts

app/api/endpoints/login.py

@@ -41,6 +41,7 @@ async def login_access_token(
         ),
         token_type="bearer",
         super_user=user_or_message.is_superuser,
+        user_id=user_or_message.id,
         user_name=user_or_message.name,
         avatar=user_or_message.avatar,
         level=level

app/api/endpoints/storage.py

@@ -56,9 +56,9 @@ def save(name: str,
 
 
 @router.post("/list", summary="所有目录和文件", response_model=List[schemas.FileItem])
-def list(fileitem: schemas.FileItem,
-         sort: str = 'updated_at',
-         _: User = Depends(get_current_active_superuser)) -> Any:
+def list_files(fileitem: schemas.FileItem,
+               sort: str = 'updated_at',
+               _: User = Depends(get_current_active_superuser)) -> Any:
     """
     查询当前目录下所有目录和文件
     :param fileitem: 文件项

app/api/endpoints/user.py

@@ -174,7 +174,7 @@ def set_config(key: str, value: Union[list, dict, bool, int, str] = None,
 
 
 @router.delete("/id/{user_id}", summary="删除用户", response_model=schemas.Response)
-def delete_user_from_user_id(
+def delete_user_by_id(
         *,
         db: Session = Depends(get_db),
         user_id: int,
@@ -191,7 +191,7 @@ def delete_user_from_user_id(
 
 
 @router.delete("/name/{user_name}", summary="删除用户", response_model=schemas.Response)
-def delete_user_from_user_id(
+def delete_user_by_name(
         *,
         db: Session = Depends(get_db),
         user_name: str,
@@ -208,7 +208,7 @@ def delete_user_from_user_id(
 
 
 @router.get("/{username}", summary="用户详情", response_model=schemas.User)
-def read_user_by_id(
+def read_user_by_name(
         username: str,
         current_user: User = Depends(get_current_active_user),
         db: Session = Depends(get_db),