From fe8e77104db4503d65f13ad66eaa48d631619d7c Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 15 一月 2025 17:28:16 +0800
Subject: [PATCH] tmp
---
app/service/user.py | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/app/service/user.py b/app/service/user.py
index 5b8e013..b6c916e 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
@@ -57,10 +58,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 = generate_password()
+
+ """
+ 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)
@@ -81,30 +85,33 @@
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)
- pwd = user_model.encrypted_password(app_password)
+ phone=phone, login_name=login_name,sync_flag=sync_flag)
+ # 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 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):
--
Gitblit v1.8.0