增加公开api

zhaoqingang

2024-12-04 cdb5f8bf45f117831959291c89e0694606ebb479

 app/service/user.py

@@ -2,11 +2,13 @@

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 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_index: int, page_size: int, keyword: str, role_key:str, user_id):
@@ -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)
@@ -98,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)