fastapi_app.py

@@ -82,6 +82,8 @@ logger = logging.getLogger('app')
 
 
 from routes import chat, files, projects, system, skill_manager, database, memory, bot_manager, knowledge_base, payment, voice
+from routes.mcp_resources import router as mcp_resources_router
+
 from routes.webdav import wsgidav_app
 
 
@@ -256,11 +258,8 @@ 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,8 +269,6 @@ 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）
 
@@ -285,7 +282,6 @@ app.include_router(mcp_resources_router)
 # 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