历史记录增加

zhaoqingang

2025-02-24 f13239560d9a6888d3bf95699ed5fc10395b50ff

 app/service/user.py

@@ -1,11 +1,7 @@
import time
import uuid
from datetime import datetime
from traceback import print_tb

from app.api import pwd_context
from app.api.dialog import dialog_list
from app.config.config import settings
from app.config.const import RAGFLOW, BISHENG, DIFY, USER_STATSU_DELETE, ROLE_STATUS_ON, DEPT_STATUS_ON, \
    Dialog_STATSU_ON
from app.models import RoleModel, GroupModel, AgentType, role_resource_table, DialogModel, OrganizationModel, \
@@ -13,13 +9,7 @@
from app.models.menu_model import WebMenuModel, MenuCapacityModel
from app.models.user_model import UserModel, UserAppModel
from Log import logger
from app.service.auth import UserAppDao
from app.service.bisheng import BishengService
from app.service.v2.app_register import AppRegisterDao
from app.service.difyService import DifyService
from app.service.ragflow import RagflowService
from app.service.service_token import get_ragflow_token, get_bisheng_token, get_new_token, get_dify_token
from app.utils.password_handle import generate_password



async def get_user_list(db, page_index: int, page_size: int, keyword: str, role_key: str, user_id):
@@ -58,10 +48,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 = await generate_password()
        app_register = AppRegisterDao(db).get_apps()
        for app in app_register:
            if app["id"] == RAGFLOW:
                service = RagflowService(settings.fwr_base_url)
@@ -82,26 +75,28 @@
            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,sync_flag=sync_flag)
        pwd = user_model.encrypted_password(app_password)
        # 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 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()