From e5e2be29cfc033c976558a4d0b5fa73426818b90 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 26 二月 2025 11:30:48 +0800
Subject: [PATCH] 增加系统信息修改
---
app/service/auth.py | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/app/service/auth.py b/app/service/auth.py
index 8c6544c..dcf1ebb 100644
--- a/app/service/auth.py
+++ b/app/service/auth.py
@@ -4,7 +4,6 @@
import base64
from datetime import datetime, timedelta
from typing import Type
-from uuid import uuid4
from jwt import encode, decode, exceptions
from passlib.context import CryptContext
@@ -13,12 +12,9 @@
from Log import logger
from app.config.config import settings
-from app.config.const import RAGFLOW, BISHENG, DIFY, USER_STATSU_DELETE, APP_SERVICE_PATH
+from app.config.const import USER_STATSU_DELETE, APP_SERVICE_PATH
from app.models import RoleModel, GroupModel, TokenModel
from app.models.user_model import UserModel, UserAppModel
-# from app.service.ragflow import RagflowService
-# from app.service.service_token import get_new_token
-from app.service.v2.app_register import AppRegisterDao
from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives import serialization
@@ -83,23 +79,21 @@
try:
hashed_password = pwd_context.hash(password)
db_user = UserModel(username=username, hashed_password=hashed_password, email=email, sync_flag=sync_flag)
- pwd = db_user.encrypted_password(app_password)
- db_user.password = pwd
+ # pwd = db_user.encrypted_password(app_password)
+ # db_user.password = pwd
db_user.roles = [db.query(RoleModel).filter(RoleModel.role_type == 2).first()]
db_user.groups = [db.query(GroupModel).filter(GroupModel.group_type == 2).first()]
db.add(db_user)
db.commit()
db.refresh(db_user)
+ '''
user_id = db_user.id
for k, v in register_dict.items():
await UserAppDao(db).update_and_insert_data(v.get("name"), pwd, v.get("email"), user_id, str(v.get("id")), k)
-
+ '''
except Exception as e:
logger.error(e)
- # db.roolback()
- if user_id:
- db.query(UserModel).filter(UserModel.id == user_id).delete()
- db.commit
+ db.rollback()
return False
return sync_flag
@@ -115,7 +109,7 @@
return False
return True
-
+"""
async def update_user_info(db, user_id):
app_register = AppRegisterDao(db).get_apps()
register_dict = {}
@@ -149,6 +143,8 @@
# db.refresh(db_user)
# is_sava = await save_register_user(db, user.username, user.password, user.email, register_dict)
+"""
+
class UserAppDao:
def __init__(self, db: Session):
--
Gitblit v1.8.0