From 1789cb5a9b26c310e4f7f625360cacb1bbabd437 Mon Sep 17 00:00:00 2001 From: insistence <3055204202@qq.com> Date: Sat, 15 Mar 2025 21:59:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E6=9A=82=E5=81=9C=E6=97=B6?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=8D=95=E6=AC=A1=E4=BB=BB=E5=8A=A1=E4=BC=9A?= =?UTF-8?q?=E8=A7=A6=E5=8F=91cron=E8=A1=A8=E8=BE=BE=E5=BC=8F=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20#31?= 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, 4 insertions(+), 1 deletion(-) diff --git a/ruoyi-fastapi-backend/config/get_scheduler.py b/ruoyi-fastapi-backend/config/get_scheduler.py index 4473390..4b0c298 100644 --- a/ruoyi-fastapi-backend/config/get_scheduler.py +++ b/ruoyi-fastapi-backend/config/get_scheduler.py @@ -201,9 +201,12 @@ class SchedulerUtil: job_executor = job_info.job_executor if iscoroutinefunction(job_func): job_executor = 'default' + job_trigger = DateTrigger() + if job_info.status == '0': + job_trigger = OrTrigger(triggers=[DateTrigger(), MyCronTrigger.from_crontab(job_info.cron_expression)]) scheduler.add_job( func=eval(job_info.invoke_target), - trigger=OrTrigger(triggers=[DateTrigger(), MyCronTrigger.from_crontab(job_info.cron_expression)]), + trigger=job_trigger, 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),