From cfb8a353c72f96494cd46a78bd917f6ed8aaef1d Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 20 十一月 2024 17:01:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/api/auth.py | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/app/api/auth.py b/app/api/auth.py
index 14f2c06..72b0bbf 100644
--- a/app/api/auth.py
+++ b/app/api/auth.py
@@ -1,3 +1,5 @@
+import json
+
from fastapi import APIRouter, Depends
from sqlalchemy.orm import Session
@@ -25,19 +27,20 @@
# 娉ㄥ唽鍒版瘯鏄�
try:
- await bisheng_service.register(user.username, user.password)
+ bisheng_info = await bisheng_service.register(user.username, user.password)
except Exception as e:
return Response(code=500, msg=f"Failed to register with Bisheng: {str(e)}")
# 娉ㄥ唽鍒皉agflow
try:
- await ragflow_service.register(user.username, user.password)
+ ragflow_info = await ragflow_service.register(user.username, user.password)
except Exception as e:
return Response(code=500, msg=f"Failed to register with Ragflow: {str(e)}")
# 瀛樺偍鐢ㄦ埛淇℃伅
hashed_password = pwd_context.hash(user.password)
- db_user = UserModel(username=user.username, hashed_password=hashed_password)
+ db_user = UserModel(username=user.username, hashed_password=hashed_password, email=ragflow_info.get("email", f"{user.username}@example.com"),ragflow_id=ragflow_info.get("id"),bisheng_id=bisheng_info.get("user_id"))
+ db_user.password = db_user.encrypted_password(user.password)
db.add(db_user)
db.commit()
db.refresh(db_user)
@@ -75,6 +78,7 @@
"token_type": "bearer",
"username": user.username,
"nickname": "",
+ "user": user.to_login_json()
})
--
Gitblit v1.8.0