From 7be58d7783c8ef4b0b10c384dcd76d6b011f0817 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 30 十月 2024 10:04:00 +0800
Subject: [PATCH] fix报告生成
---
app/api/auth.py | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/app/api/auth.py b/app/api/auth.py
index feef6d9..14f2c06 100644
--- a/app/api/auth.py
+++ b/app/api/auth.py
@@ -1,12 +1,10 @@
-from fastapi import APIRouter, Depends, Request
-from fastapi.security import OAuth2PasswordBearer
-from passlib.context import CryptContext
+from fastapi import APIRouter, Depends
from sqlalchemy.orm import Session
-from app.api import Response, pwd_context, oauth2_scheme, get_current_user
+from app.api import Response, pwd_context, 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.token_model import upsert_token, get_token
from app.models.user import UserCreate, LoginData
from app.models.user_model import UserModel
from app.service.auth import authenticate_user, create_access_token
@@ -16,16 +14,14 @@
router = APIRouter()
-
-
@router.post("/register", response_model=Response)
async def register(user: UserCreate, db=Depends(get_db)):
db_user = db.query(UserModel).filter(UserModel.username == user.username).first()
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:
@@ -54,8 +50,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:
@@ -80,3 +76,14 @@
"username": user.username,
"nickname": "",
})
+
+
+@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)
+ if token is None:
+ return Response(code=400, msg="token not found")
+ return Response(code=200, msg="success", data={
+ "ragflow_token": token.ragflow_token,
+ })
--
Gitblit v1.8.0