From ac9373fd6f0db53c983d87c4790cb627e82759e9 Mon Sep 17 00:00:00 2001 From: zhaoqingang <zhaoqg0118@163.com> Date: 星期二, 25 二月 2025 17:25:39 +0800 Subject: [PATCH] merge --- app/service/service_token.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/service/service_token.py b/app/service/service_token.py index 7a2a695..6383b6a 100644 --- a/app/service/service_token.py +++ b/app/service/service_token.py @@ -2,12 +2,12 @@ from app.config.config import settings from app.config.const import BISHENG, RAGFLOW, DIFY from app.models import UserModel, UserAppModel -from app.models.base_model import SessionLocal from app.models.token_model import TokenModel from app.service.auth import UserAppDao from app.service.bisheng import BishengService from app.service.difyService import DifyService from app.service.ragflow import RagflowService +from app.task.fetch_agent import update_ragflow_user_tenant async def get_bisheng_token(db, user_id: int): @@ -103,7 +103,7 @@ logger.error("娉ㄥ唽鐢ㄦ埛鑾峰彇token澶辫触锛�") return False user_list = db.query(UserAppModel).filter(UserAppModel.app_type==RAGFLOW).all() - user = db.query(UserAppModel).filter(UserAppModel.userFlag==sync_user.id, UserAppModel.app_type == RAGFLOW).first() + user = db.query(UserAppModel).filter(UserAppModel.user_id==sync_user.id, UserAppModel.app_type == RAGFLOW).first() if not user: logger.error("娉ㄥ唽鐢ㄦ埛鑾峰彇淇℃伅澶辫触锛�") return False @@ -116,4 +116,5 @@ user.app_id) await ragflow_service.add_user_tenant(token, user.app_id, u.email, - u.app_id) \ No newline at end of file + u.app_id) + update_ragflow_user_tenant(user.app_id) -- Gitblit v1.8.0