From abb91124a4372b0efe5ab1b7aa25859c635d30eb Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 10 四月 2025 13:49:37 +0800
Subject: [PATCH] merge
---
app/service/service_token.py | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/app/service/service_token.py b/app/service/service_token.py
index 8838b22..ccbe489 100644
--- a/app/service/service_token.py
+++ b/app/service/service_token.py
@@ -1,13 +1,13 @@
from Log import logger
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.config.const import BISHENG, RAGFLOW, DIFY, chat_server
+from app.models import UserModel, UserAppModel, UserTokenModel
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):
@@ -25,13 +25,14 @@
async def get_ragflow_token(db, user_id: int):
# token = await UserAppDao(db).get_data_by_id(user_id, RAGFLOW)
token = db.query(TokenModel).filter(TokenModel.user_id == user_id).first()
+ token = db.query(UserTokenModel).filter(UserTokenModel.id == chat_server).first()
if not token:
token = await UserAppDao(db).get_data_by_id(user_id, RAGFLOW)
if not token:
return None
return token.access_token
else:
- return token.ragflow_token
+ return token.access_token
async def get_dify_token(db, user_id: int):
@@ -114,13 +115,7 @@
await ragflow_service.add_user_tenant(token,u.app_id,
user.email,
user.app_id)
-
- await ragflow_service.add_user_tenant(token, u.app_id,
- user.email,
- user.app_id)
await ragflow_service.add_user_tenant(token, user.app_id,
u.email,
u.app_id)
- await ragflow_service.add_user_tenant(token, user.app_id,
- u.email,
- u.app_id)
\ No newline at end of file
+ update_ragflow_user_tenant(user.app_id)
--
Gitblit v1.8.0