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 469dc800f..673356d55 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,7 +18,9 @@ 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; +import static cn.axzo.workflow.core.common.code.OtherRespCode.MICRO_SERVER_NEED_REBUILD; /** * 客户端与服务端的版本比较 @@ -50,12 +53,15 @@ 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).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]; + } + throw new WorkflowEngineException(MICRO_SERVER_NEED_REBUILD, serverName); + } return true; }