From 7a9f9cb3c34ebc0836720d0f5738bbe70070bbb3 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 05 十二月 2024 14:22:24 +0800
Subject: [PATCH] 增加菜单和路由控制
---
app/service/user.py | 123 ++++++++++++++++++++++++++++++++++------
1 files changed, 104 insertions(+), 19 deletions(-)
diff --git a/app/service/user.py b/app/service/user.py
index 061d9b9..9ceb047 100644
--- a/app/service/user.py
+++ b/app/service/user.py
@@ -1,18 +1,20 @@
-import base64
-
from datetime import datetime
from app.api import pwd_context
from app.config.config import settings
-from app.models import RoleModel, GroupModel
+from app.models import RoleModel, GroupModel, AgentType, role_resource_table
from app.models.user_model import UserModel
-from app.Log import logger
+from Log import logger
from app.service.bisheng import BishengService
+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, get_ragflow_new_token
-async def get_user_list(db, page_size: int, page_index: int, keyword: str):
- query = db.query(UserModel)
+async def get_user_list(db, page_index: int, page_size: int, keyword: str, role_key:str, user_id):
+ query = db.query(UserModel).filter(UserModel.permission!="admin")
+ # if role_key != "admin":
+ # query.filter(UserModel.creator==user_id)
if keyword:
query = query.filter(UserModel.group_name.like('%{}%'.format(keyword)))
users = query.order_by(UserModel.id.desc()).limit(page_size).offset(
@@ -33,7 +35,7 @@
async def delete_user_data(db, user_id: str):
try:
- db.query(UserModel).filter(UserModel.id == user_id).delete()
+ db.query(UserModel).filter(UserModel.id == user_id, UserModel.permission!="admin").delete()
db.commit()
except Exception as e:
logger.error(e)
@@ -42,7 +44,7 @@
return True
-async def create_user(db, user_name, email, phone, login_name, password, roles, groups):
+async def create_user(db, user_name, email, phone, login_name, password, roles, groups, user_id):
try:
bisheng_service = BishengService(settings.sgb_base_url)
ragflow_service = RagflowService(settings.fwr_base_url)
@@ -69,6 +71,7 @@
user_model.roles = [db.get(RoleModel, roleId) for roleId in roles]
if groups:
user_model.groups = [db.get(GroupModel, groupId) for groupId in groups]
+ user_model.creator = user_id
db.add(user_model)
db.commit()
db.refresh(user_model)
@@ -97,12 +100,25 @@
return True
-async def edit_user_pwd(db, user_id, password="000000"):
+async def edit_user_pwd(db, user_id, current_user_id ,new_password="000000"):
try:
- #TODO
- hashed_password = pwd_context.hash(password)
user = db.query(UserModel).filter(UserModel.id == user_id).first()
- user.hashed_password = hashed_password
+ pwd = user.decrypted_password()
+ for app_type in AppRegisterDao(db).get_app():
+ if app_type == AgentType.RAGFLOW:
+ 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:
+ token = get_bisheng_token(db, current_user_id)
+ bisheng_service = BishengService(settings.sgb_base_url)
+ await bisheng_service.change_password_public(token, user.username, pwd, new_password)
+ else:
+ logger.error("娉ㄥ唽鏈煡搴旂敤锛歿}".format(app_type))
+ # hashed_password = pwd_context.hash(password)
+ hashed_password = user.encrypted_password(new_password)
+
+ user.password = hashed_password
db.commit()
except Exception as e:
logger.error(e)
@@ -111,10 +127,79 @@
return True
-async def get_user_info(db, page_size: int, page_index: int, keyword: str):
- query = db.query(UserModel)
- if keyword:
- query = query.filter(UserModel.group_name.like('%{}%'.format(keyword)))
- users = query.order_by(UserModel.id.desc()).limit(page_size).offset(
- (page_index - 1) * page_size).all()
- return {"total": query.count(), "rows": [user.to_json() for user in users]}
\ No newline at end of file
+async def get_user_info(db, user_id):
+ permissions = set()
+ roles = []
+ dept = []
+ role_set = set()
+ dept_set = set()
+ user = db.query(UserModel).filter_by(id=user_id).first()
+ await role_resource(role_set, roles, permissions, user.roles)
+ for ogt in user.organizations:
+ dept.append(ogt.to_json())
+ if ogt.roles:
+ await role_resource(role_set, roles, permissions, user.roles)
+ parent_ogt = ogt.parent
+ while parent_ogt:
+ if parent_ogt.id not in dept_set:
+ await role_resource(role_set, roles, permissions, parent_ogt.roles)
+ dept_set.add(parent_ogt.id)
+ parent_ogt = parent_ogt.parent
+ if user.permission == "admin":
+ permissions = ["*:*:*"]
+
+ return {"permissions": list(permissions), "dept": dept , "roles": roles, "user": user.to_dict()}
+
+
+async def role_resource(role_set, role_list, permissions, roles):
+ for role in roles:
+ if role.id not in role_set:
+ role_set.add(role.id)
+ role_list.append(role.to_dict())
+ for r in role.resources:
+ if r.resource_type_id == "1":
+ permissions.add(r.perms)
+
+
+async def get_user_routers(db, user_id):
+ permissions = {}
+ role_set = set()
+ dept_set = set()
+ user = db.query(UserModel).filter_by(id=user_id).first()
+ parent_id = ""
+ async def role_resource(role_set, permissions, roles):
+ nonlocal parent_id
+ for role in roles:
+ if role.id not in role_set:
+ role_set.add(role.id)
+
+ for r in role.resources:
+ if r.resource_type_id != "1":
+ if not r.resource_id:
+ parent_id = r.id
+ continue
+ permissions[r.id] = r.to_router_dict()
+
+ await role_resource(role_set, permissions, user.roles)
+ for ogt in user.organizations:
+ if ogt.roles:
+ await role_resource(role_set, permissions, user.roles)
+ parent_ogt = ogt.parent
+ while parent_ogt:
+ if parent_ogt.id not in dept_set:
+ await role_resource(role_set, permissions, parent_ogt.roles)
+ dept_set.add(parent_ogt.id)
+ parent_ogt = parent_ogt.parent
+ tmp_dit = {}
+ for permission in permissions.values():
+ tmp_dit[permission["parentId"]] = tmp_dit.get(permission["parentId"], []) +[permission]
+ def get_child(parent_id):
+ res = permissions[parent_id]
+ res["children"] = [get_child(i["id"]) for i in tmp_dit.get(parent_id, [])]
+ return res
+
+ print(parent_id)
+ print(tmp_dit)
+ return {"routers": [get_child(i["id"]) for i in tmp_dit.get(parent_id, [])]}
+
+
--
Gitblit v1.8.0