From 60573b204c8ede810105edd2f07873112b51b537 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Mon, 19 Feb 2024 16:20:59 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E8=B0=83=E6=95=B4=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=BC=95=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=AF=94=E5=AF=B9=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RequestHeaderContextInterceptor.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 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 4fc39f8ee..8e1a1b42a 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 @@ -12,7 +12,6 @@ import org.springframework.web.servlet.HandlerInterceptor; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Enumeration; import java.util.Objects; import static cn.axzo.workflow.client.config.FeignRequestInterceptor.HEADER_API_VERSION; @@ -20,6 +19,7 @@ import static cn.axzo.workflow.client.config.FeignRequestInterceptor.HEADER_HTTP 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.core.common.code.OtherRespCode.CLIENT_VERSION_SUPPORT; +import static cn.axzo.workflow.core.common.code.OtherRespCode.MICRO_SERVER_NEED_REBUILD; /** * 客户端与服务端的版本比较 @@ -37,14 +37,14 @@ public class RequestHeaderContextInterceptor implements HandlerInterceptor { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - Enumeration headerNames = request.getHeaderNames(); - log.info("parse header start"); - while (headerNames.hasMoreElements()) { - String headerName = headerNames.nextElement(); - String headerValue = request.getHeader(headerName); - log.info("headerName: {}, headerValue: {}", headerName, headerValue); - } - log.info("parse header end"); + // Enumeration headerNames = request.getHeaderNames(); + // log.info("parse header start"); + // while (headerNames.hasMoreElements()) { + // String headerName = headerNames.nextElement(); + // String headerValue = request.getHeader(headerName); + // log.info("headerName: {}, headerValue: {}", headerName, headerValue); + // } + // log.info("parse header end"); if (Objects.equals(HEADER_HTTP_CLIENT_VALUE, request.getHeader(HEADER_HTTP_CLIENT))) { String headerClientVersion = request.getHeader(HEADER_API_VERSION); DefaultArtifactVersion clientVersion = new DefaultArtifactVersion(headerClientVersion); @@ -62,10 +62,8 @@ 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); - log.info("server Name is : {}", serverName); - // throw new WorkflowEngineException(MICRO_SERVER_NEED_REBUILD, serverName); + throw new WorkflowEngineException(MICRO_SERVER_NEED_REBUILD, serverName); } return true; }