From 08c8e8c9a4d65677de6a493446a605d70efee631 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 10 十二月 2024 16:32:07 +0800
Subject: [PATCH] 12.10 16
---
app/api/auth.py | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/app/api/auth.py b/app/api/auth.py
index a4d96a3..f850882 100644
--- a/app/api/auth.py
+++ b/app/api/auth.py
@@ -18,7 +18,7 @@
from app.service.auth import authenticate_user, create_access_token, is_valid_password, save_register_user, \
update_user_token, UserAppDao
from app.service.bisheng import BishengService
-from app.service.common.app_register import AppRegisterDao
+from app.service.v2.app_register import AppRegisterDao
from app.service.difyService import DifyService
from app.service.ragflow import RagflowService
from sqlalchemy.future import select
@@ -96,13 +96,10 @@
@router.get("/token", response_model=Response)
async def token_api(db: Session = Depends(get_db), current_user: UserModel = Depends(get_current_user)):
# 鏌ヨ鐜版湁璁板綍
- token = get_token(db, current_user.id)
+ token = await get_token(db, current_user.id)
if token is None:
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,
- })
+ return Response(code=200, msg="success", data=token)
@router.post("/v2/login", response_model=Response)
@@ -123,7 +120,7 @@
logger.error("鏈煡娉ㄥ唽搴旂敤---")
continue
try:
- user_app = UserAppDao(db).get_data_by_id(user.id, app["id"])
+ user_app = await UserAppDao(db).get_data_by_id(user.id, app["id"])
if user_app:
name = user_app.username
token = await service.login(name, login_data.password)
@@ -134,7 +131,7 @@
# 鍒涘缓鏈湴token
access_token = create_access_token(data={"sub": user.username, "user_id": user.id})
- await update_token(db, user.id, access_token, token_dict)
+ # await update_token(db, user.id, access_token, token_dict)
await update_user_token(db, user.id, token_dict)
result = await pdb.execute(select(AppToken).where(AppToken.id == user.id))
db_app_token = result.scalars().first()
@@ -184,7 +181,7 @@
try:
name = app["id"] + str(int(time.time()))
register_info = await service.register(name, user.password)
- print(register_info)
+ # print(register_info)
register_dict[app['id']] = {"id":register_info.get("id"), "name": name, "email": register_info.get("email")}
except Exception as e:
return Response(code=500, msg=f"Failed to register with {app['id']}: {str(e)}")
--
Gitblit v1.8.0