wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update - 新增jar 客户端版本的比对判断

Browse Source
This commit is contained in:
wangli 2024-02-19 15:30:29 +08:00
parent 660fd59c00
commit 99b9f900b7
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/interceptor/RequestHeaderContextInterceptor.java
View File

@ -7,7 +7,6 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.HandlerInterceptor;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -18,9 +17,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;
import static cn.axzo.workflow.client.config.FeignRequestInterceptor.HEADER_HTTP_CLIENT_VALUE; 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.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.CLIENT_VERSION_SUPPORT;
import static cn.axzo.workflow.core.common.code.OtherRespCode.MICRO_SERVER_NEED_REBUILD;
/** /**
* 客户端与服务端的版本比较 * 客户端与服务端的版本比较
@ -53,15 +50,15 @@ public class RequestHeaderContextInterceptor implements HandlerInterceptor {
} }
} }
// 仅 feignApi 才需要检查版本 // 仅 feignApi 才需要检查版本
if (!request.getRequestURI().contains("/web/") && !request.getRequestURI().contains("checkDeath") // if (!request.getRequestURI().contains("/web/") && !request.getRequestURI().contains("checkDeath")
&& !StringUtils.hasText(request.getHeader(HEADER_HTTP_CLIENT))) { // && !StringUtils.hasText(request.getHeader(HEADER_HTTP_CLIENT))) {
log.info("request uri 2 : {}", request.getRequestURI()); // log.info("request uri 2 : {}", request.getRequestURI());
String serverName = request.getHeader(HEADER_SERVER_NAME); // String serverName = request.getHeader(HEADER_SERVER_NAME);
if(StringUtils.hasText(serverName)) { // if(StringUtils.hasText(serverName)) {
serverName = serverName.split(DOT)[1]; // serverName = serverName.split(DOT)[1];
} // }
throw new WorkflowEngineException(MICRO_SERVER_NEED_REBUILD, serverName); // throw new WorkflowEngineException(MICRO_SERVER_NEED_REBUILD, serverName);
} // }
return true; return true;
} }