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

feat(REQ-2924) - 过滤 /error

Browse Source
This commit is contained in:
wangli 2024-09-11 10:53:16 +08:00
parent 9d1b477aaa
commit e082b9d0cc
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,11 +47,11 @@ public class RequestHeaderContextInterceptor implements HandlerInterceptor {
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
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)
.replaceAll("-SNAPSHOT", "") .replaceAll("-SNAPSHOT", "")
.replaceAll("-RELEASE", ""); .replaceAll("-RELEASE", "");
serviceVersion = serviceVersion serviceVersion = serviceVersion
.replaceAll("-SNAPSHOT", "") .replaceAll("-SNAPSHOT", "")
.replaceAll("-RELEASE", ""); .replaceAll("-RELEASE", "");
DefaultArtifactVersion minimumSupportedVersion = new DefaultArtifactVersion(FLOW_SERVER_VERSION_130); DefaultArtifactVersion minimumSupportedVersion = new DefaultArtifactVersion(FLOW_SERVER_VERSION_130);
DefaultArtifactVersion clientVersion = new DefaultArtifactVersion(headerClientVersion); DefaultArtifactVersion clientVersion = new DefaultArtifactVersion(headerClientVersion);
DefaultArtifactVersion serverVersion = new DefaultArtifactVersion(serviceVersion); DefaultArtifactVersion serverVersion = new DefaultArtifactVersion(serviceVersion);
@ -69,7 +69,8 @@ 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))) { && !request.getRequestURI().contains("/error")
&& !StringUtils.hasText(request.getHeader(HEADER_HTTP_CLIENT))) {
String serverName = request.getHeader(HEADER_SERVER_NAME); String serverName = request.getHeader(HEADER_SERVER_NAME);
printHeader(request); printHeader(request);
log.error(MICRO_SERVER_NEED_REBUILD.getMessage(), serverName); log.error(MICRO_SERVER_NEED_REBUILD.getMessage(), serverName);
@ -105,7 +106,7 @@ public class RequestHeaderContextInterceptor implements HandlerInterceptor {
} }
ExtAxProperty property = extAxProperty.get(); ExtAxProperty property = extAxProperty.get();
if (Objects.equals(property.getValue(), clientVersion.toString()) if (Objects.equals(property.getValue(), clientVersion.toString())
&& Objects.equals(property.getManageable().toString(), manageableStatus)) { && Objects.equals(property.getManageable().toString(), manageableStatus)) {
return; return;
} }
property.setName(requestApplicationName); property.setName(requestApplicationName);