From aa99acacfe3c21fbd638652f2fba1c1c62e3c414 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 11 十月 2024 21:38:55 +0800
Subject: [PATCH] websocket接口，转发毕昇对话
---
app/api/auth.py | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/app/api/auth.py b/app/api/auth.py
index 86da42f..feef6d9 100644
--- a/app/api/auth.py
+++ b/app/api/auth.py
@@ -1,16 +1,13 @@
-from typing import Dict
-import json
-
-from fastapi import APIRouter, Depends, HTTPException
+from fastapi import APIRouter, Depends, Request
from fastapi.security import OAuth2PasswordBearer
from passlib.context import CryptContext
from sqlalchemy.orm import Session
-from app.api import Response
+from app.api import Response, pwd_context, oauth2_scheme, get_current_user
from app.config.config import settings
from app.models.base_model import get_db
from app.models.token_model import upsert_token
-from app.models.user import User, UserCreate, LoginData
+from app.models.user import UserCreate, LoginData
from app.models.user_model import UserModel
from app.service.auth import authenticate_user, create_access_token
from app.service.bisheng import BishengService
@@ -18,8 +15,7 @@
router = APIRouter()
-pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
-oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token")
+
@router.post("/register", response_model=Response)
@@ -74,7 +70,7 @@
return Response(code=500, msg=f"Failed to login with Ragflow: {str(e)}")
# 鍒涘缓鏈湴token
- access_token = create_access_token(data={"sub": user.username})
+ access_token = create_access_token(data={"sub": user.username, "user_id": user.id})
upsert_token(db, user.id, access_token, bisheng_token, ragflow_token)
--
Gitblit v1.8.0