diff --git a/flowable-service/src/main/java/com/eip4/flowservice/api/ProcessModelController.java b/flowable-service/src/main/java/com/eip4/flowservice/api/ProcessModelController.java
index 7a8a9b8..4db9634 100644
--- a/flowable-service/src/main/java/com/eip4/flowservice/api/ProcessModelController.java
+++ b/flowable-service/src/main/java/com/eip4/flowservice/api/ProcessModelController.java
@@ -2,19 +2,27 @@ package com.eip4.flowservice.api;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
import org.flowable.bpmn.converter.BpmnXMLConverter;
+import org.flowable.bpmn.model.BpmnModel;
import org.flowable.common.engine.impl.util.io.StringStreamSource;
import org.flowable.engine.RepositoryService;
+import org.flowable.engine.RuntimeService;
import org.flowable.engine.repository.Model;
import org.flowable.engine.repository.ProcessDefinition;
+import org.flowable.validation.ProcessValidator;
+import org.flowable.validation.ProcessValidatorFactory;
+import org.flowable.validation.ValidationError;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.util.StreamUtils;
@@ -27,6 +35,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.v3.oas.annotations.Operation;
@@ -67,11 +76,42 @@ public class ProcessModelController {
/** DOCTYPE 门 prolog 扫描字节上限(BOM/XML 声明/注释/DOCTYPE 都在最前)。 */
private static final int PROLOG_SCAN_BYTES = 8192;
+ /**
+ * bpmn-js {@code saveXML} 补的 {@code <*:incoming>/<*:outgoing>} 文本引用元素(前缀可选:bpmn/bpmn2/默认)。
+ * 发布前整体剥除——Flowable 从 {@code sequenceFlow} 的 sourceRef/targetRef 自行推导入出边,这些元素冗余;
+ * 且它们把节点/流 id 存为元素文本(非属性),{@link BpmnIdSanitizer#restore} 只还原属性位不碰文本
+ * → 不剥则落库「属性=中文原 key、文本引用=净化 id」的脏 XML(T1.3 评审 I-2)。
+ */
+ private static final Pattern FLOW_REF_ELEMENT = Pattern.compile(
+ "<(?:[\\w.-]+:)?(?:incoming|outgoing)>[^<]*(?:[\\w.-]+:)?(?:incoming|outgoing)>");
+
private final RepositoryService repositoryService;
+ private final RuntimeService runtimeService;
+ private final ProcessValidator processValidator;
private final ObjectMapper objectMapper = new ObjectMapper();
- public ProcessModelController(RepositoryService repositoryService) {
+ @Autowired
+ public ProcessModelController(RepositoryService repositoryService, RuntimeService runtimeService) {
+ this(repositoryService, runtimeService, new ProcessValidatorFactory().createDefaultProcessValidator());
+ }
+
+ /**
+ * 单参构造:既有草稿 CRUD 单测保留零改动地 {@code new ProcessModelController(repositoryService)}
+ * (那些用例不触发发布/影响路径,无需 RuntimeService/校验器)。
+ */
+ ProcessModelController(RepositoryService repositoryService) {
+ this(repositoryService, null, new ProcessValidatorFactory().createDefaultProcessValidator());
+ }
+
+ /**
+ * 全参构造:发布/影响端点单测注入 mock {@link ProcessValidator}
+ * ({@code ProcessValidatorFactory} 产的默认校验器无法 mock,须构造注入以断言 ERROR-vs-WARNING 分支)。
+ */
+ ProcessModelController(RepositoryService repositoryService, RuntimeService runtimeService,
+ ProcessValidator processValidator) {
this.repositoryService = repositoryService;
+ this.runtimeService = runtimeService;
+ this.processValidator = processValidator;
}
@GetMapping("/models")
@@ -230,6 +270,155 @@ public class ProcessModelController {
return ResponseEntity.ok(resp);
}
+ @PostMapping("/models/{id}/deploy")
+ @Operation(summary = "发布草稿为流程定义",
+ description = "草稿不存在→404;还原 eip4IdMap 里的中文原 key(存量流程 D7 硬需求,新建流程无 idMap 跳过)+"
+ + "剥除 bpmn-js 补的 incoming/outgoing 文本引用 → 引擎 ProcessValidator 语义校验(仅 ERROR 级阻断,"
+ + "返 422 {errors:[{activityId,problem,defaultDescription}]} 不部署;WARNING 放行)→ "
+ + "createDeployment().disableSchemaValidation()(只跳 XSD:bpmn-js 默认命名空间与严格 XSD 已知不兼容,"
+ + "语义校验已在上一步)部署 → {status:0,deploymentId,processKey,newVersion}。")
+ public ResponseEntity