浏览代码

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/api/excel.py
zhangxiao 1 年之前
父节点
当前提交
fa7bbd77cc
共有 2 个文件被更改,包括 6 次插入7 次删除
  1. 3 4
      app/api/excel.py
  2. 3 3
      app/models/token_model.py

+ 3 - 4
app/api/excel.py

@@ -56,15 +56,14 @@ async def upload_file(files: list[UploadFile] = File(...)):
         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")

+ 3 - 3
app/models/token_model.py

@@ -11,9 +11,9 @@ class TokenModel(Base):
     __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)