From f13239560d9a6888d3bf95699ed5fc10395b50ff Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期一, 24 二月 2025 18:57:51 +0800
Subject: [PATCH] 历史记录增加
---
app/api/auth.py | 32 ++++++++++----------------------
1 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/app/api/auth.py b/app/api/auth.py
index 00b70be..634ada2 100644
--- a/app/api/auth.py
+++ b/app/api/auth.py
@@ -1,31 +1,21 @@
import json
-import time
from fastapi import APIRouter, Depends
from sqlalchemy.orm import Session
from sqlalchemy.ext.asyncio import AsyncSession
-
-from Log import logger
from app.api import Response, pwd_context, get_current_user
-from app.api.user import reset_user_pwd
from app.config.config import settings
-from app.config.const import RAGFLOW, BISHENG, DIFY, chat_server, workflow_server
from app.models.app_token_model import AppToken
from app.models.base_model import get_db
from app.models.postgresql_base_model import get_pdb
-from app.models.token_model import upsert_token, update_token
+from app.models.token_model import upsert_token
from app.models.user import UserCreate, LoginData
-from app.models.user_model import UserModel, UserAppModel, UserTokenModel
-from app.service.auth import authenticate_user, create_access_token, is_valid_password, save_register_user, \
- update_user_token, UserAppDao, update_user_info, password_rsa
-from app.service.bisheng import BishengService
-from app.service.service_token import get_new_token, get_token, update_user_group
-from app.service.v2.app_register import AppRegisterDao
-from app.service.difyService import DifyService
+from app.models.user_model import UserModel, UserTokenModel
+from app.service.auth import authenticate_user, create_access_token, is_valid_password, save_register_user, password_rsa
+from app.service.service_token import get_token
from app.service.ragflow import RagflowService
from sqlalchemy.future import select
-from app.utils.password_handle import generate_password
router = APIRouter()
@@ -144,11 +134,9 @@
# await update_token(db, user.id, access_token, token_dict)
# await update_user_token(db, user.id, token_dict)
token_dict = {}
- for app in [{"app": RAGFLOW, "token_id": chat_server},
- {"app": DIFY,"token_id": workflow_server}]:
- user_token = db.query(UserTokenModel).filter(UserTokenModel.id == app["token_id"]).first()
- if user_token and user_token.access_token:
- token_dict[app["app"]] = user_token.access_token
+ user_tokens = db.query(UserTokenModel).all()
+ for user_token in user_tokens:
+ token_dict[user_token.id] = user_token.access_token
result = await pdb.execute(select(AppToken).where(AppToken.id == user.id))
db_app_token = result.scalars().first()
if isinstance(access_token, bytes):
@@ -220,7 +208,7 @@
@router.get("/v2/sync", response_model=Response)
async def sync_user_tenant(userFlag: str, db=Depends(get_db)):
- app_register = AppRegisterDao(db).get_app_by_id(RAGFLOW)
- if app_register:
- is_update = await update_user_group(db, userFlag)
+ # app_register = AppRegisterDao(db).get_app_by_id(RAGFLOW)
+ # if app_register:
+ # is_update = await update_user_group(db, userFlag)
return Response(code=200, msg="success", data={})
\ No newline at end of file
--
Gitblit v1.8.0