diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractHttpExecutor.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractHttpExecutor.java index 46a734020..301a26a9b 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractHttpExecutor.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractHttpExecutor.java @@ -129,7 +129,7 @@ public abstract class AbstractHttpExecutor { // 检查响应体是否包含指定的状态码字段 Map objectObjectMap = JsonUtil.parseHashMap(body); if (!objectObjectMap.containsKey(field)) { - SnailJobLog.LOCAL.error("the responseType is json,but there is no status code field:" + field); + SnailJobLog.LOCAL.error("the responseType is json,but there is no status code field:{}", field); return ExecuteResult.failure("the responseType is json,but there is no status code field:" + field); } // 检查响应体中状态码是否与指定的状态码是否一致 diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/SnailJobHttpExecutor.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/SnailJobHttpExecutor.java index a42ca9ab7..bd31d7b65 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/SnailJobHttpExecutor.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/SnailJobHttpExecutor.java @@ -23,12 +23,7 @@ public class SnailJobHttpExecutor extends AbstractHttpExecutor { httpParams.setWfContext(jobArgs.getWfContext()); } httpParams.setMethod(httpParams.getMethod().toUpperCase()); - Map hashMap = new HashMap<>(3); - hashMap.put(SystemConstants.SNAIL_JOB_CLIENT_GROUP, snailJobProperties.getGroup()); - hashMap.put(SystemConstants.SNAIL_JOB_CLIENT_GROUP_TOKEN, snailJobProperties.getToken()); - hashMap.put(SystemConstants.SNAIL_JOB_CLIENT_NAMESPACE, snailJobProperties.getNamespace()); Map headers = (Objects.isNull(httpParams.getHeaders()) || httpParams.getHeaders().isEmpty()) ? new HashMap<>() : httpParams.getHeaders(); - headers.putAll(hashMap); httpParams.setHeaders(headers); return process(httpParams); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobLogServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobLogServiceImpl.java index 8aca9d9ed..dc80f415e 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobLogServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobLogServiceImpl.java @@ -41,7 +41,7 @@ public class JobLogServiceImpl implements JobLogService { String sid = queryVO.getSid(); LogPageQueryDO pageQueryDO = new LogPageQueryDO(); pageQueryDO.setPage(1); - pageQueryDO.setSize(queryVO.getSize()); + pageQueryDO.setSize(50); pageQueryDO.setTaskBatchId(queryVO.getTaskBatchId()); pageQueryDO.setTaskId(queryVO.getTaskId()); pageQueryDO.setStartRealTime(queryVO.getStartRealTime()); diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskServiceImpl.java index 0211b2e10..0f4ac0ffe 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskServiceImpl.java @@ -100,7 +100,7 @@ public class RetryTaskServiceImpl implements RetryTaskService { String sid = queryVO.getSid(); RetryTaskLogMessageQueryDO pageQueryDO = new RetryTaskLogMessageQueryDO(); pageQueryDO.setPage(1); - pageQueryDO.setSize(queryVO.getSize()); + pageQueryDO.setSize(50); pageQueryDO.setRetryTaskId(queryVO.getRetryTaskId()); pageQueryDO.setStartRealTime(queryVO.getStartRealTime()); pageQueryDO.setSearchCount(true);