From fbf69987628a586eb275edd744f42a222b42058e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B5=E7=AB=8B=E4=BD=B3?= <418843795@qq.com> Date: Mon, 21 Apr 2025 15:44:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=85=E7=BD=AEhttp=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E5=99=A8=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E7=BB=93=E6=9E=9C=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/common/config/SnailJobProperties.java | 8 ++++---- .../core/executor/builtin/AbstractHttpExecutor.java | 12 +++++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/config/SnailJobProperties.java b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/config/SnailJobProperties.java index 6da5e17b5..ca0492155 100644 --- a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/config/SnailJobProperties.java +++ b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/config/SnailJobProperties.java @@ -73,7 +73,7 @@ public class SnailJobProperties { /** * 内置http执行器自定义响应结果配置 */ - private HttpResponse httpResponse = new HttpResponse(); + private HttpResponse httpResponse; /** * 重试模块配置 @@ -119,17 +119,17 @@ public class SnailJobProperties { /** * 内置http执行器响应成功状态码，默认值200 */ - private int code; + private int code = 200; /** * 内置http执行器状态码字段名称，默认值code，只针对responseType等于json生效 */ - private String field; + private String field = "code"; /** * 内置http执行器响应类型，可选值json或者text，默认值json */ - private String responseType; + private String responseType = "json"; } @Data 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 fc5b4d9b7..63f00e29d 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 @@ -30,6 +30,8 @@ public abstract class AbstractHttpExecutor { private static final String HTTP_PREFIX = "http://"; private static final int HTTP_SUCCESS_CODE = 200; private static final Pattern pattern = Pattern.compile("[\\u4e00-\\u9fa5]"); + private static final String JSON_RESPONSE_TYPE = "json"; + private static final String TEXT_RESPONSE_TYPE = "text"; public ExecuteResult process(HttpParams httpParams) { if (httpParams == null) { @@ -88,13 +90,13 @@ public abstract class AbstractHttpExecutor { } // 如果配置了httpResponse，则根据响应类型进行进一步验证 if (Objects.nonNull(httpResponse)) { - int code = Optional.of(httpResponse.getCode()).orElse(HTTP_SUCCESS_CODE); - String field = Optional.of(httpResponse.getField()).orElse("code"); - String responseType = Optional.of(httpResponse.getResponseType()).orElse("json"); + int code = httpResponse.getCode(); + String field = httpResponse.getField(); + String responseType = httpResponse.getResponseType(); // 根据不同的响应类型进行验证 - if ("json".equalsIgnoreCase(responseType)) { + if (JSON_RESPONSE_TYPE.equalsIgnoreCase(responseType)) { return validateJsonResponse(body, code, field, httpRequest); - } else if ("text".equalsIgnoreCase(responseType)) { + } else if (TEXT_RESPONSE_TYPE.equalsIgnoreCase(responseType)) { return validateTextResponse(body, code, httpRequest); } else { return ExecuteResult.failure("the responseType is not json or text");