From 25bf0a51088fa0d0acdc39c6096cc45d699f63a1 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 13 二月 2025 10:53:23 +0800
Subject: [PATCH] merge master
---
app/service/v2/initialize_data.py | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/app/service/v2/initialize_data.py b/app/service/v2/initialize_data.py
index 32e7020..e315b4a 100644
--- a/app/service/v2/initialize_data.py
+++ b/app/service/v2/initialize_data.py
@@ -3,9 +3,12 @@
import os
import yaml
+from passlib.context import CryptContext
+
from Log import logger
-from app.config.const import DIFY, ENV_CONF_PATH
+# from app.api import pwd_context
+from app.config.const import DIFY, ENV_CONF_PATH, RAGFLOW
from app.models import MenuCapacityModel, WebMenuModel, GroupModel, RoleModel, DialogModel, UserModel, UserAppModel, \
cipher_suite, UserTokenModel
from app.service.auth import UserAppDao
@@ -16,6 +19,8 @@
from app.service.v2.app_register import AppRegisterDao
from app.config.config import settings
from app.utils.password_handle import generate_password
+
+pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
async def dialog_menu_sync(db):
@@ -135,15 +140,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",
- parameters = json.dumps(agent["parameters"]))
+ 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)
@@ -252,4 +257,36 @@
db.commit()
except Exception as e:
print(e)
+ db.rollback()
+async def admin_user_sync(db):
+ try:
+ config = {}
+ with open(os.path.join(ENV_CONF_PATH, "admin.yaml"), 'r', encoding='utf-8') as file:
+ # 鍔犺浇JSON鏁版嵁
+ config = yaml.safe_load(file)
+ # print(config)
+ db_user = db.query(UserModel).filter(UserModel.username == config["smart_server"]["account"]).first()
+ if db_user:
+ print("admin_user_sync: 鐢ㄦ埛宸茬粡瀛樺湪锛�")
+ return
+ register_dict = {}
+
+ for app in [RAGFLOW, DIFY]:
+ register_dict[app] = {"id": config[app].get("id", "123"), "name": config[app]["account"],
+ "pwd":config[app]["password"],
+ "email": config[app]["account"]}
+
+ # 瀛樺偍鐢ㄦ埛淇℃伅
+ hashed_password = pwd_context.hash(config["smart_server"]["password"])
+ user_model = UserModel(username=config["smart_server"]["account"], hashed_password=hashed_password, email="",
+ phone="", login_name="", sync_flag="", creator=0, permission="admin")
+ db.add(user_model)
+ db.commit()
+ db.refresh(user_model)
+ u_id = user_model.id
+ user_app_dao = UserAppDao(db)
+ for k, v in register_dict.items():
+ 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()
\ No newline at end of file
--
Gitblit v1.8.0