From f6e8f569ed818f27c64233e8fc29adef0d7e48b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E6=BD=AE?= Date: Wed, 20 May 2026 19:51:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96rescourse=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fastapi_app.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/fastapi_app.py b/fastapi_app.py index c39c370..728af3c 100644 --- a/fastapi_app.py +++ b/fastapi_app.py @@ -256,11 +256,7 @@ app.include_router(bot_manager.router) app.include_router(payment.router) app.include_router(memory.router) -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> 319bd8cd59268f2b16dce2dfa14820cb34c4c8b8 # 注册语音对话路由 app.include_router(voice.router) @@ -270,22 +266,12 @@ app.include_router(file_manager_router) # 注册知识库API路由 app.include_router(knowledge_base.router, prefix="/api/v1/knowledge-base", tags=["knowledge-base"]) -<<<<<<< HEAD -======= # 挂载 WsgiDAV（WSGI 应用通过 WSGIMiddleware 集成到 ASGI） -# MCP App resources endpoint -app.include_router(mcp_resources_router) -======= - -# 挂载 WsgiDAV（WSGI 应用通过 WSGIMiddleware 集成到 ASGI） - ->>>>>>> feature/mcp-ui # Register the file management API routes app.include_router(file_manager_router) ->>>>>>> 319bd8cd59268f2b16dce2dfa14820cb34c4c8b8 # Mount WsgiDAV (the WSGI app is integrated into ASGI via WSGIMiddleware) from starlette.middleware.wsgi import WSGIMiddleware