From c1768114de381e37e272e9faf7db8e95a93ff381 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期一, 11 十一月 2024 16:37:12 +0800
Subject: [PATCH] role group user..
---
app/api/user.py | 31 ++++++-------------------------
1 files changed, 6 insertions(+), 25 deletions(-)
diff --git a/app/api/user.py b/app/api/user.py
index ca725f4..6f98233 100644
--- a/app/api/user.py
+++ b/app/api/user.py
@@ -1,35 +1,16 @@
from fastapi import APIRouter, Depends
-from app.api import Response, pwd_context, get_current_user, ResponseList
-from app.config.config import settings
+from app.api import Response, pwd_context, get_current_user
from app.models.base_model import get_db
-from app.models.group_model import UserGroupModel
+from app.models.user import PageParameter
from app.models.user_model import UserModel
-from app.service.bisheng import BishengService
-from app.service.ragflow import RagflowService
-from app.service.token import get_bisheng_token
+from app.service.user import get_user_list
user_router = APIRouter()
-@user_router.post("/list", response_model=Response)
-async def user_list(current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
-
- bisheng_service = BishengService(settings.sgb_base_url)
- ragflow_service = RagflowService(settings.fwr_base_url)
- db_user = db.query(UserModel).filter(UserGroupModel.group_name == UserModel.username).first()
- if db_user:
- return Response(code=200, msg="Username already registered")
- # 娉ㄥ唽鍒版瘯鏄�
- try:
- token = get_bisheng_token(db, current_user.id)
- print(token)
- result = await bisheng_service.user_list(token)
- print(result)
- except Exception as e:
- return Response(code=500, msg=f"Failed to register with Bisheng: {str(e)}")
-
-
- return ResponseList(code=200, msg="", data=result)
+@user_router.get("/list", response_model=Response)
+async def user_list(paras: PageParameter,current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
+ return Response(code=200, msg="", data=await get_user_list(db, paras.page_size, paras.page_index, paras.keyword))
--
Gitblit v1.8.0