From fa7bbd77cc161a3c91742adc910d8c5ccc8e3459 Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期三, 23 十月 2024 21:14:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/api/excel.py | 7 +++----
app/models/token_model.py | 6 +++---
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/app/api/excel.py b/app/api/excel.py
index b84e3c1..ef46fe3 100644
--- a/app/api/excel.py
+++ b/app/api/excel.py
@@ -56,15 +56,14 @@
if file.filename == '':
return JSONResponse(content={"error": "娌℃湁閫夋嫨鏂囦欢"}, status_code=400)
if file and allowed_file(file.filename):
- filename = file.filename
- save_path = os.path.join(SOURCE_FILES_PATH, filename)
+ save_path = os.path.join(SOURCE_FILES_PATH, file.filename)
with open(save_path, 'wb') as buffer:
shutil.copyfileobj(file.file, buffer)
save_path_list.append(save_path)
else:
return JSONResponse(content={"error": "涓嶅厑璁哥殑鏂囦欢绫诲瀷"}, status_code=400)
- return JSONResponse(content={"code": 200, "msg": "鏂囦欢涓婁紶鎴愬姛", "data": {"file_paths": save_path_list}},
- status_code=200)
+ return JSONResponse(content={"code": 200, "msg": "", "data": {}}, status_code=200)
+
# ws://localhost:9201/api/document/ws/excel
@router.websocket("/ws/excel")
diff --git a/app/models/token_model.py b/app/models/token_model.py
index 764d999..066c73e 100644
--- a/app/models/token_model.py
+++ b/app/models/token_model.py
@@ -11,9 +11,9 @@
__tablename__ = "token"
id = Column(Integer, primary_key=True, index=True)
user_id = Column(Integer, index=True)
- token = Column(Text(10000), unique=True, index=True)
- bisheng_token = Column(Text(10000), unique=True, index=True)
- ragflow_token = Column(Text(10000), unique=True, index=True)
+ token = Column(Text(10000))
+ bisheng_token = Column(Text(10000))
+ ragflow_token = Column(Text(10000))
created_at = Column(DateTime, default=datetime.utcnow)
--
Gitblit v1.8.0