From bcc63761bdc4c1604c9275a3c5cdf8a483ad5611 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 06 二月 2025 16:37:09 +0800
Subject: [PATCH] TOKEN同步功能
---
app/service/v2/initialize_data.py | 77 +++++++++++++++++++++++++++++---------
1 files changed, 58 insertions(+), 19 deletions(-)
diff --git a/app/service/v2/initialize_data.py b/app/service/v2/initialize_data.py
index a778b13..c3e295f 100644
--- a/app/service/v2/initialize_data.py
+++ b/app/service/v2/initialize_data.py
@@ -1,10 +1,13 @@
import json
import time
import os
+
+import yaml
+
from Log import logger
-from app.config.const import DIFY
+from app.config.const import DIFY, ENV_CONF_PATH
from app.models import MenuCapacityModel, WebMenuModel, GroupModel, RoleModel, DialogModel, UserModel, UserAppModel, \
- cipher_suite
+ cipher_suite, UserTokenModel
from app.service.auth import UserAppDao
from app.service.bisheng import BishengService
from app.service.difyService import DifyService
@@ -17,7 +20,7 @@
async def dialog_menu_sync(db):
menu_list = []
- with open("env_conf/menu_conf.json", 'r', encoding='utf-8') as file:
+ with open(os.path.join(ENV_CONF_PATH, "menu_conf.json") , 'r', encoding='utf-8') as file:
# 鍔犺浇JSON鏁版嵁
data = json.load(file)
menu_list = data.get("data", [])
@@ -40,29 +43,35 @@
async def create_menu_sync(db):
- json_file_path = "env_conf/menu_conf.json"
+ # json_file_path = "env_conf/menu_conf.json.template"
+ json_file_path = os.path.join(ENV_CONF_PATH, "menu_conf.json.template")
with open(json_file_path, 'r', encoding='utf-8') as file:
json_data = json.load(file).get("data", [])
- for menu in json_data:
- menu['dialog'].clear()
+ # for menu in json_data:
+ # menu['dialog'].clear()
dialogs = db.query(DialogModel).all()
dialog_dict = {}
for dialog in dialogs:
if dialog.name not in dialog_dict:
dialog_dict[dialog.name] = []
- dialog_dict[dialog.name].append(dialog)
-
- for menu in json_data:
- if menu['title'] in dialog_dict:
- for dialog in dialog_dict[menu['title']]:
- new_dialog_item = {
+ dialog_dict[dialog.name].append({
'id': dialog.id,
'chat_id': dialog.id,
'chat_type': '',
'agentType': dialog.dialog_type
- }
- menu['dialog'].append(new_dialog_item)
+ })
+
+ for menu in json_data:
+ # if menu['title'] in dialog_dict:
+ # for dialog in dialog_dict[menu['title']]:
+ # new_dialog_item = {
+ # 'id': dialog.id,
+ # 'chat_id': dialog.id,
+ # 'chat_type': '',
+ # 'agentType': dialog.dialog_type
+ # }
+ menu['dialog']= dialog_dict.get(menu['title'], [])
json_data = {"data": json_data}
new_file_name = f"menu_conf.json.template"
new_file_path = os.path.join(os.path.dirname(json_file_path), new_file_name)
@@ -102,7 +111,7 @@
async def app_register_sync(db):
app_dict = {}
- with open("env_conf/app_register_conf.json", 'r', encoding='utf-8') as file:
+ with open(os.path.join(ENV_CONF_PATH, "app_register_conf.json"), 'r', encoding='utf-8') as file:
# 鍔犺浇JSON鏁版嵁
app_dict = json.load(file)
try:
@@ -114,7 +123,7 @@
async def basic_agent_sync(db):
agent_list = []
- with open("env_conf/default_agent_conf.json", 'r', encoding='utf-8') as file:
+ with open(os.path.join(ENV_CONF_PATH, "default_agent_conf.json"), 'r', encoding='utf-8') as file:
# 鍔犺浇JSON鏁版嵁
agent_dict = json.load(file)
agent_list = agent_dict.get("basic", [])
@@ -126,14 +135,15 @@
dialog.name = agent["name"]
dialog.description = agent["description"]
dialog.icon = agent["icon"]
+ dialog.mode = agent["mode"]
+ dialog.parameters = json.dumps(agent["parameters"])
db.commit()
except Exception as e:
logger.error(e)
else:
try:
- dialog = DialogModel(id=agent["id"], name=agent["name"], description=agent["description"],
- icon=agent["icon"], tenant_id=user.id if user else "", dialog_type="3",
- agent_id=agent["id"])
+ dialog = DialogModel(id=agent["id"], name=agent["name"], description=agent["description"],
+ icon=agent["icon"], tenant_id=user.id if user else "", dialog_type=agent["dialogType"], mode=agent["mode"],parameters = json.dumps(agent["parameters"]))
db.add(dialog)
db.commit()
db.refresh(dialog)
@@ -214,3 +224,32 @@
if not user_id:
raise Exception("Failed to register with app")
print({"msg": "User registered successfully", "userFlag": user_id})
+
+
+async def admin_account_sync(db):
+ try:
+ config = {}
+ now_account =[]
+ with open(os.path.join(ENV_CONF_PATH, "account.yaml"), 'r', encoding='utf-8') as file:
+ # 鍔犺浇JSON鏁版嵁
+ config = yaml.safe_load(file)
+ account_list = db.query(UserTokenModel).all()
+ for account in account_list:
+ if account.id in config:
+
+ if account.account != config[account.id]["account"] or account.password != config[account.id]["password"]:
+ db.query(UserTokenModel).filter_by(id=account.id).update({"account": config[account.id]["account"],
+ "password": config[account.id]["password"],
+ "access_token": ""
+ })
+ now_account.append(account.id)
+ else:
+ db.query(UserTokenModel).filter_by(id=account.id).delete()
+ for k, v in config.items():
+ if k not in now_account:
+ new_account = UserTokenModel(id=k, account=v["account"], password=v["password"])
+ db.add(new_account)
+ db.commit()
+ except Exception as e:
+ print(e)
+ db.rollback()
\ No newline at end of file
--
Gitblit v1.8.0