gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

fix(sj_1.2.0-beta3): 修复工作流编排下的http内置执行器在请求头中透传上下文中value包含中文问题

Browse Source
This commit is contained in:
srzou 2024-11-03 10:07:53 +08:00
parent dc680a8d5a
commit 747b3fe698
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractHttpExecutor.java
View File

@ -11,9 +11,10 @@ import com.aizuda.snailjob.common.log.SnailJobLog;
import lombok.Data; import lombok.Data;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.util.Iterator; import java.util.Base64;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.regex.Pattern;
public abstract class AbstractHttpExecutor { public abstract class AbstractHttpExecutor {
@ -27,6 +28,7 @@ public abstract class AbstractHttpExecutor {
private static final String HTTP = "http"; private static final String HTTP = "http";
private static final String HTTP_PREFIX = "http://"; private static final String HTTP_PREFIX = "http://";
private static final int HTTP_SUCCESS_CODE = 200; private static final int HTTP_SUCCESS_CODE = 200;
private static final Pattern pattern = Pattern.compile("[\\u4e00-\\u9fa5]");
public ExecuteResult process(HttpParams httpParams) { public ExecuteResult process(HttpParams httpParams) {
if (httpParams == null) { if (httpParams == null) {
@ -123,6 +125,11 @@ public abstract class AbstractHttpExecutor {
if ( Objects.nonNull(httpParams.getWfContext())) { if ( Objects.nonNull(httpParams.getWfContext())) {
httpParams.getWfContext().forEach((key, value) -> { httpParams.getWfContext().forEach((key, value) -> {
String headerValue = (value instanceof String) ? (String) value : JsonUtil.toJsonString(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); request.header(key, headerValue);
}); });
} }