From 6a59f50b96dc4b599181168ba708f49a1944757c Mon Sep 17 00:00:00 2001 From: tjq Date: Sat, 16 Mar 2024 21:53:26 +0800 Subject: [PATCH] fix: can't upload container #843 --- .../powerjob/server/core/container/ContainerService.java | 1 - .../powerjob/server/config/CachingRequestBodyFilter.java | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/container/ContainerService.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/container/ContainerService.java index 58a636d1..beeae815 100644 --- a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/container/ContainerService.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/container/ContainerService.java @@ -336,7 +336,6 @@ public class ContainerService { sb.append("WARN: there exists multi version container now, please redeploy to fix this problem").append(System.lineSeparator()); } - sb.append("divisive version ==> ").append(System.lineSeparator()); version2DeployedContainerInfoList.asMap().forEach((version, deployedContainerInfos) -> { sb.append("[version] ").append(version).append(System.lineSeparator()); deployedContainerInfos.forEach(deployedContainerInfo -> sb.append(String.format("Address: %s, DeployedTime: %s", deployedContainerInfo.getWorkerAddress(), CommonUtils.formatTime(deployedContainerInfo.getDeployedTime()))).append(System.lineSeparator())); diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/config/CachingRequestBodyFilter.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/config/CachingRequestBodyFilter.java index 5f796cf6..ec471f7a 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/config/CachingRequestBodyFilter.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/config/CachingRequestBodyFilter.java @@ -29,10 +29,18 @@ public class CachingRequestBodyFilter implements Filter { */ private static final Set IGNORE_CONTENT_TYPES = Sets.newHashSet("application/x-www-form-urlencoded", "multipart/form-data"); + private static final Set IGNORE_URIS = Sets.newHashSet("/container/jarUpload"); + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { if (request instanceof HttpServletRequest) { + String uri = ((HttpServletRequest) request).getRequestURI(); + // 忽略 jar 上传等处理路径 + if (IGNORE_URIS.contains(uri)) { + chain.doFilter(request, response); + return; + } String contentType = request.getContentType(); if (contentType != null && !IGNORE_CONTENT_TYPES.contains(contentType)) { CustomHttpServletRequestWrapper wrappedRequest = new CustomHttpServletRequestWrapper((HttpServletRequest) request);