Skip to content

Commit 2f233dc

Browse files
committed
fix: 修复执行单次任务时会覆盖已启用任务的问题
1 parent ff08931 commit 2f233dc

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

‎dash-fastapi-backend/config/get_scheduler.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
from apscheduler.jobstores.redis import RedisJobStore
77
from apscheduler.jobstores.sqlalchemy import SQLAlchemyJobStore
88
from apscheduler.schedulers.asyncio import AsyncIOScheduler
9+
from apscheduler.triggers.combining import OrTrigger
910
from apscheduler.triggers.cron import CronTrigger
11+
from apscheduler.triggers.date import DateTrigger
1012
from asyncio import iscoroutinefunction
1113
from datetime import datetime, timedelta
1214
from sqlalchemy.engine import create_engine
@@ -201,8 +203,7 @@ def execute_scheduler_job_once(cls, job_info: JobModel):
201203
job_executor = 'default'
202204
scheduler.add_job(
203205
func=eval(job_info.invoke_target),
204-
trigger='date',
205-
run_date=datetime.now() + timedelta(seconds=1),
206+
trigger=OrTrigger(triggers=[DateTrigger(), MyCronTrigger.from_crontab(job_info.cron_expression)]),
206207
args=job_info.job_args.split(',') if job_info.job_args else None,
207208
kwargs=json.loads(job_info.job_kwargs) if job_info.job_kwargs else None,
208209
id=str(job_info.job_id),

0 commit comments

Comments
 (0)