youhua

zhaoqingang

2024-11-21 95d2318cd8fe7f39a9786fe9a8088440b081b295

 app/api/auth.py

@@ -1,3 +1,5 @@
import json

from fastapi import APIRouter, Depends
from sqlalchemy.orm import Session

@@ -20,24 +22,25 @@
    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)}")

    # 注册到ragflow
    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)
@@ -50,8 +53,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 +78,7 @@
        "token_type": "bearer",
        "username": user.username,
        "nickname": "",
        "user": user.to_login_json()
    })