From 7c3e00316339c10ddd317ae0bfc5d61e6912b859 Mon Sep 17 00:00:00 2001 From: xuyonghao <898441624@qq.com> Date: 星期四, 05 十二月 2024 15:16:02 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- main.py | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/main.py b/main.py index 0197ea4..0c77e3c 100644 --- a/main.py +++ b/main.py @@ -1,5 +1,9 @@ from contextlib import asynccontextmanager +# from apscheduler.schedulers.background import BackgroundScheduler from fastapi import FastAPI +from fastapi.middleware.cors import CORSMiddleware +from starlette.staticfiles import StaticFiles + from app.api.auth import router as auth_router from app.api.canvas import canvas_router from app.api.chat import router as chat_router @@ -8,14 +12,18 @@ from app.api.excel import router as excel_router from app.api.files import router as files_router from app.api.knowledge import knowledge_router +from app.api.llm import llm_router from app.api.organization import dept_router +from app.api.public_api import public_api from app.api.report import router as report_router from app.api.resource import menu_router +# from app.api.sync_data import sync_router from app.api.user import user_router from app.api.group import group_router from app.api.role import role_router from app.models.base_model import init_db from app.task.fetch_agent import sync_agents, initialize_agents +from app.task.sync_resources import sync_resource # 浣跨敤 Lifespan 浜嬩欢澶勭悊绋嬪簭 @@ -37,6 +45,19 @@ lifespan=lifespan ) +# 璁剧疆 CORS 涓棿浠� +app.add_middleware( + CORSMiddleware, + allow_origins=["*"], # 鍏佽鎵�鏈夊煙鍚嶈法鍩熻闂� + allow_credentials=True, + allow_methods=["*"], # 鍏佽鎵�鏈夋柟娉� + allow_headers=["*"], # 鍏佽鎵�鏈夊ご閮� +) +# 鍒涘缓璋冨害鍣� +# scheduler = BackgroundScheduler() +# scheduler.add_job(sync_resource, 'interval', minutes=1, id="sync_resource_data") +# scheduler.start() + app.include_router(auth_router, prefix='/api/auth', tags=["auth"]) app.include_router(chat_router, prefix='/api/chat', tags=["chat"]) @@ -50,8 +71,12 @@ app.include_router(dept_router, prefix='/api/dept', tags=["dept"]) app.include_router(menu_router, prefix='/api/menu', tags=["menu"]) app.include_router(knowledge_router, prefix='/api/knowledge', tags=["knowledge"]) +app.include_router(llm_router, prefix='/api/llm', tags=["llm"]) app.include_router(dialog_router, prefix='/api/dialog', tags=["dialog"]) app.include_router(canvas_router, prefix='/api/canvas', tags=["canvas"]) +# app.include_router(sync_router, prefix='/api/sync', tags=["sync"]) +app.include_router(public_api, prefix='/v1/api', tags=["public_api"]) +app.mount("/static", StaticFiles(directory="app/images"), name="static") if __name__ == "__main__": import uvicorn -- Gitblit v1.8.0