From e082b9d0cc03c2ae4f1384a586e40f691daa5ef6 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Wed, 11 Sep 2024 10:53:16 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-2924)=20-=20=E8=BF=87=E6=BB=A4=20/erro?=
 =?UTF-8?q?r?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RequestHeaderContextInterceptor.java            | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

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 cfc316e8e..5db983a43 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
@@ -47,11 +47,11 @@ public class RequestHeaderContextInterceptor implements HandlerInterceptor {
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         if (Objects.equals(HEADER_HTTP_CLIENT_VALUE, request.getHeader(HEADER_HTTP_CLIENT))) {
             String headerClientVersion = request.getHeader(HEADER_API_VERSION)
-                    .replaceAll("-SNAPSHOT", "")
-                    .replaceAll("-RELEASE", "");
+                .replaceAll("-SNAPSHOT", "")
+                .replaceAll("-RELEASE", "");
             serviceVersion = serviceVersion
-                    .replaceAll("-SNAPSHOT", "")
-                    .replaceAll("-RELEASE", "");
+                .replaceAll("-SNAPSHOT", "")
+                .replaceAll("-RELEASE", "");
             DefaultArtifactVersion minimumSupportedVersion = new DefaultArtifactVersion(FLOW_SERVER_VERSION_130);
             DefaultArtifactVersion clientVersion = new DefaultArtifactVersion(headerClientVersion);
             DefaultArtifactVersion serverVersion = new DefaultArtifactVersion(serviceVersion);
@@ -69,7 +69,8 @@ public class RequestHeaderContextInterceptor implements HandlerInterceptor {
         }
         // 仅 feignApi 才需要检查版本
         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);
             printHeader(request);
             log.error(MICRO_SERVER_NEED_REBUILD.getMessage(), serverName);
@@ -105,7 +106,7 @@ public class RequestHeaderContextInterceptor implements HandlerInterceptor {
         }
         ExtAxProperty property = extAxProperty.get();
         if (Objects.equals(property.getValue(), clientVersion.toString())
-                && Objects.equals(property.getManageable().toString(), manageableStatus)) {
+            && Objects.equals(property.getManageable().toString(), manageableStatus)) {
             return;
         }
         property.setName(requestApplicationName);