From af6a33910503338c189f98e421bab7ecb2f560e7 Mon Sep 17 00:00:00 2001 From: Ben Date: Tue, 11 Nov 2025 10:11:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8F=98=E9=87=8F=20LOG=5FHOME=20=E6=8C=87=E5=AE=9A=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xxl-job-admin/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xxl-job-admin/Dockerfile b/xxl-job-admin/Dockerfile index fb6d81ba..8596a1f3 100644 --- a/xxl-job-admin/Dockerfile +++ b/xxl-job-admin/Dockerfile @@ -3,6 +3,7 @@ FROM openjdk:21-jdk-slim MAINTAINER xuxueli +ENV LOG_HOME=/data/applogs ENV PARAMS="" ENV TZ=PRC @@ -10,4 +11,4 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone ADD target/xxl-job-admin-*.jar /app.jar -ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /app.jar $PARAMS"] \ No newline at end of file +ENTRYPOINT ["sh","-c","java -DLOG_HOME=$LOG_HOME -jar $JAVA_OPTS /app.jar $PARAMS"] \ No newline at end of file From 0e584f89b972b21339e0a1e2cc03728bde6111d0 Mon Sep 17 00:00:00 2001 From: Ben Date: Tue, 11 Nov 2025 10:54:28 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BD=BF=E7=94=A8=20openjdk21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xxl-job-executor-sample-springboot/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8648d945..801b9eb8 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/Dockerfile +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:8-jre-slim +FROM openjdk:21-jdk-slim MAINTAINER xuxueli ENV PARAMS="" From a78dd26bb0cb7c0de94d6e71a2734b2a5c58e3d8 Mon Sep 17 00:00:00 2001 From: Ben Date: Tue, 11 Nov 2025 10:55:22 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8F=98=E9=87=8F=20LOG=5FHOME=20=E6=8C=87=E5=AE=9A=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xxl-job-executor-sample-springboot/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 801b9eb8..175a8cc7 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/Dockerfile +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/Dockerfile @@ -1,6 +1,7 @@ FROM openjdk:21-jdk-slim MAINTAINER xuxueli +ENV LOG_HOME=/data/applogs ENV PARAMS="" ENV TZ=PRC @@ -8,4 +9,4 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone ADD target/xxl-job-executor-sample-springboot-*.jar /app.jar -ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /app.jar $PARAMS"] \ No newline at end of file +ENTRYPOINT ["sh","-c","java -DLOG_HOME=$LOG_HOME -jar $JAVA_OPTS /app.jar $PARAMS"] \ No newline at end of file From b99c49d6016e735d77eae66da6598db38b3f078a Mon Sep 17 00:00:00 2001 From: Ben Date: Tue, 11 Nov 2025 10:59:00 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20Dockerfile=20=E7=94=A8?= =?UTF-8?q?=E4=BA=8E=E6=89=93=E5=8C=85=20docker=20=E9=95=9C=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xxl-job-executor-sample-springboot-ai/Dockerfile | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/Dockerfile 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 new file mode 100644 index 00000000..d67f9f3a --- /dev/null +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/Dockerfile @@ -0,0 +1,12 @@ +FROM openjdk:21-jdk-slim +MAINTAINER xuxueli + +ENV LOG_HOME=/data/applogs +ENV PARAMS="" + +ENV TZ=PRC +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + +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 From e5a84a1bbe36044c786bb6ea74c4228cb7d651d8 Mon Sep 17 00:00:00 2001 From: Ben Date: Tue, 11 Nov 2025 11:01:26 +0800 Subject: [PATCH 5/5] =?UTF-8?q?bugfix:=20xxl=5Fjob=5Finfo.id=20=E4=B8=BA?= =?UTF-8?q?=20bigint=20=E5=9E=8B=EF=BC=8C=E8=80=8C=20controller=20?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=B8=AD=E4=B8=BA=20int=20=E5=9E=8B=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=95=BF=E6=95=B4=E5=9E=8B=E6=BA=A2=E5=87=BA?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E7=9C=8B=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xxl/job/admin/controller/biz/JobLogController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java index 43ed6cf8..590dac94 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java @@ -141,7 +141,7 @@ public class JobLogController { } @RequestMapping("/logDetailPage") - public String logDetailPage(HttpServletRequest request, @RequestParam("id") int id, Model model){ + public String logDetailPage(HttpServletRequest request, @RequestParam("id") long id, Model model){ // base check XxlJobLog jobLog = xxlJobLogMapper.load(id); @@ -227,7 +227,7 @@ public class JobLogController { @RequestMapping("/logKill") @ResponseBody - public Response logKill(HttpServletRequest request, @RequestParam("id") int id){ + public Response logKill(HttpServletRequest request, @RequestParam("id") long id){ // base check XxlJobLog log = xxlJobLogMapper.load(id); XxlJobInfo jobInfo = xxlJobInfoMapper.loadById(log.getJobId());