From ed2c4fe7b5595e24ff34d92b5900e1b6b8c817fd Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Sun, 1 Dec 2024 01:11:06 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E8=B0=83?= =?UTF-8?q?=E5=BA=A6=E7=BA=BF=E7=A8=8B=E4=BB=BB=E5=8A=A1=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E9=81=BF=E5=85=8D=E6=9E=81=E7=AB=AF=E6=83=85=E5=86=B5=E4=B8=8B?= =?UTF-8?q?=E5=B7=B2=E5=85=B3=E9=97=AD=E4=BB=BB=E5=8A=A1=E8=A2=AB=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/XXL-JOB官方文档.md | 9 +++++---- .../java/com/xxl/job/admin/dao/XxlJobInfoDao.java | 13 +++++++++++++ .../resources/mybatis-mapper/XxlJobInfoMapper.xml | 1 + 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index fe6085de..8056dede 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -2401,11 +2401,12 @@ public void execute() { ### 7.36 版本 v2.5.0 Release Notes[规划中] -- 1、【优化】框架底层守护线程异常处理逻辑优化，避免极端情况下因Error导致调度终止、丢失问题。 +- 1、【优化】框架基础守护线程异常处理逻辑优化，避免极端情况下因Error导致调度终止问题； - 2、【优化】部分系统日志优化，提升可读性； -- 3、[规划中]升级springboot3.x，解决2.x老版本漏洞类问题。注意，springboot3.x依赖jdk17。 -- 4、[规划中]安全功能增强，通讯加密参数改用加密数据避免AccessToken明文， 降低token泄漏风险。 -- 5、[规划中]登陆态Token声称逻辑优化，混淆登陆时间属性，降低token泄漏风险。 +- 3、【优化】调度线程任务信息更新逻辑优化，避免极端情况下已关闭任务被启动问题； +- 4、[规划中]升级springboot3.x，解决2.x老版本漏洞类问题。注意，springboot3.x依赖jdk17； +- 5、[规划中]安全功能增强，通讯加密参数改用加密数据避免AccessToken明文， 降低token泄漏风险； +- 6、[规划中]登陆态Token声称逻辑优化，混淆登陆时间属性，降低token泄漏风险； ### TODO LIST - 1、调度隔离：调度中心针对不同执行器，各自维护不同的调度和远程触发组件。 diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java index d640efff..9340cae6 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java @@ -41,8 +41,21 @@ public interface XxlJobInfoDao { public int findAllCount(); + /** + * find schedule job, limit "trigger_status = 1" + * + * @param maxNextTime + * @param pagesize + * @return + */ public List scheduleJobQuery(@Param("maxNextTime") long maxNextTime, @Param("pagesize") int pagesize ); + /** + * update schedule job, limit "trigger_status = 1"（avoid stopping tasks from being opened） + * + * @param xxlJobInfo + * @return + */ public int scheduleUpdate(XxlJobInfo xxlJobInfo); diff --git a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml index 7b3c3a3e..a545d2f9 100644 --- a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml +++ b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml @@ -235,6 +235,7 @@ trigger_next_time = #{triggerNextTime}, trigger_status = #{triggerStatus} WHERE id = #{id} + AND trigger_status = 1 \ No newline at end of file