From 5eff7ec9d00fa835a76c354bad7cc7f284d28b11 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 26 十二月 2024 13:51:27 +0800
Subject: [PATCH] 新增用户增加rg数据同步
---
app/service/service_token.py | 2 +-
app/service/user.py | 9 +++++----
app/api/user.py | 8 ++++----
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/app/api/user.py b/app/api/user.py
index e9331c6..abd2180 100644
--- a/app/api/user.py
+++ b/app/api/user.py
@@ -32,11 +32,11 @@
pwd = user.pwd
if not pwd:
pwd = "basic123456"
- is_create = await create_user(db, user.userName, user.email, user.phone, user.loginName, pwd, user.roles,
+ user_flag = await create_user(db, user.userName, user.email, user.phone, user.loginName, pwd, user.roles,
user.groups, current_user.id)
- if not is_create:
- return Response(code=500, msg="user create failure", data={})
- return Response(code=200, msg="user create successfully", data={})
+ # if not is_create:
+ # return Response(code=500, msg="user create failure", data={})
+ return Response(code=200, msg="user create successfully", data={"userFlag": user_flag})
@user_router.put("/edit_user", response_model=Response)
diff --git a/app/service/service_token.py b/app/service/service_token.py
index 236a0d7..9707d3c 100644
--- a/app/service/service_token.py
+++ b/app/service/service_token.py
@@ -118,4 +118,4 @@
await ragflow_service.add_user_tenant(token, user.app_id,
u.email,
u.app_id)
- update_ragflow_user_tenant(sync_user.id)
+ update_ragflow_user_tenant(user.app_id)
diff --git a/app/service/user.py b/app/service/user.py
index fbc4119..015d404 100644
--- a/app/service/user.py
+++ b/app/service/user.py
@@ -1,4 +1,5 @@
import time
+import uuid
from datetime import datetime
from traceback import print_tb
@@ -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
@@ -104,8 +105,8 @@
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):
--
Gitblit v1.8.0