update - 调整记录客户端引用的版本比对的逻辑

This commit is contained in:
wangli 2024-02-19 16:20:59 +08:00
parent eefabc4f55
commit 60573b204c

View File

@ -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<String> 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<String> 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;
}