From a1e8b5465845393c013cb2d3ae12cbecc5c4efd8 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 26 二月 2025 13:51:20 +0800
Subject: [PATCH] 用户增加修改组信息
---
app/service/v2/initialize_data.py | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/app/service/v2/initialize_data.py b/app/service/v2/initialize_data.py
index 9f47f70..1f05cab 100644
--- a/app/service/v2/initialize_data.py
+++ b/app/service/v2/initialize_data.py
@@ -7,15 +7,18 @@
from Log import logger
+from app.config.agent_base_url import RG_APP_TOKEN_LIST, RG_APP_NEW_TOKEN
# from app.api import pwd_context
-from app.config.const import DIFY, ENV_CONF_PATH, RAGFLOW, smart_server, chat_server, workflow_server
+from app.config.const import DIFY, ENV_CONF_PATH, RAGFLOW, smart_server, chat_server, workflow_server, TMP_DICT, \
+ rg_api_token
from app.models import MenuCapacityModel, WebMenuModel, GroupModel, RoleModel, DialogModel, UserModel, UserAppModel, \
- cipher_suite, UserTokenModel
+ cipher_suite, UserTokenModel, ApiTokenModel
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.service.service_token import get_new_token
+from app.service.v2.app_driver.chat_data import ChatBaseApply
from app.service.v2.app_register import AppRegisterDao
from app.config.config import settings
from app.utils.password_handle import generate_password, password_encrypted, password_decrypted
@@ -235,7 +238,7 @@
try:
config = {}
app_dict = {}
- tmp_dict = {chat_server:RAGFLOW, workflow_server:DIFY}
+ # tmp_dict = {chat_server:RAGFLOW, workflow_server:DIFY}
now_account =[]
with open(os.path.join(ENV_CONF_PATH, "admin.yaml"), 'r', encoding='utf-8') as file:
# 鍔犺浇JSON鏁版嵁
@@ -254,8 +257,8 @@
db.query(UserTokenModel).filter_by(id=account.id).delete()
for k, v in config.items():
- if k in tmp_dict:
- app_dict[tmp_dict[k]] = v.get("id")
+ if k in TMP_DICT:
+ app_dict[TMP_DICT[k]] = v.get("id")
if k == smart_server:
db_user = db.query(UserModel).filter(UserModel.username == config["smart_server"]["account"]).first()
if db_user:
@@ -318,4 +321,36 @@
# await user_app_dao.update_and_insert_data(v.get("name"), user_model.encrypted_password(v.get("pwd")), v.get("email"), u_id, str(v.get("id")), k)
except Exception as e:
print(e)
+ db.rollback()
+
+
+async def sync_rg_api_token(db):
+ token = ""
+ try:
+ app_token = db.query(ApiTokenModel).filter_by(app_id=rg_api_token).first()
+ if app_token:
+ print("rg_api_token: 宸茬粡瀛樺湪锛�")
+ return
+ user_token = db.query(UserTokenModel).filter(UserTokenModel.id == chat_server).first()
+ chat = ChatBaseApply()
+ token_list_url = f"{settings.fwr_base_url}{RG_APP_TOKEN_LIST}"
+ token_list = await chat.chat_get(token_list_url, {}, await chat.get_chat_headers(user_token.access_token))
+ if token_list and token_list.get("code") == 0:
+ if len(token_list.get("data", [])) == 0:
+ print("rg_api_token: 鍒涘缓鎴愬姛锛�")
+ new_token_url = f"{settings.fwr_base_url}{RG_APP_NEW_TOKEN}"
+ new_token = await chat.chat_post(new_token_url, {}, await chat.get_chat_headers(user_token.access_token))
+ if new_token and new_token.get("code") == 0:
+ token = new_token.get("data", {}).get("token")
+ else:
+ token = token_list.get("data")[0].get("token")
+ print("rg_api_token: 宸叉湁token锛�")
+ if token:
+
+ db.add(ApiTokenModel(id=rg_api_token, app_id=rg_api_token, type="platform", token=token))
+ db.commit()
+ print("rg_api_token: 鏇存柊鎴愬姛锛�")
+
+ except Exception as e:
+ print(e)
db.rollback()
\ No newline at end of file
--
Gitblit v1.8.0