From cf16aff2a9939ab7fe25ebf0d5dee40326a84f67 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Fri, 19 Jun 2026 16:51:26 +0800 Subject: [PATCH] =?UTF-8?q?PowerShell=E7=B1=BB=E5=9E=8BGLUE=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E5=8D=87=E7=BA=A7=E4=BD=BF=E7=94=A8=20PowerS?= =?UTF-8?q?hell7=EF=BC=88pwsh=E5=91=BD=E4=BB=A4=EF=BC=89=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E5=8D=87=E6=80=A7=E8=83=BD=E3=80=81=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E5=85=BC=E5=AE=B9=E6=80=A7=E4=BB=A5=E5=8F=8A=E8=B7=A8?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E9=80=82=E9=85=8D=E6=80=A7=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit （注意：对应执行器需要安装PowerShell 7.0以上版本，从而支持 pwsh 命令） --- doc/XXL-JOB官方文档.md | 6 ++++-- .../java/com/xxl/job/core/glue/GlueTypeEnum.java | 2 +- .../main/java/com/xxl/job/core/util/ScriptUtil.java | 13 ------------- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index ac468fba..5e8b29c9 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -2856,8 +2856,10 @@ alter table xxl_job_log - 10、【优化】调度中心UI交互优化，任务及日志列表下拉框支持模糊搜索，提升多任务情况下交互体验； ### 7.46 版本 v3.4.2 Release Notes[ING] -- 1、【修复】调度日志列表日期处理逻辑修复，兼容执行信息为空阻塞列表加载问题； -- 2、【安全】任务RollingLog权限校验完善，防止越权查看任务日志； +- 1、【升级】PowerShell类型GLUE任务，升级使用 PowerShell7（pwsh命令）执行，提升性能、编码兼容性以及跨平台适配性； +（注意：对应执行器需要安装PowerShell 7.0以上版本，从而支持 pwsh 命令） +- 2、【修复】调度日志列表日期处理逻辑修复，兼容执行信息为空阻塞列表加载问题； +- 3、【安全】任务RollingLog权限校验完善，防止越权查看任务日志； ### 7.47 版本 v3.5.0 Release Notes[ING] diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/glue/GlueTypeEnum.java b/xxl-job-core/src/main/java/com/xxl/job/core/glue/GlueTypeEnum.java index 09875583..d36a942e 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/glue/GlueTypeEnum.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/glue/GlueTypeEnum.java @@ -11,7 +11,7 @@ public enum GlueTypeEnum { GLUE_PYTHON("GLUE(Python3)", true, "python3", ".py"), GLUE_PYTHON2("GLUE(Python2)", true, "python", ".py"), GLUE_NODEJS("GLUE(Nodejs)", true, "node", ".js"), - GLUE_POWERSHELL("GLUE(PowerShell)", true, "powershell", ".ps1"), + GLUE_POWERSHELL("GLUE(PowerShell)", true, "pwsh", ".ps1"), GLUE_PHP("GLUE(PHP)", true, "php", ".php"); private String desc; 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 12b7582d..fb25ba4e 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 @@ -30,19 +30,6 @@ public class ScriptUtil { public static void markScriptFile(String scriptFileName, String scriptContent) throws IOException { // make file: filePath/gluesource/666-123456789.py FileTool.writeString(scriptFileName, scriptContent); - - /*FileOutputStream fileOutputStream = null; - try { - fileOutputStream = new FileOutputStream(scriptFileName); - fileOutputStream.write(scriptContent.getBytes("UTF-8")); - fileOutputStream.close(); - } catch (Exception e) { - throw e; - }finally{ - if(fileOutputStream != null){ - fileOutputStream.close(); - } - }*/ } /**