Merge remote-tracking branch 'origin/master'

zhangxiao

2024-10-23 fa7bbd77cc161a3c91742adc910d8c5ccc8e3459

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/api/excel.py

 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")

 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)