From 1cfd85f9de2bc1db129e17fe37e10e6eac5f7aa5 Mon Sep 17 00:00:00 2001 From: insistence <3055204202@qq.com> Date: Wed, 8 Jan 2025 15:32:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E5=8D=95=E6=AC=A1=E4=BB=BB=E5=8A=A1=E6=97=B6=E4=BC=9A=E8=A6=86?= =?UTF-8?q?=E7=9B=96=E5=B7=B2=E5=90=AF=E7=94=A8=E4=BB=BB=E5=8A=A1=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20#IBEKD2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-fastapi-backend/config/get_scheduler.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ruoyi-fastapi-backend/config/get_scheduler.py b/ruoyi-fastapi-backend/config/get_scheduler.py index 2c9457b..4473390 100644 --- a/ruoyi-fastapi-backend/config/get_scheduler.py +++ b/ruoyi-fastapi-backend/config/get_scheduler.py @@ -6,7 +6,9 @@ from apscheduler.jobstores.memory import MemoryJobStore from apscheduler.jobstores.redis import RedisJobStore from apscheduler.jobstores.sqlalchemy import SQLAlchemyJobStore from apscheduler.schedulers.asyncio import AsyncIOScheduler +from apscheduler.triggers.combining import OrTrigger from apscheduler.triggers.cron import CronTrigger +from apscheduler.triggers.date import DateTrigger from asyncio import iscoroutinefunction from datetime import datetime, timedelta from sqlalchemy.engine import create_engine @@ -201,8 +203,7 @@ class SchedulerUtil: job_executor = 'default' scheduler.add_job( func=eval(job_info.invoke_target), - trigger='date', - run_date=datetime.now() + timedelta(seconds=1), + trigger=OrTrigger(triggers=[DateTrigger(), MyCronTrigger.from_crontab(job_info.cron_expression)]), args=job_info.job_args.split(',') if job_info.job_args else None, kwargs=json.loads(job_info.job_kwargs) if job_info.job_kwargs else None, id=str(job_info.job_id),