From 08c8e8c9a4d65677de6a493446a605d70efee631 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 10 十二月 2024 16:32:07 +0800
Subject: [PATCH] 12.10 16

---
 app/service/service_token.py |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/service/service_token.py b/app/service/service_token.py
index 15ded3b..8fffc99 100644
--- a/app/service/service_token.py
+++ b/app/service/service_token.py
@@ -1,23 +1,26 @@
 from Log import logger
 from app.config.config import settings
+from app.config.const import BISHENG, RAGFLOW
 from app.models import UserModel
 from app.models.token_model import TokenModel
+from app.service.auth import UserAppDao
 from app.service.bisheng import BishengService
 from app.service.ragflow import RagflowService
 
 
-def get_bisheng_token(db, user_id: int):
-    token = db.query(TokenModel).filter(TokenModel.user_id == user_id).first()
+async def get_bisheng_token(db, user_id: int):
+    # token = db.query(TokenModel).filter(TokenModel.user_id == user_id).first()
+    token = await UserAppDao.get_data_by_id(user_id, BISHENG)
     if not token:
         return None
-    return token.bisheng_token
+    return token.access_token
 
 
-def get_ragflow_token(db, user_id: int):
-    token = db.query(TokenModel).filter(TokenModel.user_id == user_id).first()
+async def get_ragflow_token(db, user_id: int):
+    token = await UserAppDao.get_data_by_id(user_id, RAGFLOW)
     if not token:
         return None
-    return token.ragflow_token
+    return token.access_token
 
 
 async def get_ragflow_new_token(db, user_id: int, app_type):

--
Gitblit v1.8.0