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

update - 增加日志

Browse Source
This commit is contained in:
wangli 2024-02-19 14:29:31 +08:00
parent 1ce361943b
commit 80d68bf482
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,18 +1,24 @@
package cn.axzo.workflow.server.common.interceptor; package cn.axzo.workflow.server.common.interceptor;
import cn.axzo.workflow.core.common.exception.WorkflowEngineException;
import cn.axzo.workflow.core.repository.entity.ExtAxProperty; import cn.axzo.workflow.core.repository.entity.ExtAxProperty;
import cn.axzo.workflow.core.service.ExtAxPropertyService; import cn.axzo.workflow.core.service.ExtAxPropertyService;
import lombok.extern.slf4j.Slf4j; 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;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.Objects; import java.util.Objects;
import static cn.axzo.workflow.client.config.FeignRequestInterceptor.HEADER_API_VERSION;
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.client.config.FeignRequestInterceptor.HEADER_SERVER_NAME;
import static cn.axzo.workflow.core.common.code.OtherRespCode.CLIENT_VERSION_SUPPORT;
/** /**
* 客户端与服务端的版本比较 * 客户端与服务端的版本比较
@ -30,24 +36,26 @@ public class RequestHeaderContextInterceptor implements HandlerInterceptor {
@Override @Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
log.info("request uri : {}", request.getRequestURI()); if (Objects.equals(HEADER_HTTP_CLIENT_VALUE, request.getHeader(HEADER_HTTP_CLIENT))) {
// if (Objects.equals(HEADER_HTTP_CLIENT_VALUE, request.getHeader(HEADER_HTTP_CLIENT))) { String headerClientVersion = request.getHeader(HEADER_API_VERSION);
// String headerClientVersion = request.getHeader(HEADER_API_VERSION); DefaultArtifactVersion clientVersion = new DefaultArtifactVersion(headerClientVersion);
// DefaultArtifactVersion clientVersion = new DefaultArtifactVersion(headerClientVersion); DefaultArtifactVersion serverVersion = new DefaultArtifactVersion(serviceVersion);
// DefaultArtifactVersion serverVersion = new DefaultArtifactVersion(serviceVersion); if (clientVersion.compareTo(serverVersion) >= 0) {
// if (clientVersion.compareTo(serverVersion) >= 0) {
// recordClientInfo(request, headerClientVersion, clientVersion);
// recordClientInfo(request, headerClientVersion, clientVersion);
// return true;
// return true; } else {
// } else { log.info("request uri : {}", request.getRequestURI());
// throw new WorkflowEngineException(CLIENT_VERSION_SUPPORT, serviceVersion); throw new WorkflowEngineException(CLIENT_VERSION_SUPPORT, serviceVersion);
// } }
// } }
// if (!request.getRequestURI().contains("/web/") && !request.getRequestURI().contains("checkDeath") // 仅 feignApi 才需要检查版本
// && !StringUtils.hasText(request.getHeader(HEADER_HTTP_CLIENT))) { if (!request.getRequestURI().contains("/web/") && !request.getRequestURI().contains("checkDeath")
// throw new WorkflowEngineException(CLIENT_VERSION_SUPPORT, serviceVersion); && !StringUtils.hasText(request.getHeader(HEADER_HTTP_CLIENT))) {
// } log.info("request uri : {}", request.getRequestURI());
throw new WorkflowEngineException(CLIENT_VERSION_SUPPORT, serviceVersion);
}
return true; return true;
} }