From 74d286ea8e5be898d142f9ebed0d0c72dbdc5900 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期五, 14 二月 2025 16:30:18 +0800
Subject: [PATCH] merge master
---
app/service/ragflow.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/service/ragflow.py b/app/service/ragflow.py
index f10902f..f0e6fd8 100644
--- a/app/service/ragflow.py
+++ b/app/service/ragflow.py
@@ -48,13 +48,13 @@
raise Exception(f"Ragflow registration failed: {response.text}")
return self._handle_response(response)
- async def login(self, username: str, password: str) -> str:
+ async def login(self, username: str, password: str, email="") -> str:
password = RagflowCrypto(settings.PUBLIC_KEY, settings.PRIVATE_KEY).encrypt(password)
async with httpx.AsyncClient() as client:
response = await client.post(
f"{self.base_url}/v1/user/login",
headers={'Content-Type': 'application/json'},
- json={"email": f"{username}@example.com", "password": password}
+ json={"email": username if "@" in username else f"{username}@example.com", "password": password}
)
if response.status_code != 200:
raise Exception(f"Ragflow login failed: {response.text}")
--
Gitblit v1.8.0