增加删除

zhaoqingang

2024-11-19 9c275b214f9619a64cd2998596ce696610185eb4

 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
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 AppRegister
from app.service.ragflow import RagflowService
from app.service.service_token import get_ragflow_token, get_bisheng_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,27 @@
    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()
        print(pwd)
        print(new_password)
        for app_type in AppRegister(db).get_app():
            if app_type == AgentType.RAGFLOW:
                token = get_ragflow_token(db, user_id)
                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)