TYPE_WHITELIST = Set.of(
- "user", "depart", "position", "formSpecifiedDimension", "initiator",
- "sameToTask", "beforeTaskLeader", "beforeTaskDepartManager", "scriptUser", "projectRoleType");
+ "user", "roles", "depart", "position", "initiator",
+ "initiatorDepartManager", "initiatorLeader", "initiatorSubordinate", "initiatorDepart",
+ "sameToTask", "beforeTaskLeader", "beforeTaskDepartManager",
+ "fixedDimension", "formSpecifiedDimension", "projectRoleType", "scriptUser");
/** 会签完成条件三预设(与 Eip4Panel.tsx:60-77 逐字一致):全票 / 过半 / 指定数。 */
private static final Pattern COMPLETION_ALL =
diff --git a/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/client/FlowRemoteException.java b/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/client/FlowRemoteException.java
index 5b09778..46a8ba6 100644
--- a/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/client/FlowRemoteException.java
+++ b/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/client/FlowRemoteException.java
@@ -8,17 +8,33 @@ import org.springframework.http.HttpStatusCode;
* 与 {@link FlowServiceUnavailableException} 区分:那个是"引擎进程不可达"(→ 503);
* 这个是"引擎在线但拒绝了这次操作"(原状态码透传给调用方,保留 Flowable 语义,
* 如挂起拒办 409、参数错 400)。
+ *
+ *
responseBody(可空):携带下游原始响应体,供 {@code FlowGatewayExceptionHandler} 透传结构化错误
+ * ——如流程发布下游 422 的 {@code {errors:[{activityId,problem,defaultDescription}]}}(引擎 ProcessValidator 结构校验)
+ * 需并入网关响应,与网关语义校验 422 的顶层 {@code errors} 契约统一(T3.2 评审 I-2:此前只留状态码丢体,
+ * 结构化错误到不了前端)。旧两参构造(无体)保留,非发布路径不受影响。
*/
public class FlowRemoteException extends RuntimeException {
private final HttpStatusCode status;
+ private final String responseBody;
public FlowRemoteException(HttpStatusCode status, String message) {
+ this(status, message, null);
+ }
+
+ public FlowRemoteException(HttpStatusCode status, String message, String responseBody) {
super(message);
this.status = status;
+ this.responseBody = responseBody;
}
public HttpStatusCode getStatus() {
return status;
}
+
+ /** 下游原始响应体(可空);供 handler 解析并透传结构化 errors。 */
+ public String getResponseBody() {
+ return responseBody;
+ }
}
diff --git a/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/client/FlowableClient.java b/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/client/FlowableClient.java
index 23487cf..ab4c392 100644
--- a/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/client/FlowableClient.java
+++ b/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/client/FlowableClient.java
@@ -490,10 +490,12 @@ public class FlowableClient {
sleepBackoff();
}
} catch (RestClientResponseException e) {
- // 业务级:引擎在线但返回 4xx/5xx(如挂起拒办 409)——透传原状态码,绝不重试
+ // 业务级:引擎在线但返回 4xx/5xx(如挂起拒办 409)——透传原状态码,绝不重试。
+ // 携带原始响应体:发布下游 422 的结构化 errors(activityId/problem) 交 handler 并入网关响应(评审 I-2)。
HttpStatusCode status = e.getStatusCode();
log.debug("flowable-service {}调用返回业务状态 {}: {}", op, status, e.getMessage());
- throw new FlowRemoteException(status, "flowable-service " + op + "返回 " + status.value());
+ throw new FlowRemoteException(status, "flowable-service " + op + "返回 " + status.value(),
+ e.getResponseBodyAsString());
}
}
// 重试耗尽仍连不上 —— 熔断降级为 503 语义
diff --git a/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/FlowGatewayExceptionHandler.java b/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/FlowGatewayExceptionHandler.java
index 521b88d..938f2f8 100644
--- a/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/FlowGatewayExceptionHandler.java
+++ b/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/FlowGatewayExceptionHandler.java
@@ -1,7 +1,10 @@
package com.eip4.platform.flowgateway.web;
+import java.util.LinkedHashMap;
import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -9,6 +12,8 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
import com.eip4.platform.flowgateway.client.FlowRemoteException;
import com.eip4.platform.flowgateway.client.FlowServiceUnavailableException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
/**
* 流程网关异常 → 干净 HTTP 语义(只管本网关 client 抛出的两类异常,不拦其他)。
@@ -17,12 +22,17 @@ import com.eip4.platform.flowgateway.client.FlowServiceUnavailableException;
*
{@link FlowServiceUnavailableException}(引擎进程不可达,重试耗尽)→ 503
* Service Unavailable —— 待办聚合在引擎宕机/网络分区时返回明确的服务不可用语义,而非 500 堆栈。
* {@link FlowRemoteException}(引擎在线但拒绝,如挂起拒办 409)→ 透传原状态码,
- * 保留 Flowable 语义。
+ * 保留 Flowable 语义;若下游响应体带结构化 {@code errors} 数组(如发布 422 的引擎结构校验错误
+ * {@code [{activityId,problem,defaultDescription}]}),并入网关响应顶层 {@code errors},
+ * 与网关语义校验 422 的顶层 {@code errors} 契约统一(评审 I-2)。
*
*/
@RestControllerAdvice(basePackages = "com.eip4.platform.flowgateway")
public class FlowGatewayExceptionHandler {
+ private static final Logger log = LoggerFactory.getLogger(FlowGatewayExceptionHandler.class);
+ private static final ObjectMapper MAPPER = new ObjectMapper();
+
@ExceptionHandler(FlowServiceUnavailableException.class)
public ResponseEntity