From f9a307e86b771f20bd2dc043a875b2ee86cc5d50 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 12 十一月 2024 18:42:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/api/auth.py | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/app/api/auth.py b/app/api/auth.py
index ac974d3..0011ee9 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
@@ -20,24 +22,24 @@
if db_user:
return Response(code=200, msg="Username already registered")
- bisheng_service = BishengService(settings.bisheng_base_url)
- ragflow_service = RagflowService(settings.ragflow_base_url)
+ bisheng_service = BishengService(settings.sgb_base_url)
+ ragflow_service = RagflowService(settings.fwr_base_url)
# 娉ㄥ唽鍒版瘯鏄�
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.add(db_user)
db.commit()
db.refresh(db_user)
@@ -50,8 +52,8 @@
if not user:
return Response(code=400, msg="Incorrect username or password")
- bisheng_service = BishengService(settings.bisheng_base_url)
- ragflow_service = RagflowService(settings.ragflow_base_url)
+ bisheng_service = BishengService(settings.sgb_base_url)
+ ragflow_service = RagflowService(settings.fwr_base_url)
# 鐧诲綍鍒版瘯鏄�
try:
@@ -75,6 +77,7 @@
"token_type": "bearer",
"username": user.username,
"nickname": "",
+ "user": user.to_json()
})
--
Gitblit v1.8.0