merge master

zhaoqingang

2025-02-06 b9c7727dc6fbb3789f063c0616ef9392311fecb2

 app/service/user.py

@@ -1,4 +1,5 @@
import time
import uuid
from datetime import datetime
from traceback import print_tb

@@ -57,10 +58,13 @@

async def create_user(db, user_name, email, phone, login_name, password, roles, groups, user_id):
    try:
        app_register = AppRegisterDao(db).get_apps()

        register_dict = {}
        token = ""
        app_password = generate_password()

        """
        app_password = await generate_password()
        app_register = AppRegisterDao(db).get_apps()
        for app in app_register:
            if app["id"] == RAGFLOW:
                service = RagflowService(settings.fwr_base_url)
@@ -81,30 +85,33 @@
            except Exception as e:
                logger.error(e)
                return False

        """
        # 存储用户信息
        hashed_password = pwd_context.hash(password)

        sync_flag = str(uuid.uuid4())
        user_model = UserModel(username=user_name, hashed_password=hashed_password, email=email,
                               ## ragflow_id=ragflow_info.get("id"),bisheng_id=bisheng_info.get("user_id"),
                               phone=phone, login_name=login_name)
        pwd = user_model.encrypted_password(app_password)
                               phone=phone, login_name=login_name,sync_flag=sync_flag)
        # pwd = user_model.encrypted_password(app_password)
        # user_model.password = pwd
        user_model.roles = [db.get(RoleModel, roleId) for roleId in roles]
        user_model.password = pwd
        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)
        """
        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()
        return False
    return True
        return ''
    return sync_flag


async def edit_user_data(db, user_id, email, phone, login_name, roles, groups):
@@ -330,8 +337,8 @@
    knowledge_dict = {}
    user = db.query(UserModel).filter_by(id=user_id).first()
    parent_id = ""
    # print(111111111111111)
    async def role_resource(role_set, permissions, roles):

    async def role_resource_type(role_set, permissions, roles, type):
        nonlocal parent_id
        for role in roles:
            if role.id not in role_set:
@@ -339,20 +346,19 @@

                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()
                        permission_dict = r.to_router_dict()
                        permission_dict["type"] = type
                        permissions[r.id] = permission_dict

    await role_resource(role_set, permissions, user.roles)
    await role_resource_type(role_set, permissions, user.roles, "user")
    for ogt in user.organizations:
        if ogt.roles:
            await role_resource(role_set, permissions, ogt.roles)
            await role_resource_type(role_set, permissions, ogt.roles, "org")
        parent_ogt = ogt.parent
        while parent_ogt:

            if parent_ogt.id not in dept_set:
                await role_resource(role_set, permissions, parent_ogt.roles)
                await role_resource_type(role_set, permissions, parent_ogt.roles, "org")
                dept_set.add(parent_ogt.id)

                parent_ogt = parent_ogt.parent
@@ -383,7 +389,7 @@
async def get_user_dept(db, user_id):
    res = {}
    user = db.query(UserModel).filter_by(id=user_id).first()
    res["rows"] = [i.to_dict() for i in user.organizations]
    res["rows"] = [i.to_dict() for i in user.organizations if i.status == DEPT_STATUS_ON]
    return res