From 18b28b4dfd9ac09b56d3ed4365003235bd3d8bba Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Mon, 19 Feb 2024 15:35:37 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E6=96=B0=E5=A2=9Ejar=20=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E7=89=88=E6=9C=AC=E7=9A=84=E6=AF=94=E5=AF=B9?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RequestHeaderContextInterceptor.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/interceptor/RequestHeaderContextInterceptor.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/interceptor/RequestHeaderContextInterceptor.java index 0270b6429..99031a73e 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/interceptor/RequestHeaderContextInterceptor.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/interceptor/RequestHeaderContextInterceptor.java @@ -7,6 +7,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; import org.springframework.web.servlet.HandlerInterceptor; import javax.servlet.http.HttpServletRequest; @@ -17,6 +18,7 @@ import static cn.axzo.workflow.client.config.FeignRequestInterceptor.HEADER_API_ import static cn.axzo.workflow.client.config.FeignRequestInterceptor.HEADER_HTTP_CLIENT; import static cn.axzo.workflow.client.config.FeignRequestInterceptor.HEADER_HTTP_CLIENT_VALUE; import static cn.axzo.workflow.client.config.FeignRequestInterceptor.HEADER_SERVER_NAME; +import static cn.axzo.workflow.common.constant.BpmnConstants.DOT; import static cn.axzo.workflow.core.common.code.OtherRespCode.CLIENT_VERSION_SUPPORT; /** @@ -50,15 +52,16 @@ public class RequestHeaderContextInterceptor implements HandlerInterceptor { } } // 仅 feignApi 才需要检查版本 - // if (!request.getRequestURI().contains("/web/") && !request.getRequestURI().contains("checkDeath") - // && !StringUtils.hasText(request.getHeader(HEADER_HTTP_CLIENT))) { - // log.info("request uri 2 : {}", request.getRequestURI()); - // String serverName = request.getHeader(HEADER_SERVER_NAME); - // if(StringUtils.hasText(serverName)) { - // serverName = serverName.split(DOT)[1]; - // } - // throw new WorkflowEngineException(MICRO_SERVER_NEED_REBUILD, serverName); - // } + if (!request.getRequestURI().contains("/web/") && !request.getRequestURI().contains("checkDeath") + && !StringUtils.hasText(request.getHeader(HEADER_HTTP_CLIENT))) { + log.info("request uri 2 : {}", request.getRequestURI()); + String serverName = request.getHeader(HEADER_SERVER_NAME); + if (StringUtils.hasText(serverName)) { + serverName = serverName.split(DOT)[1]; + } + log.info("server Name is : {}", serverName); + // throw new WorkflowEngineException(MICRO_SERVER_NEED_REBUILD, serverName); + } return true; }