From 9be4808a8d7038e9af6de826f573c66ca38194db Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期三, 22 一月 2025 11:31:16 +0800
Subject: [PATCH] 报表合并webSocket信息格式修改

---
 app/api/auth.py |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/api/auth.py b/app/api/auth.py
index d95e473..c028ad1 100644
--- a/app/api/auth.py
+++ b/app/api/auth.py
@@ -7,6 +7,7 @@
 
 from Log import logger
 from app.api import Response, pwd_context, get_current_user
+from app.api.user import reset_user_pwd
 from app.config.config import settings
 from app.config.const import RAGFLOW, BISHENG, DIFY
 from app.models.app_token_model import AppToken
@@ -16,7 +17,7 @@
 from app.models.user import UserCreate, LoginData
 from app.models.user_model import UserModel, UserAppModel
 from app.service.auth import authenticate_user, create_access_token, is_valid_password, save_register_user, \
-    update_user_token, UserAppDao, update_user_info
+    update_user_token, UserAppDao, update_user_info, password_rsa
 from app.service.bisheng import BishengService
 from app.service.service_token import get_new_token, get_token, update_user_group
 from app.service.v2.app_register import AppRegisterDao
@@ -106,7 +107,8 @@
 
 @router.post("/v2/login", response_model=Response)
 async def login_v2(login_data: LoginData, db: Session = Depends(get_db), pdb: AsyncSession = Depends(get_pdb)):
-    user = authenticate_user(db, login_data.username, login_data.password)
+    password = await password_rsa(login_data.password)
+    user = authenticate_user(db, login_data.username, password)
     if not user:
         return Response(code=400, msg="Incorrect username or password")
     app_register = AppRegisterDao(db).get_apps()
@@ -168,7 +170,8 @@
 
 @router.post("/v2/register", response_model=Response)
 async def register_v2(user: UserCreate, db=Depends(get_db)):
-    if not is_valid_password(user.password):
+    password = await password_rsa(user.password)
+    if not is_valid_password(password):
         return Response(code=400, msg="The password must be at least 8 and contain both numbers and letters")
     db_user = db.query(UserModel).filter(UserModel.username == user.username).first()
     if db_user:
@@ -199,7 +202,7 @@
             register_dict[app['id']] = {"id":register_info.get("id"), "name": name, "email": register_info.get("email")}
         except Exception as e:
             return Response(code=500, msg=f"Failed to register with {app['id']}: {str(e)}")
-    user_id = await save_register_user(db, user.username, user.password, user.email, app_password, register_dict)
+    user_id = await save_register_user(db, user.username, password, user.email, app_password, register_dict)
     if not user_id:
         return Response(code=500, msg=f"Failed to register with app")
     return Response(code=200, msg="User registered successfully",data={"userFlag": user_id})

--
Gitblit v1.8.0