From 68433e429c574550204c445e92fdf44e18bf59c0 Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期四, 26 十二月 2024 13:42:26 +0800
Subject: [PATCH] resources表同步
---
app/service/user.py | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/app/service/user.py b/app/service/user.py
index 42bb7fd..fbc4119 100644
--- a/app/service/user.py
+++ b/app/service/user.py
@@ -60,7 +60,7 @@
app_register = AppRegisterDao(db).get_apps()
register_dict = {}
token = ""
- app_password = generate_password()
+ app_password = await generate_password()
for app in app_register:
if app["id"] == RAGFLOW:
service = RagflowService(settings.fwr_base_url)
@@ -98,8 +98,9 @@
db.commit()
db.refresh(user_model)
u_id = user_model.id
+ user_app_dao = UserAppDao(db)
for k, v in register_dict.items():
- await UserAppDao(db).update_and_insert_data(v.get("name"), pwd, v.get("email"), u_id, str(v.get("id")), k)
+ await user_app_dao.update_and_insert_data(v.get("name"), pwd, v.get("email"), u_id, str(v.get("id")), k)
except Exception as e:
logger.error(e)
# db.rollback()
@@ -270,8 +271,9 @@
res = permissions[parent_id].to_router_dict()
res["children"] = [get_child(i["id"]) for i in tmp_dit.get(parent_id, [])]
return res
-
- return {"routers": [get_child(i["id"]) for i in tmp_dit.get(parent_id, [])]}
+ select_list = [get_child(i["id"]) for i in tmp_dit.get(parent_id, [])]
+ sorted_permission_list = sorted(select_list, key=lambda x: x['seq'], reverse=True)
+ return {"routers": sorted_permission_list}
async def get_user_menus(db, user_id):
--
Gitblit v1.8.0