PowLu/RuoYi-Vue3-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复执行单次任务时会覆盖已启用任务的问题 #IBEKD2

Browse Source
This commit is contained in:
insistence
2025-01-08 15:32:56 +08:00
parent 3e05f1b8b3
commit 1cfd85f9de
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-fastapi-backend/config/get_scheduler.py
View File

@@ -6,7 +6,9 @@ from apscheduler.jobstores.memory import MemoryJobStore
from apscheduler.jobstores.redis import RedisJobStore from apscheduler.jobstores.redis import RedisJobStore
from apscheduler.jobstores.sqlalchemy import SQLAlchemyJobStore from apscheduler.jobstores.sqlalchemy import SQLAlchemyJobStore
from apscheduler.schedulers.asyncio import AsyncIOScheduler from apscheduler.schedulers.asyncio import AsyncIOScheduler
from apscheduler.triggers.combining import OrTrigger
from apscheduler.triggers.cron import CronTrigger from apscheduler.triggers.cron import CronTrigger
from apscheduler.triggers.date import DateTrigger
from asyncio import iscoroutinefunction from asyncio import iscoroutinefunction
from datetime import datetime, timedelta from datetime import datetime, timedelta
from sqlalchemy.engine import create_engine from sqlalchemy.engine import create_engine
@@ -201,8 +203,7 @@ class SchedulerUtil:
job_executor = 'default' job_executor = 'default'
scheduler.add_job( scheduler.add_job(
func=eval(job_info.invoke_target), func=eval(job_info.invoke_target),
trigger='date', trigger=OrTrigger(triggers=[DateTrigger(), MyCronTrigger.from_crontab(job_info.cron_expression)]),
run_date=datetime.now() + timedelta(seconds=1),
args=job_info.job_args.split(',') if job_info.job_args else None, 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, kwargs=json.loads(job_info.job_kwargs) if job_info.job_kwargs else None,
id=str(job_info.job_id), id=str(job_info.job_id),