From 3a49fedde353b39f2efccb84ab7ce7fbf977b161 Mon Sep 17 00:00:00 2001 From: zhangyl Date: Wed, 3 Dec 2025 18:08:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BA=95=E5=B1=82?= =?UTF-8?q?=E9=80=9A=E8=AE=AF=E8=B6=85=E6=97=B6=E8=AE=BE=E7=BD=AE=E6=97=A0?= =?UTF-8?q?=E6=95=88=E7=9A=84=20Bug=20=E5=B9=B6=E7=A7=BB=E9=99=A4=E5=86=97?= =?UTF-8?q?=E4=BD=99=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 修复 XxlJobExecutor 中 initAdminBizList 方法使用未校验的 timeout 参数导致超时设置无效的问题,改为使用成员变量 this.timeout。 2. 重构 initAdminBizList 方法签名,移除冗余的 timeout 参数。 close #3865 --- .../main/java/com/xxl/job/core/executor/XxlJobExecutor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java b/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java index 3b934811..e3ed7716 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java @@ -76,7 +76,7 @@ public class XxlJobExecutor { XxlJobFileAppender.initLogPath(logPath); // init invoker, admin-client - initAdminBizList(adminAddresses, accessToken, timeout); + initAdminBizList(adminAddresses, accessToken); // init JobLogFileCleanThread @@ -122,7 +122,7 @@ public class XxlJobExecutor { // ---------------------- admin-client (rpc invoker) ---------------------- private static List adminBizList; - private void initAdminBizList(String adminAddresses, String accessToken, int timeout) throws Exception { + private void initAdminBizList(String adminAddresses, String accessToken) throws Exception { if (StringTool.isNotBlank(adminAddresses)) { for (String address: adminAddresses.trim().split(",")) { if (StringTool.isNotBlank(address)) { @@ -137,7 +137,7 @@ public class XxlJobExecutor { // build AdminBiz adminBiz = HttpTool.createClient() .url(finalAddress) - .timeout(timeout * 1000) + .timeout(this.timeout * 1000) .header(Const.XXL_JOB_ACCESS_TOKEN, accessToken) .proxy(AdminBiz.class);