From 201fe073738fd39de516dce6e46e0d4e47e1a04c Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Sun, 26 Oct 2025 04:48:05 +0800
Subject: [PATCH] =?UTF-8?q?chore(deps):=20=E6=9B=B4=E6=96=B0=20xxl-tool=20?=
=?UTF-8?q?=E7=89=88=E6=9C=AC=E5=B9=B6=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?=E4=BE=9D=E8=B5=96-=20=E5=B0=86=20xxl-tool=20=E7=89=88=E6=9C=AC?=
=?UTF-8?q?=E4=BB=8E2.3.0=20=E5=8D=87=E7=BA=A7=E8=87=B3=202.3.1=20-=20?=
=?UTF-8?q?=E6=9B=BF=E6=8D=A2=E8=87=AA=E5=AE=9A=E4=B9=89=20copy=20?=
=?UTF-8?q?=E6=96=B9=E6=B3=95=E4=B8=BA=20IOTool.copy=20=E6=8F=90=E9=AB=98?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=8D=E7=94=A8=E6=80=A7=20-=20=E7=A7=BB?=
=?UTF-8?q?=E9=99=A4=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84=20AssertTool?=
=?UTF-8?q?=E4=BE=9D=E8=B5=96=20-=20=E4=BD=BF=E7=94=A8=20StringTool.isBlan?=
=?UTF-8?q?k=20=E6=9B=BF=E4=BB=A3=E6=89=8B=E5=8A=A8=E7=A9=BA=E5=80=BC?=
=?UTF-8?q?=E5=88=A4=E6=96=AD-=20=E4=BC=98=E5=8C=96=20IP=20=E5=9C=B0?=
=?UTF-8?q?=E5=9D=80=E6=8B=BC=E6=8E=A5=E9=80=BB=E8=BE=91=EF=BC=8C=E6=8F=90?=
=?UTF-8?q?=E5=8D=87=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 2 +-
.../xxl/job/core/executor/XxlJobExecutor.java | 4 +-
.../com/xxl/job/core/util/ScriptUtil.java | 47 +++----------------
3 files changed, 9 insertions(+), 44 deletions(-)
diff --git a/pom.xml b/pom.xml
index 342b07db..8a27b33f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
2.1.1
- 2.3.0
+ 2.3.1
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 c0cc5686..75a441ca 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
@@ -153,12 +153,12 @@ public class XxlJobExecutor {
// generate address
if (StringTool.isBlank(address)) {
// registry-address：default use address to registry , otherwise use ip:port if address is null
- String ip_port_address = IPTool.toAddressString(IPTool.toAddress(ip, port));
+ String ip_port_address = IPTool.toAddressString(ip, port);
address = "http://{ip_port}/".replace("{ip_port}", ip_port_address);
}
// accessToken
- if (accessToken==null || accessToken.trim().length()==0) {
+ if (StringTool.isBlank(accessToken)) {
logger.warn(">>>>>>>>>>> xxl-job accessToken is empty. To ensure system security, please set the accessToken.");
}
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/util/ScriptUtil.java b/xxl-job-core/src/main/java/com/xxl/job/core/util/ScriptUtil.java
index 51fa41f5..12b7582d 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/util/ScriptUtil.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/util/ScriptUtil.java
@@ -2,10 +2,11 @@ package com.xxl.job.core.util;
import com.xxl.job.core.context.XxlJobHelper;
import com.xxl.tool.core.ArrayTool;
-import com.xxl.tool.core.AssertTool;
import com.xxl.tool.io.FileTool;
+import com.xxl.tool.io.IOTool;
-import java.io.*;
+import java.io.FileOutputStream;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -83,15 +84,15 @@ public class ScriptUtil {
final FileOutputStream finalFileOutputStream = fileOutputStream;
inputThread = new Thread(() -> {
try {
- copy(finalProcess.getInputStream(), finalFileOutputStream, true, false);
+ // 数据流Copy（Input自动关闭，Output不处理）
+ IOTool.copy(finalProcess.getInputStream(), finalFileOutputStream, true, false);
} catch (IOException e) {
XxlJobHelper.log(e);
}
});
errorThread = new Thread(() -> {
try {
- // 数据流Copy（Input自动关闭，Output不处理）
- copy(finalProcess.getErrorStream(), finalFileOutputStream, true, false);
+ IOTool.copy(finalProcess.getErrorStream(), finalFileOutputStream, true, false);
} catch (IOException e) {
XxlJobHelper.log(e);
}
@@ -134,42 +135,6 @@ public class ScriptUtil {
}
}
-
- private static final int BUFFER_SIZE = 1024 * 8;
- private static int copy(InputStream input, OutputStream output, boolean closeInput, boolean closeOutput) throws IOException {
- AssertTool.notNull(input, "No InputStream specified");
- AssertTool.notNull(output, "No OutputStream specified");
-
- try {
- int byteCount = 0;
- byte[] buffer = new byte[BUFFER_SIZE];
- int bytesRead;
- while ((bytesRead = input.read(buffer)) != -1) {
- output.write(buffer, 0, bytesRead);
- byteCount += bytesRead;
- }
- output.flush();
- return byteCount;
- } finally {
- if (closeInput) {
- close(input);
- }
- if (closeOutput) {
- close(output);
- }
- }
- }
- private static void close(Closeable closeable) {
- if (closeable == null) {
- return;
- }
- try {
- closeable.close();
- } catch (IOException ex) {
- // ignore
- }
- }
-
/**
* 脚本执行，日志文件实时输出
*