From 74d286ea8e5be898d142f9ebed0d0c72dbdc5900 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期五, 14 二月 2025 16:30:18 +0800
Subject: [PATCH] merge master
---
main.py | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/main.py b/main.py
index b4bbe0a..f4497c8 100644
--- a/main.py
+++ b/main.py
@@ -24,11 +24,12 @@
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.delete_execl_file import delete_file_after_delay
# from app.models.base_model import init_db
from app.task.fetch_agent import sync_agents, initialize_agents, sync_agents_v2, sync_knowledge, \
sync_resources_from_json
from app.init_config.init_run_data import sync_default_data
-from app.task.sync_account_token import sync_token
+from app.task.sync_account_token import sync_token, start_sync_token_task
init_db()
@@ -42,12 +43,10 @@
# sync_agents()
-
- # await sync_default_data()
- #
- # sync_agents_v2()
- # sync_knowledge()
- # sync_resources_from_json()
+ await sync_default_data()
+ sync_agents_v2()
+ sync_knowledge()
+ sync_resources_from_json()
yield
# 鍦ㄥ簲鐢ㄥ叧闂椂鎵ц娓呯悊鎿嶄綔锛堝鏋滈渶瑕侊級
pass
@@ -63,7 +62,7 @@
# 璁剧疆 CORS 涓棿浠�
# app.add_middleware(
# CORSMiddleware,
-# allow_origins=["http://192.168.20.119:9303", "http://192.168.20.119:9301", "http://smartai.com:8293","http://localhost:9303", "http://127.0.0.1:9303","http://localhost:5173","http://192.168.20.158:5173"],
+# allow_origins=["*"],
# allow_credentials=True,
# allow_methods=["*"], # 鍏佽鎵�鏈夋柟娉�
# allow_headers=["*"], # 鍏佽鎵�鏈夊ご閮�
@@ -71,7 +70,8 @@
# 鍒涘缓璋冨害鍣�
scheduler = BackgroundScheduler()
scheduler.add_job(sync_agents_v2, 'interval', minutes=60, id="sync_resource_data")
-scheduler.add_job(sync_token, 'interval', minutes=5, id="sync_token_1")
+scheduler.add_job(start_sync_token_task, 'interval', minutes=5, id="sync_token_1")
+# scheduler.add_job(delete_file_after_delay, 'interval', minutes=10, id="delete_file_after_delay")
scheduler.start()
app.include_router(auth_router, prefix='/api/auth', tags=["auth"])
@@ -91,7 +91,7 @@
app.include_router(canvas_router, prefix='/api/canvas', tags=["canvas"])
app.include_router(label_router, prefix='/api/label', tags=["label"])
app.include_router(public_api, prefix='/v1/api', tags=["public_api"])
-app.include_router(chat_router_v2, prefix='/v1/chat', tags=["chat1"])
+app.include_router(chat_router_v2, prefix='/api/v1/chat', tags=["chat1"])
app.mount("/static", StaticFiles(directory="app/images"), name="static")
if __name__ == "__main__":
--
Gitblit v1.8.0