From 6b6a86143389bcb7add382b5f78d4a24684b78fa Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 04 十二月 2024 17:40:43 +0800
Subject: [PATCH] merge
---
app/service/user.py | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/app/service/user.py b/app/service/user.py
index 6cf7c1e..cd7a053 100644
--- a/app/service/user.py
+++ b/app/service/user.py
@@ -6,9 +6,9 @@
from app.models.user_model import UserModel
from Log import logger
from app.service.bisheng import BishengService
-from app.service.common.app_register import AppRegister
+from app.service.common.app_register import AppRegisterDao
from app.service.ragflow import RagflowService
-from app.service.service_token import get_ragflow_token, get_bisheng_token
+from app.service.service_token import get_ragflow_token, get_bisheng_token, get_ragflow_new_token
async def get_user_list(db, page_index: int, page_size: int, keyword: str, role_key:str, user_id):
@@ -104,11 +104,9 @@
try:
user = db.query(UserModel).filter(UserModel.id == user_id).first()
pwd = user.decrypted_password()
- print(pwd)
- print(new_password)
- for app_type in AppRegister(db).get_app():
+ for app_type in AppRegisterDao(db).get_app():
if app_type == AgentType.RAGFLOW:
- token = get_ragflow_token(db, user_id)
+ token = await get_ragflow_new_token(db, user_id, app_type)
ragflow_service = RagflowService(settings.fwr_base_url)
await ragflow_service.set_user_password(token, pwd, new_password)
elif app_type == AgentType.BISHENG:
--
Gitblit v1.8.0