From 4218bce0239f4f1a3a49d7934fbd856c72ed4458 Mon Sep 17 00:00:00 2001 From: wodeyangzipingpingwuqi Date: Tue, 29 Oct 2024 14:21:03 +0800 Subject: [PATCH 1/8] =?UTF-8?q?feat(1.1.2.0-beta3):=201=E3=80=81=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E3=80=81=E9=87=8D=E8=AF=95=E4=BB=BB=E5=8A=A1=E6=B8=85?= =?UTF-8?q?=E9=99=A4=E6=97=B6=E9=97=B4=E4=B8=80=E5=B0=8F=E6=97=B6=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=9B=9B=E5=B0=8F=E6=97=B6=202=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=97=A5=E5=BF=97=E6=B8=85=E9=99=A4BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../support/schedule/JobClearLogSchedule.java | 16 +++++++--------- .../task/support/schedule/ClearLogSchedule.java | 13 +++++++------ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobClearLogSchedule.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobClearLogSchedule.java index 0bfe28e7..f2985f60 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobClearLogSchedule.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobClearLogSchedule.java @@ -20,8 +20,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Lists; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallbackWithoutResult; @@ -58,7 +56,7 @@ public class JobClearLogSchedule extends AbstractSchedule implements Lifecycle { @Override public String lockAtMost() { - return "PT1H"; + return "PT4H"; } @Override @@ -69,8 +67,9 @@ public class JobClearLogSchedule extends AbstractSchedule implements Lifecycle { @Override protected void doExecute() { try { - // 清楚日志默认保存天数大于零、最少保留最近一天的日志数据 - if (systemProperties.getLogStorage() <= 0 || System.currentTimeMillis() - lastCleanLogTime < 24 * 60 * 60 * 1000) { + // 清除日志默认保存天数大于零、最少保留最近一天的日志数据 + if (systemProperties.getLogStorage() <= 1 && System.currentTimeMillis() - lastCleanLogTime < 24 * 60 * 60 * 1000) { + SnailJobLog.LOCAL.error("job clear log storage error", systemProperties.getLogStorage()); return; } // clean job log @@ -80,11 +79,10 @@ public class JobClearLogSchedule extends AbstractSchedule implements Lifecycle { this::processJobLogPartitionTasks, 0); SnailJobLog.LOCAL.debug("Job clear success total:[{}]", total); - } catch (Exception e) { - SnailJobLog.LOCAL.error("job clear log error", e); - } finally { // update clean time lastCleanLogTime = System.currentTimeMillis(); + } catch (Exception e) { + SnailJobLog.LOCAL.error("job clear log error", e); } } @@ -146,7 +144,7 @@ public class JobClearLogSchedule extends AbstractSchedule implements Lifecycle { @Override public void start() { - taskScheduler.scheduleAtFixedRate(this::execute, Duration.parse("PT1H")); + taskScheduler.scheduleAtFixedRate(this::execute, Duration.parse("PT4H")); } @Override diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/ClearLogSchedule.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/ClearLogSchedule.java index f1b76992..f97fb58d 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/ClearLogSchedule.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/ClearLogSchedule.java @@ -56,7 +56,7 @@ public class ClearLogSchedule extends AbstractSchedule implements Lifecycle { @Override public String lockAtMost() { - return "PT1H"; + return "PT4H"; } @Override @@ -67,7 +67,9 @@ public class ClearLogSchedule extends AbstractSchedule implements Lifecycle { @Override protected void doExecute() { try { - if (systemProperties.getLogStorage() <= 0 || System.currentTimeMillis() - lastCleanLogTime < 24 * 60 * 60 * 1000) { + // 清除日志默认保存天数大于零、最少保留最近一天的日志数据 + if (systemProperties.getLogStorage() <= 1 && System.currentTimeMillis() - lastCleanLogTime < 24 * 60 * 60 * 1000) { + SnailJobLog.LOCAL.error("retry clear log storage error", systemProperties.getLogStorage()); return; } // clean retry log @@ -76,11 +78,10 @@ public class ClearLogSchedule extends AbstractSchedule implements Lifecycle { this::processRetryLogPartitionTasks, 0); SnailJobLog.LOCAL.debug("Retry clear success total:[{}]", total); - } catch (Exception e) { - SnailJobLog.LOCAL.error("clear log error", e); - } finally { // update clean time lastCleanLogTime = System.currentTimeMillis(); + } catch (Exception e) { + SnailJobLog.LOCAL.error("clear log error", e); } } @@ -137,7 +138,7 @@ public class ClearLogSchedule extends AbstractSchedule implements Lifecycle { @Override public void start() { - taskScheduler.scheduleAtFixedRate(this::execute, Duration.parse("PT1H")); + taskScheduler.scheduleAtFixedRate(this::execute, Duration.parse("PT4H")); } @Override From d17500bdd4f04c6bdade67bd8e057a9114bab32f Mon Sep 17 00:00:00 2001 From: dhb52 Date: Tue, 29 Oct 2024 15:58:28 +0000 Subject: [PATCH 2/8] =?UTF-8?q?fix(sj=5F1.2.0-beta3):=20=E4=BF=A1=E5=88=9B?= =?UTF-8?q?arm=E7=8E=AF=E5=A2=83=E4=B8=8BDocker=E5=AE=98=E6=96=B9=E9=95=9C?= =?UTF-8?q?=E5=83=8F=E6=97=A0=E6=B3=95=E8=BF=90=E8=A1=8C=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: dhb52 --- .../snail-job-server-starter/Dockerfile | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/snail-job-server/snail-job-server-starter/Dockerfile b/snail-job-server/snail-job-server-starter/Dockerfile index 98c342ac..a775417a 100644 --- a/snail-job-server/snail-job-server-starter/Dockerfile +++ b/snail-job-server/snail-job-server-starter/Dockerfile @@ -1,17 +1,22 @@ -FROM --platform=$BUILDPLATFORM amazoncorretto:17 as builder -WORKDIR / +FROM bellsoft/liberica-openjdk-debian:17.0.11-cds -ADD ./target/snail-job-server-exec.jar snail-job-server.jar +LABEL maintainer="opensnail" +LABEL app-name="snail-job-server" +LABEL description="SnailJob is a high performance distributed task scheduler and retry management center" -FROM --platform=$BUILDPLATFORM amazoncorretto:17 -MAINTAINER opensnail -LABEL server-name=snail-job-server -#对外暴漏的端口号 +ENV TZ=Asia/Shanghai LANG=C.UTF-8 LC_ALL=C.UTF-8 +ENV JAVA_OPTS="-Djava.security.egd=file:/dev/./urandom -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC" +ENV JAVA_OPTS="" + +WORKDIR /snailjob/server +ADD ./target/snail-job-server-exec.jar app.jar + +# 对外暴漏的端口号 EXPOSE 8080 EXPOSE 1788 -WORKDIR / -COPY --from=builder /snail-job-server.jar . +# 数据卷, 用于映射日志目录 +VOLUME /snailjob/server/data -ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /snail-job-server.jar $PARAMS"] +ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -jar app.jar $PARAMS" ] From e5223b7e5bd70824082f4ab550dbb7b9018236d6 Mon Sep 17 00:00:00 2001 From: wodeyangzipingpingwuqi Date: Wed, 30 Oct 2024 09:47:40 +0800 Subject: [PATCH 3/8] =?UTF-8?q?feat(1.1.2.0-beta3):=201=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=AE=9A=E6=97=B6=E3=80=81=E9=87=8D=E8=AF=95=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=B8=85=E9=99=A4BUG=202=E3=80=81=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E3=80=81=E9=87=8D=E8=AF=95=E4=BF=9D=E7=95=99?= =?UTF-8?q?=E6=9C=80=E8=BF=9124=E5=B0=8F=E6=97=B6=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/support/schedule/JobClearLogSchedule.java | 6 +----- .../task/support/schedule/JobLogMergeSchedule.java | 11 +---------- .../retry/task/support/schedule/ClearLogSchedule.java | 6 +----- .../task/support/schedule/RetryLogMergeSchedule.java | 9 --------- 4 files changed, 3 insertions(+), 29 deletions(-) diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobClearLogSchedule.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobClearLogSchedule.java index f2985f60..14399ecd 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobClearLogSchedule.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobClearLogSchedule.java @@ -41,8 +41,6 @@ import java.util.List; @RequiredArgsConstructor public class JobClearLogSchedule extends AbstractSchedule implements Lifecycle { - // last clean log time - private static Long lastCleanLogTime = 0L; private final SystemProperties systemProperties; private final JobTaskBatchMapper jobTaskBatchMapper; private final JobTaskMapper jobTaskMapper; @@ -68,7 +66,7 @@ public class JobClearLogSchedule extends AbstractSchedule implements Lifecycle { protected void doExecute() { try { // 清除日志默认保存天数大于零、最少保留最近一天的日志数据 - if (systemProperties.getLogStorage() <= 1 && System.currentTimeMillis() - lastCleanLogTime < 24 * 60 * 60 * 1000) { + if (systemProperties.getLogStorage() <= 1) { SnailJobLog.LOCAL.error("job clear log storage error", systemProperties.getLogStorage()); return; } @@ -79,8 +77,6 @@ public class JobClearLogSchedule extends AbstractSchedule implements Lifecycle { this::processJobLogPartitionTasks, 0); SnailJobLog.LOCAL.debug("Job clear success total:[{}]", total); - // update clean time - lastCleanLogTime = System.currentTimeMillis(); } catch (Exception e) { SnailJobLog.LOCAL.error("job clear log error", e); } diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobLogMergeSchedule.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobLogMergeSchedule.java index 4b034cd9..32bfde29 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobLogMergeSchedule.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobLogMergeSchedule.java @@ -53,8 +53,6 @@ public class JobLogMergeSchedule extends AbstractSchedule implements Lifecycle { private final JobLogMessageMapper jobLogMessageMapper; private final TransactionTemplate transactionTemplate; - // last merge log time - private static Long lastMergeLogTime = 0L; @Override public String lockName() { @@ -74,10 +72,6 @@ public class JobLogMergeSchedule extends AbstractSchedule implements Lifecycle { @Override protected void doExecute() { try { - // 合并日志数据最少保留最近一天的日志数据 - if (System.currentTimeMillis() - lastMergeLogTime < 24 * 60 * 60 * 1000) { - return; - } // merge job log long total; LocalDateTime endTime = LocalDateTime.now().minusDays(systemProperties.getMergeLogDays()); @@ -87,9 +81,6 @@ public class JobLogMergeSchedule extends AbstractSchedule implements Lifecycle { SnailJobLog.LOCAL.debug("job merge success total:[{}]", total); } catch (Exception e) { SnailJobLog.LOCAL.error("job merge log error", e); - } finally { - // update merge time - lastMergeLogTime = System.currentTimeMillis(); } } @@ -192,7 +183,7 @@ public class JobLogMergeSchedule extends AbstractSchedule implements Lifecycle { @Override public void start() { - taskScheduler.scheduleAtFixedRate(this::execute, Duration.parse("PT1H")); + taskScheduler.scheduleAtFixedRate(this::execute, Duration.parse("PT1M")); } @Override diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/ClearLogSchedule.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/ClearLogSchedule.java index f97fb58d..e515de10 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/ClearLogSchedule.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/ClearLogSchedule.java @@ -38,8 +38,6 @@ import java.util.List; @Slf4j public class ClearLogSchedule extends AbstractSchedule implements Lifecycle { - // last clean log time - private static Long lastCleanLogTime = 0L; @Autowired private RetryTaskLogMapper retryTaskLogMapper; @Autowired @@ -68,7 +66,7 @@ public class ClearLogSchedule extends AbstractSchedule implements Lifecycle { protected void doExecute() { try { // 清除日志默认保存天数大于零、最少保留最近一天的日志数据 - if (systemProperties.getLogStorage() <= 1 && System.currentTimeMillis() - lastCleanLogTime < 24 * 60 * 60 * 1000) { + if (systemProperties.getLogStorage() <= 1) { SnailJobLog.LOCAL.error("retry clear log storage error", systemProperties.getLogStorage()); return; } @@ -78,8 +76,6 @@ public class ClearLogSchedule extends AbstractSchedule implements Lifecycle { this::processRetryLogPartitionTasks, 0); SnailJobLog.LOCAL.debug("Retry clear success total:[{}]", total); - // update clean time - lastCleanLogTime = System.currentTimeMillis(); } catch (Exception e) { SnailJobLog.LOCAL.error("clear log error", e); } diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryLogMergeSchedule.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryLogMergeSchedule.java index 1e50b1bd..2cca075f 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryLogMergeSchedule.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryLogMergeSchedule.java @@ -49,8 +49,6 @@ import static java.util.stream.Collectors.toList; @RequiredArgsConstructor public class RetryLogMergeSchedule extends AbstractSchedule implements Lifecycle { - // last merge log time - private static Long lastMergeLogTime = 0L; private final SystemProperties systemProperties; private final RetryTaskLogMapper retryTaskLogMapper; private final RetryTaskLogMessageMapper retryTaskLogMessageMapper; @@ -74,10 +72,6 @@ public class RetryLogMergeSchedule extends AbstractSchedule implements Lifecycle @Override protected void doExecute() { try { - // 合并日志数据最少保留最近一天的日志数据 - if (System.currentTimeMillis() - lastMergeLogTime < 24 * 60 * 60 * 1000) { - return; - } // merge job log long total; LocalDateTime endTime = LocalDateTime.now().minusDays(systemProperties.getMergeLogDays()); @@ -87,9 +81,6 @@ public class RetryLogMergeSchedule extends AbstractSchedule implements Lifecycle SnailJobLog.LOCAL.debug("job merge success total:[{}]", total); } catch (Exception e) { SnailJobLog.LOCAL.error("job merge log error", e); - } finally { - // update merge time - lastMergeLogTime = System.currentTimeMillis(); } } From a8cfb0757d67eafdfc2e14ba8c12ab3f13081656 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Wed, 30 Oct 2024 14:58:33 +0800 Subject: [PATCH 4/8] =?UTF-8?q?feat(sj=5F1.2.0-beta3):=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=20Dockerfile=20=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- snail-job-server/snail-job-server-starter/Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/snail-job-server/snail-job-server-starter/Dockerfile b/snail-job-server/snail-job-server-starter/Dockerfile index a775417a..8829c564 100644 --- a/snail-job-server/snail-job-server-starter/Dockerfile +++ b/snail-job-server/snail-job-server-starter/Dockerfile @@ -1,13 +1,13 @@ +# 贝尔实验室 Spring 官方推荐镜像, 能解决arm芯片国产操作系统运行问题 FROM bellsoft/liberica-openjdk-debian:17.0.11-cds LABEL maintainer="opensnail" LABEL app-name="snail-job-server" LABEL description="SnailJob is a high performance distributed task scheduler and retry management center" - ENV TZ=Asia/Shanghai LANG=C.UTF-8 LC_ALL=C.UTF-8 ENV JAVA_OPTS="-Djava.security.egd=file:/dev/./urandom -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC" -ENV JAVA_OPTS="" +ENV PARAMS="" WORKDIR /snailjob/server ADD ./target/snail-job-server-exec.jar app.jar @@ -17,6 +17,8 @@ EXPOSE 8080 EXPOSE 1788 # 数据卷, 用于映射日志目录 -VOLUME /snailjob/server/data +VOLUME /snailjob/server/data/log -ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -jar app.jar $PARAMS" ] +# https://docs.docker.com/reference/build-checks/json-args-recommended/ +SHELL ["/bin/bash", "-c"] +ENTRYPOINT java $JAVA_OPTS -jar app.jar $PARAMS From b0f49440452c8a30a601b4b860fdb41fda1dbec6 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Wed, 30 Oct 2024 16:01:31 +0800 Subject: [PATCH 5/8] =?UTF-8?q?fix(sj=5F1.2.0-beta3):=20=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=8C=85=E6=B6=88=E9=99=A4=20CVE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- snail-job-datasource/snail-job-postgres-datasource/pom.xml | 2 +- snail-job-server/snail-job-server-job-task/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index ddfa3c3b..b60f2968 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.2 + 3.3.5 @@ -22,7 +22,7 @@ 17 17 1.2.0-beta2 - 4.1.94.Final + 4.1.114.Final 5.8.25 3.5.8 2.0.0 diff --git a/snail-job-datasource/snail-job-postgres-datasource/pom.xml b/snail-job-datasource/snail-job-postgres-datasource/pom.xml index e0533db5..074c420b 100644 --- a/snail-job-datasource/snail-job-postgres-datasource/pom.xml +++ b/snail-job-datasource/snail-job-postgres-datasource/pom.xml @@ -16,7 +16,7 @@ 17 - 42.2.24 + 42.7.2 diff --git a/snail-job-server/snail-job-server-job-task/pom.xml b/snail-job-server/snail-job-server-job-task/pom.xml index 6ad6c137..17740ffa 100644 --- a/snail-job-server/snail-job-server-job-task/pom.xml +++ b/snail-job-server/snail-job-server-job-task/pom.xml @@ -76,7 +76,7 @@ com.alibaba QLExpress - 3.3.1 + 3.3.4 commons-beanutils From dc680a8d5ab9f11f51c55024855e8624a0da56bd Mon Sep 17 00:00:00 2001 From: dhb52 Date: Wed, 30 Oct 2024 17:24:50 +0800 Subject: [PATCH 6/8] =?UTF-8?q?feat(sj=5F1.2.0-beta3):=20=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E4=BE=9D=E8=B5=96=E5=8C=85=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 15 +++++++++++---- .../snail-job-client-retry-core/pom.xml | 2 +- snail-job-common/snail-job-common-core/pom.xml | 2 +- .../snail-job-datasource-template/pom.xml | 4 ++++ 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index b60f2968..bff06ebf 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,15 @@ 17 1.2.0-beta2 4.1.114.Final - 5.8.25 - 3.5.8 + 5.8.32 + 3.5.9 2.0.0 + 3.6.1.Final 1.3.6 2.6.2 0.45.0 1.2.17 - 1.2 + 1.3.4 3.0.2 32.0.0-jre @@ -145,6 +146,12 @@ mybatis-plus-spring-boot3-starter ${mybatis-plus.version} + + + com.baomidou + mybatis-plus-jsqlparser + ${mybatis-plus.version} + jakarta.validation jakarta.validation-api @@ -163,7 +170,7 @@ org.jboss.logging jboss-logging - 3.4.3.Final + ${jboss-logging.version} true diff --git a/snail-job-client/snail-job-client-retry-core/pom.xml b/snail-job-client/snail-job-client-retry-core/pom.xml index 957cc47c..9cf4aca4 100644 --- a/snail-job-client/snail-job-client-retry-core/pom.xml +++ b/snail-job-client/snail-job-client-retry-core/pom.xml @@ -58,7 +58,7 @@ com.alibaba QLExpress - 3.3.1 + 3.3.4 provided true diff --git a/snail-job-common/snail-job-common-core/pom.xml b/snail-job-common/snail-job-common-core/pom.xml index 14f1fd27..30db4b0d 100644 --- a/snail-job-common/snail-job-common-core/pom.xml +++ b/snail-job-common/snail-job-common-core/pom.xml @@ -57,7 +57,7 @@ com.alibaba QLExpress - 3.3.1 + 3.3.4 provided true diff --git a/snail-job-datasource/snail-job-datasource-template/pom.xml b/snail-job-datasource/snail-job-datasource-template/pom.xml index ba157fab..7bf49f9a 100644 --- a/snail-job-datasource/snail-job-datasource-template/pom.xml +++ b/snail-job-datasource/snail-job-datasource-template/pom.xml @@ -32,6 +32,10 @@ com.baomidou mybatis-plus-spring-boot3-starter + + com.baomidou + mybatis-plus-jsqlparser + org.springframework.boot spring-boot-starter-jdbc From 747b3fe698762e58c886696c20fcbcb81adb354e Mon Sep 17 00:00:00 2001 From: srzou Date: Sun, 3 Nov 2024 10:07:53 +0800 Subject: [PATCH 7/8] =?UTF-8?q?fix(sj=5F1.2.0-beta3):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E7=BC=96=E6=8E=92=E4=B8=8B=E7=9A=84?= =?UTF-8?q?http=E5=86=85=E7=BD=AE=E6=89=A7=E8=A1=8C=E5=99=A8=E5=9C=A8?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=A4=B4=E4=B8=AD=E9=80=8F=E4=BC=A0=E4=B8=8A?= =?UTF-8?q?=E4=B8=8B=E6=96=87=E4=B8=ADvalue=E5=8C=85=E5=90=AB=E4=B8=AD?= =?UTF-8?q?=E6=96=87=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/job/core/executor/AbstractHttpExecutor.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractHttpExecutor.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractHttpExecutor.java index ca5309f6..fd496d71 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractHttpExecutor.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractHttpExecutor.java @@ -11,9 +11,10 @@ import com.aizuda.snailjob.common.log.SnailJobLog; import lombok.Data; import org.springframework.util.StringUtils; -import java.util.Iterator; +import java.util.Base64; import java.util.Map; import java.util.Objects; +import java.util.regex.Pattern; public abstract class AbstractHttpExecutor { @@ -27,6 +28,7 @@ public abstract class AbstractHttpExecutor { private static final String HTTP = "http"; private static final String HTTP_PREFIX = "http://"; private static final int HTTP_SUCCESS_CODE = 200; + private static final Pattern pattern = Pattern.compile("[\\u4e00-\\u9fa5]"); public ExecuteResult process(HttpParams httpParams) { if (httpParams == null) { @@ -123,6 +125,11 @@ public abstract class AbstractHttpExecutor { if ( Objects.nonNull(httpParams.getWfContext())) { httpParams.getWfContext().forEach((key, value) -> { String headerValue = (value instanceof String) ? (String) value : JsonUtil.toJsonString(value); + // 正则表达式匹配中文字符 + if (pattern.matcher(headerValue).find()) { + // 如果包含中文字符，则进行Base64编码 + headerValue = Base64.getEncoder().encodeToString(headerValue.getBytes()); + } request.header(key, headerValue); }); } From f8ad529cc0bd3f682af8c5a6893de1811e921b4b Mon Sep 17 00:00:00 2001 From: wodeyangzipingpingwuqi Date: Mon, 4 Nov 2024 13:46:40 +0800 Subject: [PATCH 8/8] =?UTF-8?q?feat(1.2.0-beta3):=201=E3=80=81=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E6=97=A5=E5=BF=97=E4=B8=8A=E6=8A=A5=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=20org.apache.log4j.MDC=E4=BF=AE=E6=94=B9=E4=B8=BAorg.?= =?UTF-8?q?slf4j.MDC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../snailjob/client/common/appender/SnailLog4j2Appender.java | 2 +- .../aizuda/snailjob/common/log/dialect/log4j2/Log4j2Log.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index bff06ebf..c393d40b 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 17 17 17 - 1.2.0-beta2 + 1.2.0-beta3 4.1.114.Final 5.8.32 3.5.9 diff --git a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/appender/SnailLog4j2Appender.java b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/appender/SnailLog4j2Appender.java index dae8a504..35be919d 100644 --- a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/appender/SnailLog4j2Appender.java +++ b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/appender/SnailLog4j2Appender.java @@ -19,7 +19,6 @@ import com.aizuda.snailjob.client.common.log.support.SnailJobLogManager; import com.aizuda.snailjob.client.common.rpc.client.NettyChannel; import com.aizuda.snailjob.common.log.constant.LogFieldConstants; import com.aizuda.snailjob.common.log.dto.LogContentDTO; -import org.apache.log4j.MDC; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; @@ -30,6 +29,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginElement; import org.apache.logging.log4j.core.config.plugins.PluginFactory; import org.apache.logging.log4j.core.util.Booleans; import org.apache.logging.log4j.core.util.Throwables; +import org.slf4j.MDC; import java.io.Serializable; import java.util.Objects; diff --git a/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/log4j2/Log4j2Log.java b/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/log4j2/Log4j2Log.java index 75ec793e..c1b02ea7 100644 --- a/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/log4j2/Log4j2Log.java +++ b/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/log4j2/Log4j2Log.java @@ -4,11 +4,11 @@ import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.log.constant.LogFieldConstants; import com.aizuda.snailjob.common.log.dialect.AbstractLog; import com.aizuda.snailjob.common.log.factory.LogFactory; -import org.apache.log4j.MDC; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.spi.AbstractLogger; +import org.slf4j.MDC; import java.io.Serial;