From 3b169338ee8988d3673b6aac685a2e8ab974a9b7 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Sun, 7 Dec 2025 00:14:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=99=A8=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96=EF=BC=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=97=B6=E4=B8=80=E5=B9=B6=E6=B8=85=E7=90=86=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=EF=BC=8C=E9=81=BF=E5=85=8D=E5=B0=8F?= =?UTF-8?q?=E6=A6=82=E7=8E=87=E6=83=85=E5=86=B5=E4=B8=8B=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A0=86=E7=A7=AF=EF=BC=88ISSUE-3669?= =?UTF-8?q?=EF=BC=89=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/XXL-JOB官方文档.md | 11 +++++++---- pom.xml | 10 +++++----- .../job/admin/web/error/WebErrorPageRegistrar.java | 6 +++--- .../Dockerfile | 13 +++++++++++-- .../xxl-job-executor-sample-springboot-ai/pom.xml | 4 ++-- .../xxl-job-executor-sample-springboot/Dockerfile | 13 +++++++++++-- 6 files changed, 39 insertions(+), 18 deletions(-) diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index 08ecdf63..fb1c8942 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -2697,11 +2697,14 @@ public void execute() { - a、本次升级数据模型向前兼容，v3.2.*版本可直接升级不需要进行数据库表调整； - b、本次升级针对客户端rollinglog依赖字段做规范约束，如不关注该功能 v2.4.* 及后续版本客户端不需要升级/可兼容，否则需要升级客户端版本； -### 7.42 版本 v3.3.1 Release Notes[ING] -- 1、【修复】调度组件事务代码优化，修复DB超时等小概率情况下调度终止问题； -- 2、【修复】合并PR-3869，修复底层通讯超时设置无效问题； -- 3、【新增】新增“执行器启用开关”配置项(xxl.job.executor.enabled)，默认开启，关闭时不进行执行器初始化； +### 7.42 版本 v3.3.1 Release Notes[2025-12-06] +- 1、【新增】新增“执行器启用开关”配置项(xxl.job.executor.enabled)，默认开启，关闭时不进行执行器初始化； +- 2、【修复】调度组件事务代码调整，修复DB超时等小概率情况下调度终止问题； +- 3、【修复】合并PR-3869，修复底层通讯超时设置无效问题； - 4、【优化】执行器删除逻辑优化，删除时一并清理注册表数据，避免小概率情况下注册数据堆积（ISSUE-3669）； +- 5、【升级】调度中心升级至 SpringBoot4；升级多项maven依赖至较新版本，如 mybatis、groovy 等； + +### 7.43 版本 v3.3.2 Release Notes[ING] - 5、【TODO】任务调度触发后分批批量更新，提升调度性能； diff --git a/pom.xml b/pom.xml index cfeb4fdc..4eab301d 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ true 3.14.1 - 3.3.1 + 3.4.0 3.12.0 3.2.8 0.9.0 @@ -38,10 +38,10 @@ 3.0.0 - 3.5.8 - 6.2.14 + 4.0.0 + 7.0.1 - 3.0.5 + 4.0.0 9.5.0 @@ -49,7 +49,7 @@ 2.13.2 - 5.0.2 + 5.0.3 2.2.0 diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/web/error/WebErrorPageRegistrar.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/web/error/WebErrorPageRegistrar.java index a84cbde3..89a42dc6 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/web/error/WebErrorPageRegistrar.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/web/error/WebErrorPageRegistrar.java @@ -1,8 +1,8 @@ package com.xxl.job.admin.web.error; -import org.springframework.boot.web.server.ErrorPage; -import org.springframework.boot.web.server.ErrorPageRegistrar; -import org.springframework.boot.web.server.ErrorPageRegistry; +import org.springframework.boot.web.error.ErrorPage; +import org.springframework.boot.web.error.ErrorPageRegistrar; +import org.springframework.boot.web.error.ErrorPageRegistry; import org.springframework.stereotype.Component; /** diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/Dockerfile b/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/Dockerfile index d67f9f3a..036ad3d0 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/Dockerfile +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/Dockerfile @@ -1,12 +1,21 @@ +# base image FROM openjdk:21-jdk-slim + +# maintainer MAINTAINER xuxueli -ENV LOG_HOME=/data/applogs +# set params ENV PARAMS="" +# set timezone ENV TZ=PRC RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone +# copy jar ADD target/xxl-job-executor-sample-springboot-ai*.jar /app.jar -ENTRYPOINT ["sh","-c","java -DLOG_HOME=$LOG_HOME -jar $JAVA_OPTS /app.jar $PARAMS"] \ No newline at end of file +# command +# log home: -e LOG_HOME=/data/applogs +# jvm options: -e JAVA_OPTS="-Xms128m -Xmx128m" +# app params: -e PARAMS="--server.port=8080" +ENTRYPOINT ["sh","-c","java ${LOG_HOME:+-DLOG_HOME=$LOG_HOME} -jar $JAVA_OPTS /app.jar $PARAMS"] \ No newline at end of file diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/pom.xml index 4b83adee..dc173099 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/pom.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/pom.xml @@ -16,8 +16,8 @@ https://www.xuxueli.com/ - 1.1.0 - 1.2.2 + 1.1.1 + 1.2.3 diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/Dockerfile b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/Dockerfile index 175a8cc7..fc37c354 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/Dockerfile +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/Dockerfile @@ -1,12 +1,21 @@ +# base image FROM openjdk:21-jdk-slim + +# maintainer MAINTAINER xuxueli -ENV LOG_HOME=/data/applogs +# set params ENV PARAMS="" +# set timezone ENV TZ=PRC RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone +# copy jar ADD target/xxl-job-executor-sample-springboot-*.jar /app.jar -ENTRYPOINT ["sh","-c","java -DLOG_HOME=$LOG_HOME -jar $JAVA_OPTS /app.jar $PARAMS"] \ No newline at end of file +# command +# log home: -e LOG_HOME=/data/applogs +# jvm options: -e JAVA_OPTS="-Xms128m -Xmx128m" +# app params: -e PARAMS="--server.port=8080" +ENTRYPOINT ["sh","-c","java ${LOG_HOME:+-DLOG_HOME=$LOG_HOME} -jar $JAVA_OPTS /app.jar $PARAMS"] \ No newline at end of file