From 9e51ec752c93d850db15cd61a7a3463d8fe94344 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期五, 06 十二月 2024 10:10:09 +0800
Subject: [PATCH] 问题处理
---
app/api/auth.py | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/app/api/auth.py b/app/api/auth.py
index aa56f3a..2fc3ea7 100644
--- a/app/api/auth.py
+++ b/app/api/auth.py
@@ -98,10 +98,11 @@
return Response(code=400, msg="token not found")
return Response(code=200, msg="success", data={
"ragflow_token": token.ragflow_token,
+ "bisheng_token": token.bisheng_token,
})
-@router.post("/login_test", response_model=Response)
+@router.post("/v2/login", response_model=Response)
async def login_test(login_data: LoginData, db: Session = Depends(get_db), pdb: AsyncSession = Depends(get_pdb)):
user = authenticate_user(db, login_data.username, login_data.password)
if not user:
@@ -130,15 +131,17 @@
await update_token(db, user.id, access_token, token_dict)
result = await pdb.execute(select(AppToken).where(AppToken.id == user.id))
db_app_token = result.scalars().first()
+ if isinstance(access_token, bytes):
+ access_token = access_token.decode()
if not db_app_token:
app_token_str = json.dumps(token_dict)
# print(app_token_str)
- app_token = AppToken(id=user.id, token=access_token.decode(), app_token=app_token_str)
+ app_token = AppToken(id=user.id, token=access_token, app_token=app_token_str)
pdb.add(app_token)
await pdb.commit()
await pdb.refresh(app_token)
else:
- db_app_token.token = access_token.decode()
+ db_app_token.token = access_token
db_app_token.app_token = json.dumps(token_dict)
await pdb.commit()
await pdb.refresh(db_app_token)
@@ -152,7 +155,7 @@
-@router.post("/register_test", response_model=Response)
+@router.post("/v2/register", response_model=Response)
async def register_test(user: UserCreate, db=Depends(get_db)):
db_user = db.query(UserModel).filter(UserModel.username == user.username).first()
if db_user:
--
Gitblit v1.8.0