zhaoqingang
2024-12-26 5eff7ec9d00fa835a76c354bad7cc7f284d28b11
app/service/user.py
@@ -1,4 +1,5 @@
import time
import uuid
from datetime import datetime
from traceback import print_tb
@@ -60,7 +61,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)
@@ -84,10 +85,10 @@
        # 存储用户信息
        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)
                               phone=phone, login_name=login_name,sync_flag=sync_flag)
        pwd = user_model.encrypted_password(app_password)
        user_model.roles = [db.get(RoleModel, roleId) for roleId in roles]
        user_model.password = pwd
@@ -98,13 +99,14 @@
        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):