From 3011836e9722394b80a182f7e052a38d7950372a Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Tue, 30 Sep 2025 21:56:31 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E5=90=88?= =?UTF-8?q?=E5=B9=B6PR-2369=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=82=E6=95=B0=E5=8F=96=E5=80=BC=E9=97=AE?= =?UTF-8?q?=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 | 3 ++- .../com/xxl/job/core/handler/impl/ScriptJobHandler.java | 7 ++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index 8f5b448b..7a0da63b 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -2573,7 +2573,8 @@ public void execute() { ### 7.41 版本 v3.2.1 Release Notes[规划中] - 1、【升级】升级多项maven依赖至较新版本,如 netty、groovy、spring、spring-ai、dify 等; -- 2、【ING】底层组件移除单例写法,汇总factory统一管理; +- 2、【修复】合并PR-2369,修复脚本任务参数取值问题; +- 3、【ING】底层组件移除单例写法,汇总factory统一管理; ### TODO LIST diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/ScriptJobHandler.java b/xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/ScriptJobHandler.java index 10b74cf1..6ad3b7c3 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/ScriptJobHandler.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/ScriptJobHandler.java @@ -71,12 +71,9 @@ public class ScriptJobHandler extends IJobHandler { String logFileName = XxlJobContext.getXxlJobContext().getJobLogFileName(); // script params:0=param、1=分片序号、2=分片总数 + String jobParam = XxlJobHelper.getJobParam(); String[] scriptParams = new String[3]; - // 防止 XxlJobHelper.getJobParam() 为null,造成NPE - if (XxlJobHelper.getJobParam() == null) { - scriptParams[0] = ""; - } - scriptParams[0] = XxlJobHelper.getJobParam(); + scriptParams[0] = jobParam!=null?jobParam:""; scriptParams[1] = String.valueOf(XxlJobContext.getXxlJobContext().getShardIndex()); scriptParams[2] = String.valueOf(XxlJobContext.getXxlJobContext().getShardTotal());