From 57812f0edcfb67eb70f70f0a993fe11a7062e917 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 2 Jul 2026 11:15:54 +0800 Subject: [PATCH 01/11] =?UTF-8?q?feat(flow):=20=E6=B5=81=E7=A8=8B=E8=8D=89?= =?UTF-8?q?=E7=A8=BF=20ProcessModelController(act=5Fre=5Fmodel,Model=20API?= =?UTF-8?q?=20=E9=A6=96=E6=AC=A1=E5=90=AF=E7=94=A8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在线 Modeler 草稿仓:flowable 原生 Model API 存草稿于 act_re_model(全仓首次启用 Model API,表已有 143 行存量,databaseSchemaUpdate=false 不涉 DDL)。5 端点(@RequestMapping "/api/flow"):GET /models 列表(orderByLastUpdateTime desc,时间转 ISO)、GET /models/{id} 取草稿(getModel+getModelEditorSource,不存在/源空→found:false)、POST /models 建草稿 (XML 过 BpmnXMLConverter 解析守卫,坏 XML→422 不落库)、PUT /models/{id} 更新 (不存在→404;name/metaInfo 仅当请求提供才更新,避免抹掉 eip4IdMap)、 POST /models/from-procdef 从流程定义建草稿(BpmnIdSanitizer 净化中文 id, metaInfo={eip4IdMap,sourceProcDefId,originalKey} 供发布逆向还原)。 解析守卫就地 catch 转 422,不逸出到 FlowExceptionHandler(那里 FlowableException→400 语义不符)。from-procdef 复用本控制器自带 readProcessModel 小方法,零改动 ProcessDiagramController。 测试:ProcessModelControllerTest 11 例(列表 ISO 降序/取草稿含 metaInfo/model 不存在或 源空 found:false/建草稿合法 XML 落库/坏 XML 422 且 verify 零 saveModel/PUT 404/PUT 合法 更新 status:0/PUT 坏 XML 422/from-procdef 净化 XML 与 idMap 落 metaInfo(捕获 setMetaInfo 断言 JSON 含 eip4IdMap+中文 originalKey、捕获 editorSource 断言净化无中文 id)/procDef 不存在 found:false 不落库)。flowable-service 全模块 84 测试绿(新增 11,既有 73 零改动)。 Co-Authored-By: Claude Fable 5 --- .../api/ProcessModelController.java | 262 ++++++++++++++++ .../api/ProcessModelControllerTest.java | 281 ++++++++++++++++++ 2 files changed, 543 insertions(+) create mode 100644 flowable-service/src/main/java/com/eip4/flowservice/api/ProcessModelController.java create mode 100644 flowable-service/src/test/java/com/eip4/flowservice/api/ProcessModelControllerTest.java 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 new file mode 100644 index 0000000..6636dc3 --- /dev/null +++ b/flowable-service/src/main/java/com/eip4/flowservice/api/ProcessModelController.java @@ -0,0 +1,262 @@ +package com.eip4.flowservice.api; + +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import org.flowable.bpmn.converter.BpmnXMLConverter; +import org.flowable.common.engine.impl.util.io.StringStreamSource; +import org.flowable.engine.RepositoryService; +import org.flowable.engine.repository.Model; +import org.flowable.engine.repository.ProcessDefinition; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.util.StreamUtils; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +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.databind.ObjectMapper; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +/** + * 流程草稿 CRUD(flowable 原生 Model API 存 act_re_model,本控制器为全仓首次启用 Model API)。 + * + *

在线 Modeler 的草稿仓:编辑中的 BPMN 存为 flowable Model(editorSource=BPMN XML,metaInfo=EIP4 元数据 JSON), + * 不进部署库;发布(T3.1)时才 restore 中文原 key + 校验门 + deploy。act_re_model 表已有 143 行存量、schema 已在, + * {@code databaseSchemaUpdate=false} 不涉 DDL。

+ * + *

写入前 XML 一律过 {@link BpmnXMLConverter} 解析守卫(validateSchema=true):坏 XML 返 422 且绝不落库。 + * 守卫异常在本控制器就地 catch 转 422,不逸出到 {@code FlowExceptionHandler}(那里 FlowableException→400,语义不符)。 + * {@code from-procdef} 复用「按 procDefId 读部署 BPMN」逻辑(本控制器自带 {@link #readProcessModel} 小方法, + * 零改动 ProcessDiagramController)→ {@link BpmnIdSanitizer#sanitize} 净化中文 id → 建草稿, + * 原→净化映射连同源 procDefId/原 key 写进 metaInfo,供发布逆向还原。

+ */ +@RestController +@RequestMapping("/api/flow") +@Tag(name = "流程草稿", description = "flowable Model API 草稿 CRUD(act_re_model)+ 从流程定义建草稿") +public class ProcessModelController { + + private static final Logger log = LoggerFactory.getLogger(ProcessModelController.class); + + private final RepositoryService repositoryService; + private final ObjectMapper objectMapper = new ObjectMapper(); + + public ProcessModelController(RepositoryService repositoryService) { + this.repositoryService = repositoryService; + } + + @GetMapping("/models") + @Operation(summary = "草稿列表", + description = "createModelQuery().orderByLastUpdateTime().desc() → {models:[{id,name,key,lastUpdateTime(ISO)}]}。") + public ResponseEntity> list() { + List> models = repositoryService.createModelQuery() + .orderByLastUpdateTime().desc().list().stream() + .map(m -> { + Map row = new LinkedHashMap<>(); + row.put("id", m.getId()); + row.put("name", m.getName()); + row.put("key", m.getKey()); + row.put("lastUpdateTime", toIso(m.getLastUpdateTime())); + return row; + }) + .collect(Collectors.toList()); + Map resp = new LinkedHashMap<>(); + resp.put("models", models); + return ResponseEntity.ok(resp); + } + + @GetMapping("/models/{id}") + @Operation(summary = "取草稿", + description = "getModel + getModelEditorSource → {found,id,name,key,bpmnXml,metaInfo}。" + + "草稿不存在或编辑源为空 → {found:false}(HTTP 200,前端降级)。") + public ResponseEntity> get(@PathVariable String id) { + Map resp = new LinkedHashMap<>(); + Model model = repositoryService.getModel(id); + if (model == null) { + resp.put("found", false); + return ResponseEntity.ok(resp); + } + byte[] source = repositoryService.getModelEditorSource(id); + if (source == null) { + resp.put("found", false); + return ResponseEntity.ok(resp); + } + resp.put("found", true); + resp.put("id", model.getId()); + resp.put("name", model.getName()); + resp.put("key", model.getKey()); + resp.put("bpmnXml", new String(source, StandardCharsets.UTF_8)); + resp.put("metaInfo", model.getMetaInfo()); + return ResponseEntity.ok(resp); + } + + @PostMapping("/models") + @Operation(summary = "建草稿", + description = "body {name,key,bpmnXml,metaInfo?}。XML 先过 BpmnXMLConverter 解析守卫(坏 XML→422 不落库)," + + "过门后 newModel+saveModel+addModelEditorSource → {modelId}。") + public ResponseEntity> create(@RequestBody CreateModelRequest req) { + ResponseEntity> rejected = parseGuard(req.bpmnXml); + if (rejected != null) { + return rejected; + } + Model model = repositoryService.newModel(); + model.setName(req.name); + model.setKey(req.key); + if (req.metaInfo != null) { + model.setMetaInfo(req.metaInfo); + } + repositoryService.saveModel(model); + repositoryService.addModelEditorSource(model.getId(), req.bpmnXml.getBytes(StandardCharsets.UTF_8)); + Map resp = new LinkedHashMap<>(); + resp.put("modelId", model.getId()); + return ResponseEntity.ok(resp); + } + + @PutMapping("/models/{id}") + @Operation(summary = "更新草稿", + description = "草稿不存在→404;更新 name/metaInfo(仅当请求提供,避免覆盖 eip4IdMap)与 editorSource(XML 同守卫 422) → {status:0}。") + public ResponseEntity> update(@PathVariable String id, @RequestBody UpdateModelRequest req) { + Model model = repositoryService.getModel(id); + if (model == null) { + return status(HttpStatus.NOT_FOUND, "草稿不存在: " + id); + } + ResponseEntity> rejected = parseGuard(req.bpmnXml); + if (rejected != null) { + return rejected; + } + if (req.name != null) { + model.setName(req.name); + } + // metaInfo 仅当请求显式提供时更新:草稿存 eip4IdMap 于 metaInfo,普通保存不重发 metaInfo 时不能抹掉它。 + if (req.metaInfo != null) { + model.setMetaInfo(req.metaInfo); + } + repositoryService.saveModel(model); + repositoryService.addModelEditorSource(id, req.bpmnXml.getBytes(StandardCharsets.UTF_8)); + Map resp = new LinkedHashMap<>(); + resp.put("status", 0); + return ResponseEntity.ok(resp); + } + + @PostMapping("/models/from-procdef") + @Operation(summary = "从流程定义建草稿", + description = "body {procDefId}。读部署 BPMN → BpmnIdSanitizer.sanitize 净化中文 id → 建草稿" + + "(name/key=procDef,editorSource=净化 XML,metaInfo={eip4IdMap,sourceProcDefId,originalKey}) → {modelId}。" + + "procDef 不存在或 BPMN 空 → {found:false}(HTTP 200,前端降级)。") + public ResponseEntity> fromProcDef(@RequestBody FromProcDefRequest req) { + ProcessDefinition def = repositoryService.createProcessDefinitionQuery() + .processDefinitionId(req.procDefId).singleResult(); + if (def == null) { + return found(false); + } + String bpmnXml = readProcessModel(req.procDefId); + if (bpmnXml == null || bpmnXml.isBlank()) { + return found(false); + } + BpmnIdSanitizer.Result r = BpmnIdSanitizer.sanitize(bpmnXml); + + Map meta = new LinkedHashMap<>(); + meta.put("eip4IdMap", r.idMap()); + meta.put("sourceProcDefId", req.procDefId); + meta.put("originalKey", def.getKey()); + String metaInfoJson; + try { + metaInfoJson = objectMapper.writeValueAsString(meta); + } catch (Exception e) { + // 纯 Map 序列化理论上不会失败;防御性 500 + log.error("[流程草稿] metaInfo 序列化失败 procDefId={}", req.procDefId, e); + return status(HttpStatus.INTERNAL_SERVER_ERROR, "metaInfo 序列化失败"); + } + + Model model = repositoryService.newModel(); + model.setName(def.getName()); + model.setKey(def.getKey()); + model.setMetaInfo(metaInfoJson); + repositoryService.saveModel(model); + repositoryService.addModelEditorSource(model.getId(), r.xml().getBytes(StandardCharsets.UTF_8)); + Map resp = new LinkedHashMap<>(); + resp.put("modelId", model.getId()); + return ResponseEntity.ok(resp); + } + + /** + * BPMN 解析守卫:过则返回 {@code null}(放行),坏 XML 返回 422 ResponseEntity({status:1,msg})。 + * 就地 catch 一切异常,不让引擎 XMLException/FlowableException 逸出到全局 advice(那里映射成 400,语义不符)。 + */ + private ResponseEntity> parseGuard(String xml) { + try { + new BpmnXMLConverter().convertToBpmnModel(new StringStreamSource(xml), true, false); + return null; + } catch (Exception e) { + log.warn("[流程草稿] BPMN 解析守卫拒绝: {}", e.toString()); + Map body = new LinkedHashMap<>(); + body.put("status", 1); + body.put("msg", "BPMN 解析失败: " + e.getMessage()); + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body(body); + } + } + + /** 读流程定义部署 BPMN XML(getProcessModel 返回资源流)。读失败/为空返回 null(前端降级)。 */ + private String readProcessModel(String procDefId) { + try (InputStream is = repositoryService.getProcessModel(procDefId)) { + if (is == null) { + return null; + } + return StreamUtils.copyToString(is, StandardCharsets.UTF_8); + } catch (Exception e) { + log.warn("[流程草稿] 读取 BPMN 失败 procDefId={}: {}", procDefId, e.toString()); + return null; + } + } + + private static ResponseEntity> found(boolean value) { + Map resp = new LinkedHashMap<>(); + resp.put("found", value); + return ResponseEntity.ok(resp); + } + + private static ResponseEntity> status(HttpStatus httpStatus, String msg) { + Map body = new LinkedHashMap<>(); + body.put("status", 1); + body.put("msg", msg); + return ResponseEntity.status(httpStatus).body(body); + } + + /** {@link Date} → ISO-8601 UTC 字符串(如 {@code 1970-01-01T00:00:00Z});null 原样透传。 */ + private static String toIso(Date d) { + return d == null ? null : d.toInstant().toString(); + } + + /** 建草稿入参。 */ + public static class CreateModelRequest { + public String name; + public String key; + public String bpmnXml; + public String metaInfo; + } + + /** 更新草稿入参(editorSource 走 bpmnXml;name/metaInfo 为 null 表示不改)。 */ + public static class UpdateModelRequest { + public String name; + public String bpmnXml; + public String metaInfo; + } + + /** 从流程定义建草稿入参。 */ + public static class FromProcDefRequest { + public String procDefId; + } +} diff --git a/flowable-service/src/test/java/com/eip4/flowservice/api/ProcessModelControllerTest.java b/flowable-service/src/test/java/com/eip4/flowservice/api/ProcessModelControllerTest.java new file mode 100644 index 0000000..705e85b --- /dev/null +++ b/flowable-service/src/test/java/com/eip4/flowservice/api/ProcessModelControllerTest.java @@ -0,0 +1,281 @@ +package com.eip4.flowservice.api; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import java.io.ByteArrayInputStream; +import java.nio.charset.StandardCharsets; +import java.util.Date; +import java.util.List; + +import org.flowable.engine.RepositoryService; +import org.flowable.engine.repository.Model; +import org.flowable.engine.repository.ModelQuery; +import org.flowable.engine.repository.ProcessDefinition; +import org.flowable.engine.repository.ProcessDefinitionQuery; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; + +/** + * 流程草稿 CRUD 端点薄层单测:mock RepositoryService + Model API(newModel/saveModel/addModelEditorSource/ + * getModelEditorSource/createModelQuery),验证列表/取草稿/建草稿(坏 XML 不落库)/PUT 404/from-procdef + * 净化 XML 与 idMap 落 metaInfo。standaloneSetup 不挂 FlowExceptionHandler——422/404 由控制器本地 ResponseEntity + * 显式产出(不经引擎异常映射)。 + */ +@ExtendWith(MockitoExtension.class) +class ProcessModelControllerTest { + + @Mock RepositoryService repositoryService; + @Mock ModelQuery modelQuery; + @Mock ProcessDefinitionQuery processDefinitionQuery; + + MockMvc mvc; + + // 最小 schema 合法 BPMN(default ns=BPMN20 MODEL),供 convertToBpmnModel(validateSchema=true) 过门。 + private static final String VALID_BPMN = "" + + "" + + "" + + "" + + "" + + "" + + ""; + + @BeforeEach + void setUp() { + ProcessModelController controller = new ProcessModelController(repositoryService); + mvc = MockMvcBuilders.standaloneSetup(controller).build(); + } + + @Test + void 列表按最近更新降序返回id名key时间() throws Exception { + Model m = Mockito.mock(Model.class); + when(m.getId()).thenReturn("m1"); + when(m.getName()).thenReturn("总包合同交底"); + when(m.getKey()).thenReturn("总包合同交底"); + when(m.getLastUpdateTime()).thenReturn(new Date(0L)); // 1970-01-01T00:00:00Z + when(repositoryService.createModelQuery()).thenReturn(modelQuery); + when(modelQuery.orderByLastUpdateTime()).thenReturn(modelQuery); + when(modelQuery.desc()).thenReturn(modelQuery); + when(modelQuery.list()).thenReturn(List.of(m)); + + mvc.perform(get("/api/flow/models")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.models[0].id").value("m1")) + .andExpect(jsonPath("$.models[0].name").value("总包合同交底")) + .andExpect(jsonPath("$.models[0].key").value("总包合同交底")) + .andExpect(jsonPath("$.models[0].lastUpdateTime").value("1970-01-01T00:00:00Z")); + } + + @Test + void 取草稿返回XML与metaInfo() throws Exception { + Model m = Mockito.mock(Model.class); + when(m.getId()).thenReturn("m1"); + when(m.getName()).thenReturn("总包合同交底"); + when(m.getKey()).thenReturn("总包合同交底"); + when(m.getMetaInfo()).thenReturn("{\"eip4IdMap\":{\"总包合同交底\":\"n1\"}}"); + when(repositoryService.getModel("m1")).thenReturn(m); + when(repositoryService.getModelEditorSource("m1")) + .thenReturn("".getBytes(StandardCharsets.UTF_8)); + + mvc.perform(get("/api/flow/models/m1")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.found").value(true)) + .andExpect(jsonPath("$.id").value("m1")) + .andExpect(jsonPath("$.key").value("总包合同交底")) + .andExpect(jsonPath("$.bpmnXml").value("")) + .andExpect(jsonPath("$.metaInfo").value("{\"eip4IdMap\":{\"总包合同交底\":\"n1\"}}")); + } + + @Test + void 取草稿_model不存在返found_false() throws Exception { + when(repositoryService.getModel("nope")).thenReturn(null); + + mvc.perform(get("/api/flow/models/nope")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.found").value(false)); + } + + @Test + void 取草稿_editorSource为空返found_false() throws Exception { + Model m = Mockito.mock(Model.class); + when(repositoryService.getModel("m2")).thenReturn(m); + when(repositoryService.getModelEditorSource("m2")).thenReturn(null); + + mvc.perform(get("/api/flow/models/m2")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.found").value(false)); + } + + @Test + void 建草稿_合法XML落库返modelId() throws Exception { + Model m = Mockito.mock(Model.class); + when(m.getId()).thenReturn("newid"); + when(repositoryService.newModel()).thenReturn(m); + + String body = "{\"name\":\"新流程\",\"key\":\"newproc\",\"bpmnXml\":" + + jsonString(VALID_BPMN) + ",\"metaInfo\":\"{}\"}"; + mvc.perform(post("/api/flow/models").contentType(MediaType.APPLICATION_JSON).content(body)) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.modelId").value("newid")); + + verify(m).setName("新流程"); + verify(m).setKey("newproc"); + verify(repositoryService).saveModel(m); + ArgumentCaptor src = ArgumentCaptor.forClass(byte[].class); + verify(repositoryService).addModelEditorSource(eq("newid"), src.capture()); + org.junit.jupiter.api.Assertions.assertTrue( + new String(src.getValue(), StandardCharsets.UTF_8).contains("" + + "" + + "" + + ""; + when(repositoryService.getProcessModel("def-1")) + .thenReturn(new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8))); + + Model m = Mockito.mock(Model.class); + when(m.getId()).thenReturn("draft-1"); + when(repositoryService.newModel()).thenReturn(m); + + String body = "{\"procDefId\":\"def-1\"}"; + mvc.perform(post("/api/flow/models/from-procdef").contentType(MediaType.APPLICATION_JSON).content(body)) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.modelId").value("draft-1")); + + verify(m).setName("总包合同交底"); + verify(m).setKey("总包合同交底"); + // metaInfo:JSON 含 eip4IdMap + sourceProcDefId + 中文 originalKey + ArgumentCaptor meta = ArgumentCaptor.forClass(String.class); + verify(m).setMetaInfo(meta.capture()); + String metaJson = meta.getValue(); + org.junit.jupiter.api.Assertions.assertTrue(metaJson.contains("eip4IdMap"), metaJson); + org.junit.jupiter.api.Assertions.assertTrue(metaJson.contains("\"sourceProcDefId\":\"def-1\""), metaJson); + org.junit.jupiter.api.Assertions.assertTrue(metaJson.contains("\"originalKey\":\"总包合同交底\""), metaJson); + org.junit.jupiter.api.Assertions.assertTrue(metaJson.contains("总包合同交底"), metaJson); // idMap 键含中文原 id + // editorSource:净化后 XML 不再含中文 id(id/ref 属性),name 保留中文 + ArgumentCaptor src = ArgumentCaptor.forClass(byte[].class); + verify(repositoryService).addModelEditorSource(eq("draft-1"), src.capture()); + String savedXml = new String(src.getValue(), StandardCharsets.UTF_8); + org.junit.jupiter.api.Assertions.assertFalse(savedXml.contains("id=\"总包合同交底\""), savedXml); + org.junit.jupiter.api.Assertions.assertFalse(savedXml.contains("sourceRef=\"总包合同交底\""), savedXml); + org.junit.jupiter.api.Assertions.assertTrue(savedXml.contains("name=\"总包合同交底\""), savedXml); + } + + @Test + void fromProcDef_procDef不存在返found_false不落库() throws Exception { + when(repositoryService.createProcessDefinitionQuery()).thenReturn(processDefinitionQuery); + when(processDefinitionQuery.processDefinitionId("nope")).thenReturn(processDefinitionQuery); + when(processDefinitionQuery.singleResult()).thenReturn(null); + + mvc.perform(post("/api/flow/models/from-procdef") + .contentType(MediaType.APPLICATION_JSON).content("{\"procDefId\":\"nope\"}")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.found").value(false)); + + verify(repositoryService, never()).newModel(); + } + + /** 把任意字符串编成 JSON 字符串字面量(转义引号/反斜杠/换行),用于拼请求体。 */ + private static String jsonString(String s) { + StringBuilder sb = new StringBuilder("\""); + for (int i = 0; i < s.length(); i++) { + char c = s.charAt(i); + switch (c) { + case '"' -> sb.append("\\\""); + case '\\' -> sb.append("\\\\"); + case '\n' -> sb.append("\\n"); + case '\r' -> sb.append("\\r"); + case '\t' -> sb.append("\\t"); + default -> sb.append(c); + } + } + return sb.append("\"").toString(); + } +} From 93b5433f1e4e4ae55b2b4e4e78704ffce041043f Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 2 Jul 2026 11:18:53 +0800 Subject: [PATCH 02/11] =?UTF-8?q?docs(plan):=20=E5=9B=9E=E5=86=99=20T2.3?= =?UTF-8?q?=20=E5=AE=9E=E8=AF=81=E2=80=94=E2=80=94=E8=A1=A8=E8=BE=BE?= =?UTF-8?q?=E5=BC=8F=20meta=205=20=E5=AD=97=E6=AE=B5=E9=80=8F=E4=BC=A0?= =?UTF-8?q?=E4=B8=BA=20T2.4=20=E6=AD=A3=E7=A1=AE=E6=80=A7=E7=A1=AC?= =?UTF-8?q?=E8=A6=81=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Fable 5 --- docs/plans/2026-07-02-在线流程Modeler-实施计划.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/plans/2026-07-02-在线流程Modeler-实施计划.md b/docs/plans/2026-07-02-在线流程Modeler-实施计划.md index d025b07..fcad0db 100644 --- a/docs/plans/2026-07-02-在线流程Modeler-实施计划.md +++ b/docs/plans/2026-07-02-在线流程Modeler-实施计划.md @@ -255,7 +255,9 @@ commit:`feat(modeler): 办理人/会签表达式编解码器(与 BasePropertie ### Task 2.4 前端:EIP4 侧板(办理人/会签/formKey/扩展属性/监听器) -> 📌 **随本 task 顺带收 T1.5 评审两小项**:①红线回归测试——ProcessModelerPage 测试断言 `ModelerCtor.mock.calls[0][0].moddleExtensions` 键恰为 `['activiti']` 且 `additionalModules` 长度为 2(防有人「顺手」加 provider 静默回归);②canvas ref 为 null 分支也 set error(现停留 loading 无提示)。 +> 🔴 **T2.3 实证——meta 透传是正确性硬要求**:真实表达式外层对象除 items 外还有 5 个业务 meta 字段(messageTemplate/taskSuccessService/isSkipInitiator/isNoUserSkip/isSkipBeforeTask;taskSuccessService 是真实任务后置服务钩子如 PM_CONTRACTUALREGISTER_UPDATEPROJECTSTATUS)。codec 的 parse 已返 `{items,variant,meta}`、build 收 meta 可选参——**侧板写回办理人/会签时必须把 parse 出的 meta 原样传回 build**,否则发布会打掉已部署流程的业务字段。测试必须含「改 items 后 meta 逐字保留」用例。 +> +> 📌 **随本 task 顺带收 T1.5 评审遗留**:红线回归测试——ProcessModelerPage 测试断言 `ModelerCtor.mock.calls[0][0].moddleExtensions` 键恰为 `['activiti']` 且 `additionalModules` 长度为 2(防「顺手」加 provider 静默回归)。(canvas ref null 分支已随 dffd1f3 修复,勿重复。) **Files:** - Create: `src/modeler/Eip4Panel.tsx`(+`Eip4Panel.test.tsx`)、`src/modeler/useSelectedElement.ts`(订阅 `selection.changed`) From b89447556f2e9b9560fcdaba9a19fe22bc619253 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 2 Jul 2026 11:32:26 +0800 Subject: [PATCH 03/11] =?UTF-8?q?fix(flow):=20=E8=8D=89=E7=A8=BF=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=99=A8=E8=AF=84=E5=AE=A1=E6=94=B6=E5=8F=A3=E2=80=94?= =?UTF-8?q?=E2=80=94safeBpmnXml+category=E8=BF=87=E6=BB=A4=E5=AD=98?= =?UTF-8?q?=E9=87=8F+metaInfo=E4=BF=9D=E6=8C=81=E5=9B=9E=E5=BD=92=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 评审跟进 7 项(评审者反编译 Flowable 6.8.1 实证): - I-1(安全):parseGuard convertToBpmnModel 第三参 enableSafeBpmnXml false→true, 启用 flowable 加固解析器(禁外部 DTD/参数实体/DOCTYPE)关 XXE/SSRF 面;javadoc 写明两布尔参语义。 - I-2(列表污染):库里 143 条存量 act_re_model(老 shape+悬空 editorSource)会进草稿列表打不开。 create/from-procdef 建 model 时 setCategory("eip4");list() 改 modelCategory("eip4") 只查本分类。 - I-3(回归契约):加「PUT 只带 name 不带 metaInfo→verify never setMetaInfo」用例,钉住 eip4IdMap 不被普通保存抹掉(T3.1 发布逆向还原原 key 的命根)。 - M-1:class javadoc 补「裸 8089 无鉴权,写端点必须经网关超管门访问(T2.2),生产 8089 不对外」。 - M-2:parseGuard 422 msg 改通用文案「BPMN 解析失败」,原始 e.getMessage 只进 log.warn(防内部细节回显)。 - M-3:POST create 对空白 name/key 返 422(key 是 T3.1 部署资源名/还原依赖),在解析守卫前拦;加测试。 - M-4:补 from-procdef「BPMN 读取为空(getProcessModel null)→found:false 不落库」分支测试。 测试:ProcessModelControllerTest 11→14 例(新增 空白 name/key 422 不落库、只带 name 不改 metaInfo、 BPMN 读空 found:false;既有列表用例补 modelCategory 断言、建草稿/from-procdef 补 setCategory 断言)。 flowable-service 全模块 87 测试绿(新增 3,既有其他模块测试零改动)。 Co-Authored-By: Claude Fable 5 --- .../api/ProcessModelController.java | 45 ++++++++++++--- .../api/ProcessModelControllerTest.java | 56 ++++++++++++++++++- 2 files changed, 91 insertions(+), 10 deletions(-) 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 6636dc3..a9613c4 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 @@ -38,11 +38,18 @@ import io.swagger.v3.oas.annotations.tags.Tag; * 不进部署库;发布(T3.1)时才 restore 中文原 key + 校验门 + deploy。act_re_model 表已有 143 行存量、schema 已在, * {@code databaseSchemaUpdate=false} 不涉 DDL。

* - *

写入前 XML 一律过 {@link BpmnXMLConverter} 解析守卫(validateSchema=true):坏 XML 返 422 且绝不落库。 + *

存量隔离:本控制器建的草稿一律 {@code setCategory("eip4")},{@link #list()} 只查该分类, + * 库里 143 条老 shape act_re_model(旧 metaInfo + 可能悬空 editorSource)不进 Modeler 列表、避免打不开。

+ * + *

写入前 XML 一律过 {@link BpmnXMLConverter} 解析守卫(validateSchema=true + enableSafeBpmnXml=true, + * 后者关外部 DTD/实体解析,防 XXE/SSRF):坏 XML 返 422 且绝不落库;422 只回通用文案,原始解析原因仅进日志。 * 守卫异常在本控制器就地 catch 转 422,不逸出到 {@code FlowExceptionHandler}(那里 FlowableException→400,语义不符)。 * {@code from-procdef} 复用「按 procDefId 读部署 BPMN」逻辑(本控制器自带 {@link #readProcessModel} 小方法, * 零改动 ProcessDiagramController)→ {@link BpmnIdSanitizer#sanitize} 净化中文 id → 建草稿, * 原→净化映射连同源 procDefId/原 key 写进 metaInfo,供发布逆向还原。

+ * + *

鉴权:本控制器随 flowable-service 跑在裸 8089,进程本身无鉴权栈;所有写端点 + * (POST/PUT/from-procdef)必须经 platform-flow-gateway 的超管门访问(T2.2),生产环境 8089 不对外暴露。

*/ @RestController @RequestMapping("/api/flow") @@ -51,6 +58,9 @@ public class ProcessModelController { private static final Logger log = LoggerFactory.getLogger(ProcessModelController.class); + /** EIP4 草稿分类:建草稿时打此标,list() 只查此分类,隔离库里 143 条老 shape 存量 act_re_model。 */ + static final String EIP4_CATEGORY = "eip4"; + private final RepositoryService repositoryService; private final ObjectMapper objectMapper = new ObjectMapper(); @@ -60,9 +70,11 @@ public class ProcessModelController { @GetMapping("/models") @Operation(summary = "草稿列表", - description = "createModelQuery().orderByLastUpdateTime().desc() → {models:[{id,name,key,lastUpdateTime(ISO)}]}。") + description = "createModelQuery().modelCategory(\"eip4\").orderByLastUpdateTime().desc() → " + + "{models:[{id,name,key,lastUpdateTime(ISO)}]}。只列 EIP4 建的草稿,隔离存量 act_re_model。") public ResponseEntity> list() { List> models = repositoryService.createModelQuery() + .modelCategory(EIP4_CATEGORY) .orderByLastUpdateTime().desc().list().stream() .map(m -> { Map row = new LinkedHashMap<>(); @@ -105,9 +117,13 @@ public class ProcessModelController { @PostMapping("/models") @Operation(summary = "建草稿", - description = "body {name,key,bpmnXml,metaInfo?}。XML 先过 BpmnXMLConverter 解析守卫(坏 XML→422 不落库)," - + "过门后 newModel+saveModel+addModelEditorSource → {modelId}。") + description = "body {name,key,bpmnXml,metaInfo?}。name/key 空白→422;XML 过 BpmnXMLConverter 解析守卫" + + "(坏 XML→422 不落库);过门后 newModel+setCategory(eip4)+saveModel+addModelEditorSource → {modelId}。") public ResponseEntity> create(@RequestBody CreateModelRequest req) { + // key 是 T3.1 部署资源名/中文原 key 还原的依赖,name 用于列表展示:空白一律拒。 + if (isBlank(req.name) || isBlank(req.key)) { + return status(HttpStatus.UNPROCESSABLE_ENTITY, "name 与 key 不能为空"); + } ResponseEntity> rejected = parseGuard(req.bpmnXml); if (rejected != null) { return rejected; @@ -115,6 +131,7 @@ public class ProcessModelController { Model model = repositoryService.newModel(); model.setName(req.name); model.setKey(req.key); + model.setCategory(EIP4_CATEGORY); if (req.metaInfo != null) { model.setMetaInfo(req.metaInfo); } @@ -184,6 +201,7 @@ public class ProcessModelController { Model model = repositoryService.newModel(); model.setName(def.getName()); model.setKey(def.getKey()); + model.setCategory(EIP4_CATEGORY); model.setMetaInfo(metaInfoJson); repositoryService.saveModel(model); repositoryService.addModelEditorSource(model.getId(), r.xml().getBytes(StandardCharsets.UTF_8)); @@ -195,17 +213,21 @@ public class ProcessModelController { /** * BPMN 解析守卫:过则返回 {@code null}(放行),坏 XML 返回 422 ResponseEntity({status:1,msg})。 * 就地 catch 一切异常,不让引擎 XMLException/FlowableException 逸出到全局 advice(那里映射成 400,语义不符)。 + * + *

{@code convertToBpmnModel(source, validateSchema, enableSafeBpmnXml)} 两布尔参: + * {@code validateSchema=true} 走 BPMN 2.0 XSD 校验(拒非法结构); + * {@code enableSafeBpmnXml=true} 启用 flowable 加固解析器(禁外部 DTD/参数实体/DOCTYPE), + * 关掉 XXE/SSRF 面——校验路径也走加固解析器,不给外部实体注入留口。

+ * + *

422 只回通用文案;原始解析原因(可能含内部路径/实体细节)仅进 {@code log.warn},不回显给调用方。

*/ private ResponseEntity> parseGuard(String xml) { try { - new BpmnXMLConverter().convertToBpmnModel(new StringStreamSource(xml), true, false); + new BpmnXMLConverter().convertToBpmnModel(new StringStreamSource(xml), true, true); return null; } catch (Exception e) { log.warn("[流程草稿] BPMN 解析守卫拒绝: {}", e.toString()); - Map body = new LinkedHashMap<>(); - body.put("status", 1); - body.put("msg", "BPMN 解析失败: " + e.getMessage()); - return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body(body); + return status(HttpStatus.UNPROCESSABLE_ENTITY, "BPMN 解析失败"); } } @@ -240,6 +262,11 @@ public class ProcessModelController { return d == null ? null : d.toInstant().toString(); } + /** null 或纯空白(含全角/半角空格)视为空白。 */ + private static boolean isBlank(String s) { + return s == null || s.isBlank(); + } + /** 建草稿入参。 */ public static class CreateModelRequest { public String name; diff --git a/flowable-service/src/test/java/com/eip4/flowservice/api/ProcessModelControllerTest.java b/flowable-service/src/test/java/com/eip4/flowservice/api/ProcessModelControllerTest.java index 705e85b..aa5e2a2 100644 --- a/flowable-service/src/test/java/com/eip4/flowservice/api/ProcessModelControllerTest.java +++ b/flowable-service/src/test/java/com/eip4/flowservice/api/ProcessModelControllerTest.java @@ -64,13 +64,14 @@ class ProcessModelControllerTest { } @Test - void 列表按最近更新降序返回id名key时间() throws Exception { + void 列表只查eip4分类并按最近更新降序返回id名key时间() throws Exception { Model m = Mockito.mock(Model.class); when(m.getId()).thenReturn("m1"); when(m.getName()).thenReturn("总包合同交底"); when(m.getKey()).thenReturn("总包合同交底"); when(m.getLastUpdateTime()).thenReturn(new Date(0L)); // 1970-01-01T00:00:00Z when(repositoryService.createModelQuery()).thenReturn(modelQuery); + when(modelQuery.modelCategory("eip4")).thenReturn(modelQuery); when(modelQuery.orderByLastUpdateTime()).thenReturn(modelQuery); when(modelQuery.desc()).thenReturn(modelQuery); when(modelQuery.list()).thenReturn(List.of(m)); @@ -81,6 +82,9 @@ class ProcessModelControllerTest { .andExpect(jsonPath("$.models[0].name").value("总包合同交底")) .andExpect(jsonPath("$.models[0].key").value("总包合同交底")) .andExpect(jsonPath("$.models[0].lastUpdateTime").value("1970-01-01T00:00:00Z")); + + // 列表只列 EIP4 建的草稿:隔离库里 143 条老 shape 存量 act_re_model(打不开) + verify(modelQuery).modelCategory("eip4"); } @Test @@ -137,6 +141,7 @@ class ProcessModelControllerTest { verify(m).setName("新流程"); verify(m).setKey("newproc"); + verify(m).setCategory("eip4"); // 建草稿打 EIP4 分类,供 list() 过滤隔离存量 verify(repositoryService).saveModel(m); ArgumentCaptor src = ArgumentCaptor.forClass(byte[].class); verify(repositoryService).addModelEditorSource(eq("newid"), src.capture()); @@ -144,6 +149,19 @@ class ProcessModelControllerTest { new String(src.getValue(), StandardCharsets.UTF_8).contains(" meta = ArgumentCaptor.forClass(String.class); verify(m).setMetaInfo(meta.capture()); @@ -262,6 +299,23 @@ class ProcessModelControllerTest { verify(repositoryService, never()).newModel(); } + @Test + void fromProcDef_BPMN读取为空返found_false不落库() throws Exception { + // procDef 存在但部署 BPMN 资源读不出(getProcessModel 返 null)→ 降级 found:false,不建空草稿。 + ProcessDefinition def = Mockito.mock(ProcessDefinition.class); + when(repositoryService.createProcessDefinitionQuery()).thenReturn(processDefinitionQuery); + when(processDefinitionQuery.processDefinitionId("def-empty")).thenReturn(processDefinitionQuery); + when(processDefinitionQuery.singleResult()).thenReturn(def); + when(repositoryService.getProcessModel("def-empty")).thenReturn(null); + + mvc.perform(post("/api/flow/models/from-procdef") + .contentType(MediaType.APPLICATION_JSON).content("{\"procDefId\":\"def-empty\"}")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.found").value(false)); + + verify(repositoryService, never()).newModel(); + } + /** 把任意字符串编成 JSON 字符串字面量(转义引号/反斜杠/换行),用于拼请求体。 */ private static String jsonString(String s) { StringBuilder sb = new StringBuilder("\""); From 4abe9f8ce6e6fd1a7f6d24081617646965b2777d Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 2 Jul 2026 11:48:29 +0800 Subject: [PATCH 04/11] =?UTF-8?q?docs(plan):=20=E5=9B=9E=E5=86=99=20T2.4?= =?UTF-8?q?=20=E8=AF=84=E5=AE=A1=E2=80=94=E2=80=94T3.2=20=E8=AF=AD?= =?UTF-8?q?=E4=B9=89=E6=A0=A1=E9=AA=8C=E5=8A=A0=20items=20=E9=9D=9E?= =?UTF-8?q?=E7=A9=BA=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=8F=A3=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Fable 5 --- docs/plans/2026-07-02-在线流程Modeler-实施计划.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/plans/2026-07-02-在线流程Modeler-实施计划.md b/docs/plans/2026-07-02-在线流程Modeler-实施计划.md index fcad0db..5e22e7d 100644 --- a/docs/plans/2026-07-02-在线流程Modeler-实施计划.md +++ b/docs/plans/2026-07-02-在线流程Modeler-实施计划.md @@ -301,6 +301,8 @@ commit:`feat(flow): 草稿发布(id还原+ProcessValidator校验门)+影响摘 ### Task 3.2 网关:EIP4 语义校验 + 部署审计(Flyway V4) +> 📌 **T2.4 评审补充**:语义校验白名单须加两条——①办理人/会签表达式的 `items` **非空**(`items:[]` 的 MI collection 运行期会炸,仅 JSON 可解析+type 白名单不够);②completionCondition 允许「三预设 或 保留的自定义 body」(T2.4 已实现自定义保留态,校验别把存量自定义条件拒了,白名单改为预设正则 ∪ 非空任意表达式加告警)。 + **Files:** - Create: `platform-flow-gateway/.../aggregate/ModelSemanticValidator.java` + test:解析 XML(**照 WfTemplateService.newJdkDbf :116-135 钉 JDK 解析器**,防 xerces 击穿)→ ①每个 `activiti:candidateUsers`/multiInstance collection 的内嵌 JSON 可解析且 items[].type ∈ 白名单 ②`activiti:formKey` 存在于 view_wftemplate(JdbcTemplate exists)③completionCondition 匹配预设白名单正则。返回 `List errors`。 - Create: `platform-app/src/main/resources/db/migration/V4__flow_deploy_audit.sql`(照 V3 风格):`sys_flow_deploy_audit(id bigserial pk, model_id, deployment_id, process_key, new_version int, operator varchar(64), deployed_at timestamp default now())` From b489f3d834d8d5fd296b366644c835a965f7fb1d Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 2 Jul 2026 11:48:30 +0800 Subject: [PATCH 05/11] =?UTF-8?q?feat(gateway):=20models=20=E4=BA=94?= =?UTF-8?q?=E7=AB=AF=E7=82=B9=E8=BD=AC=E5=8F=91(requireSuperAdmin=20?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E9=97=A8)+wftemplates=20picker=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 阶段 2 网关侧(对齐 flowable-service T2.1 ProcessModelController 契约): FlowableClient +5 方法:listModels/getModel/createModel/updateModel/modelFromProcDef, 全 uri 模板变量严格编码(禁字符串拼接);RestClient 无 PUT 封装 → 照 post 补私有 put() (uriTemplate+uriVars 严格编码);连接级重试 + 4xx/5xx 透传语义复用既有 execute。 ProcessModelerController:抽 requireSuperAdmin(principal) 私有方法(超管返 null,非超管/无身份 返 403 {status:1,msg:"仅系统管理员可用"}),既有两个 source 端点改用它(行为零变,既有 10 测试零改动); 新增五端点 GET /models、GET /models/{id}、POST /models、PUT /models/{id}、POST /models/from-procdef 全部先过门再转发 FlowableClient,返回体原样透传。 GET /api/workflow/wftemplates(同门):formKey 选择器数据源。 **information_schema 实证**:view_wftemplate 无独立名称列(仅 view_wftemplate_id CHAR + xml + isactive + 审计列),
根标签也无 title/name 属性(0/1016);唯一人类可读名来自 XML 的 entityid → sys_entity.name(378/1016 带 entityid,339 解析出中文名如「通知管理」)。故 name = entityid 解析出的实体名(LEFT JOIN + substring 正则抽 entityid),空则回退 id; view_wftemplate_id 是 CHAR 补白 → RowMapper trim;isactive=1 过滤;读库异常降级空列表不 500。 测试:FlowableClientTest 12→18(+list/get/create/update/from-procdef body 透传+4xx 透传); ProcessModelerControllerTest 10→20(五端点各 admin 200 透传+非超管 403 门拦下游 恰调 1 次证明门生效、 无身份 403、422 胶水经 FlowGatewayExceptionHandler 出 FLOW_REMOTE_ERROR、wftemplates 超管 trim 补白+ 无名回退 id、非超管 403 零读库、读库异常降级空列表)。platform-flow-gateway 全模块 98 测试绿、 上游 493 测试绿,BUILD SUCCESS,既有测试零改动。 Co-Authored-By: Claude Fable 5 --- .../flowgateway/client/FlowableClient.java | 69 ++++++++ .../web/ProcessModelerController.java | 166 ++++++++++++++++-- .../flowgateway/FlowableClientTest.java | 119 +++++++++++++ .../ProcessModelerControllerTest.java | 160 ++++++++++++++++- 4 files changed, 502 insertions(+), 12 deletions(-) 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 664813f..50b0bc4 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 @@ -260,6 +260,63 @@ public class FlowableClient { .body(Map.class)); } + // ---------------------------------------------------------------- 草稿 Model API 转发(T2.2) + + /** + * 草稿列表。对应 flowable-service {@code GET /api/flow/models},返回体 + * {@code {models:[{id,name,key,lastUpdateTime}]}} 原样透传(flowable-service 已按 EIP4 分类过滤)。 + */ + @SuppressWarnings("unchecked") + public Map listModels() { + return execute("草稿列表", () -> restClient.get() + .uri("/api/flow/models") + .retrieve() + .body(Map.class)); + } + + /** + * 取草稿(editorSource + metaInfo)。对应 flowable-service {@code GET /api/flow/models/{id}},返回体 + * {@code {found,id,name,key,bpmnXml,metaInfo}} 原样透传;草稿不存在下游返 {@code found:false}。 + * + *

{@code id} 走 uri 模板变量严格编码(禁字符串拼接)。

+ */ + @SuppressWarnings("unchecked") + public Map getModel(String id) { + return execute("取草稿", () -> restClient.get() + .uri("/api/flow/models/{id}", id) + .retrieve() + .body(Map.class)); + } + + /** + * 建草稿。对应 flowable-service {@code POST /api/flow/models},请求体 {@code {name,key,bpmnXml,metaInfo?}} + * 经 Jackson 序列化转发,返回 {@code {modelId}};坏 XML 下游 422 → {@link FlowRemoteException} 透传。 + */ + @SuppressWarnings("unchecked") + public Map createModel(Object body) { + return post("建草稿", "/api/flow/models", body, Map.class); + } + + /** + * 更新草稿。对应 flowable-service {@code PUT /api/flow/models/{id}},请求体 {@code {name?,bpmnXml,metaInfo?}} + * 经 Jackson 序列化转发,返回 {@code {status:0}};草稿不存在下游 404 / 坏 XML 422 → {@link FlowRemoteException} 透传。 + * + *

{@code id} 走 uri 模板变量严格编码(禁字符串拼接)。

+ */ + @SuppressWarnings("unchecked") + public Map updateModel(String id, Object body) { + return put("更新草稿", "/api/flow/models/{id}", body, Map.class, id); + } + + /** + * 从流程定义建草稿。对应 flowable-service {@code POST /api/flow/models/from-procdef},请求体 + * {@code {procDefId}} 经 Jackson 序列化转发,返回 {@code {modelId}};procDef 不存在下游返 {@code found:false}。 + */ + @SuppressWarnings("unchecked") + public Map modelFromProcDef(Object body) { + return post("从流程定义建草稿", "/api/flow/models/from-procdef", body, Map.class); + } + /** 按发起人查询历史流程实例。对应 flowable-service {@code GET /api/flow/process/started}。 */ public List started(String startedBy, int firstResult, int maxResults) { return execute("发起流程列表", () -> restClient.get() @@ -327,6 +384,18 @@ public class FlowableClient { .body(respType)); } + /** + * PUT 转发(RestClient 无既有封装 → 照 {@link #post} 补)。{@code uriTemplate}+{@code uriVars} 走 RestClient + * 严格编码({@code id} 作 uri 变量,禁字符串拼接);连接级重试 + 4xx/5xx 透传语义与 post 一致。 + */ + private T put(String op, String uriTemplate, Object body, Class respType, Object... uriVars) { + return execute(op, () -> restClient.put() + .uri(uriTemplate, uriVars) + .body(body == null ? Map.of() : body) + .retrieve() + .body(respType)); + } + /** * 统一执行:连接级故障带退避重试 maxRetries 次,耗尽 → 503 语义;业务错(4xx/5xx)立即透传不重试。 */ diff --git a/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/ProcessModelerController.java b/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/ProcessModelerController.java index a4e79c3..1f878f5 100644 --- a/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/ProcessModelerController.java +++ b/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/ProcessModelerController.java @@ -1,13 +1,21 @@ package com.eip4.platform.flowgateway.web; import java.util.LinkedHashMap; +import java.util.List; 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.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.RowMapper; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -22,22 +30,58 @@ import io.swagger.v3.oas.annotations.tags.Tag; * 在线流程 Modeler 网关门面:把 flowable-service 的流程定义/草稿能力经超管门暴露给设计器前端。 * *

flowable-service 裸 8089 无 Spring Security → 流程编辑/部署面的鉴权唯一落点在本网关层。 - * 本控制器所有端点先过超管门({@link EngineContextBinder#isSystemAdmin},与全站 {@code requireAdmin} - * 逐口径对齐),非超管返回 403,过门后转发 {@link FlowableClient},返回体原样透传。 + * 本控制器所有端点先过超管门({@link #requireSuperAdmin},委托 {@link EngineContextBinder#isSystemAdmin}, + * 与全站 {@code requireAdmin} 逐口径对齐),非超管返回 403,过门后转发 {@link FlowableClient},返回体原样透传。 * - *

阶段 1(T1.6):只读载入存量流程源 XML。草稿 CRUD / 发布门在后续阶段接入本控制器。 + *

阶段 1(T1.6):只读载入存量流程源 XML。阶段 2(T2.2):草稿 CRUD 五端点转发(list/get/create/update/ + * from-procdef,对齐 flowable-service {@code ProcessModelController} 契约)+ 办理人/会签 formKey 选择器数据源 + * {@code /wftemplates}(读业务库 {@code view_wftemplate})。发布门在阶段 3 接入。

*/ @Tag(name = "流程 Modeler 网关", description = "流程设计器:超管门 + flowable-service 转发(存量源载入/草稿/发布)") @RestController @RequestMapping("/api/workflow") public class ProcessModelerController { - private final FlowableClient flowableClient; + private static final Logger log = LoggerFactory.getLogger(ProcessModelerController.class); - public ProcessModelerController(FlowableClient flowableClient) { + /** + * formKey 选择器数据源:{@code view_wftemplate}(1016 行已迁移)。实证(information_schema): + * 表无独立名称列(仅 {@code view_wftemplate_id CHAR + xml + isactive + 审计列}),{@code } 根标签 + * 也无 title/name 属性(0/1016);唯一人类可读名来自 XML 的 {@code entityid} → {@code sys_entity.name} + * (378 模板带 entityid,339 解析出中文名,如「通知管理」)。故 name = 解析出的实体名,无则回退 id。 + * {@code view_wftemplate_id} 是 CHAR 补白列 → RowMapper 内 trim。 + */ + static final String WFTEMPLATES_SQL = + "SELECT t.view_wftemplate_id AS id, se.name AS name " + + "FROM view_wftemplate t " + + "LEFT JOIN sys_entity se " + + " ON se.sys_entity_id = substring(CAST(t.xml AS text) FROM 'entityid=\"([0-9a-fA-F-]+)\"') " + + "WHERE t.isactive = 1 " + + "ORDER BY se.name NULLS LAST, t.view_wftemplate_id"; + + /** 单行 → {@code {id(trim 补白),name(实体名,空则回退 id)}}。 */ + static final RowMapper> WFTEMPLATE_ROW = (rs, rowNum) -> { + String id = rs.getString("id"); + if (id != null) { + id = id.trim(); + } + String name = rs.getString("name"); + Map row = new LinkedHashMap<>(); + row.put("id", id); + row.put("name", (name != null && !name.isBlank()) ? name : id); + return row; + }; + + private final FlowableClient flowableClient; + private final JdbcTemplate jdbcTemplate; + + public ProcessModelerController(FlowableClient flowableClient, JdbcTemplate jdbcTemplate) { this.flowableClient = flowableClient; + this.jdbcTemplate = jdbcTemplate; } + // ---------------------------------------------------------------- 存量流程源载入(T1.6) + @Operation(summary = "按流程定义 id 取净化源 XML(超管)", description = "超管门后转发 flowable-service /api/flow/process-definitions/{procDefId}/source," + "返回 {procDefId, found, bpmnXml(净化后), idMap, procDefKey, version} 供 bpmn-js Modeler 载入。" @@ -45,8 +89,9 @@ public class ProcessModelerController { @GetMapping("/process-definitions/{procDefId}/source") public ResponseEntity> source(@AuthenticationPrincipal AuthPrincipal principal, @PathVariable String procDefId) { - if (!EngineContextBinder.isSystemAdmin(principal)) { - return forbidden(); + ResponseEntity> denied = requireSuperAdmin(principal); + if (denied != null) { + return denied; } return ResponseEntity.ok(flowableClient.procDefSource(procDefId)); } @@ -59,14 +104,113 @@ public class ProcessModelerController { @GetMapping("/process-definitions/by-key/{key}/source") public ResponseEntity> sourceByKey(@AuthenticationPrincipal AuthPrincipal principal, @PathVariable String key) { - if (!EngineContextBinder.isSystemAdmin(principal)) { - return forbidden(); + ResponseEntity> denied = requireSuperAdmin(principal); + if (denied != null) { + return denied; } return ResponseEntity.ok(flowableClient.procDefSourceByKey(key)); } - /** 超管门未过:403 + {status:1,msg} 风格对齐既有网关端点。 */ - private static ResponseEntity> forbidden() { + // ---------------------------------------------------------------- 草稿 CRUD 转发(T2.2) + + @Operation(summary = "草稿列表(超管)", + description = "超管门后转发 flowable-service GET /api/flow/models,返回 {models:[{id,name,key,lastUpdateTime}]}。") + @GetMapping("/models") + public ResponseEntity> listModels(@AuthenticationPrincipal AuthPrincipal principal) { + ResponseEntity> denied = requireSuperAdmin(principal); + if (denied != null) { + return denied; + } + return ResponseEntity.ok(flowableClient.listModels()); + } + + @Operation(summary = "取草稿(超管)", + description = "超管门后转发 flowable-service GET /api/flow/models/{id},返回 {found,id,name,key,bpmnXml,metaInfo}。" + + "id 由 FlowableClient 以 uri 变量严格编码转发。") + @GetMapping("/models/{id}") + public ResponseEntity> getModel(@AuthenticationPrincipal AuthPrincipal principal, + @PathVariable String id) { + ResponseEntity> denied = requireSuperAdmin(principal); + if (denied != null) { + return denied; + } + return ResponseEntity.ok(flowableClient.getModel(id)); + } + + @Operation(summary = "建草稿(超管)", + description = "超管门后转发 flowable-service POST /api/flow/models,body {name,key,bpmnXml,metaInfo?}," + + "返回 {modelId}。坏 XML 下游 422 经既有 handler 透传。") + @PostMapping("/models") + public ResponseEntity> createModel(@AuthenticationPrincipal AuthPrincipal principal, + @RequestBody Map body) { + ResponseEntity> denied = requireSuperAdmin(principal); + if (denied != null) { + return denied; + } + return ResponseEntity.ok(flowableClient.createModel(body)); + } + + @Operation(summary = "更新草稿(超管)", + description = "超管门后转发 flowable-service PUT /api/flow/models/{id},body {name?,bpmnXml,metaInfo?}," + + "返回 {status:0}。草稿不存在 404 / 坏 XML 422 经既有 handler 透传。id 以 uri 变量严格编码转发。") + @PutMapping("/models/{id}") + public ResponseEntity> updateModel(@AuthenticationPrincipal AuthPrincipal principal, + @PathVariable String id, + @RequestBody Map body) { + ResponseEntity> denied = requireSuperAdmin(principal); + if (denied != null) { + return denied; + } + return ResponseEntity.ok(flowableClient.updateModel(id, body)); + } + + @Operation(summary = "从流程定义建草稿(超管)", + description = "超管门后转发 flowable-service POST /api/flow/models/from-procdef,body {procDefId}," + + "返回 {modelId}(净化 id 映射落 metaInfo)。procDef 不存在下游返 {found:false}。") + @PostMapping("/models/from-procdef") + public ResponseEntity> modelFromProcDef(@AuthenticationPrincipal AuthPrincipal principal, + @RequestBody Map body) { + ResponseEntity> denied = requireSuperAdmin(principal); + if (denied != null) { + return denied; + } + return ResponseEntity.ok(flowableClient.modelFromProcDef(body)); + } + + // ---------------------------------------------------------------- formKey 选择器数据源(T2.2) + + @Operation(summary = "wftemplate 选择器数据源(超管)", + description = "超管门后读业务库 view_wftemplate(isactive=1) → {templates:[{id,name}]},供办理人/会签 formKey" + + " 下拉选择。name 取 XML entityid→sys_entity.name(无则回退 id),view_wftemplate_id 去 CHAR 补白。" + + "读库异常降级为空列表(不 500 阻断设计器)。") + @GetMapping("/wftemplates") + public ResponseEntity> wftemplates(@AuthenticationPrincipal AuthPrincipal principal) { + ResponseEntity> denied = requireSuperAdmin(principal); + if (denied != null) { + return denied; + } + List> templates; + try { + templates = jdbcTemplate.query(WFTEMPLATES_SQL, WFTEMPLATE_ROW); + } catch (RuntimeException e) { + log.warn("view_wftemplate 选择器读取降级为空列表: {}", e.toString()); + templates = List.of(); + } + Map resp = new LinkedHashMap<>(); + resp.put("templates", templates); + return ResponseEntity.ok(resp); + } + + // ---------------------------------------------------------------- 超管门 + + /** + * 统一超管门:超管返回 {@code null}(放行),非超管/无身份返回 403 ResponseEntity({status:1,msg})。 + * 所有端点入口调用,防漏门(T1.6 评审 M-3)。403 信封与既有网关端点逐字对齐。 + */ + private static ResponseEntity> requireSuperAdmin(AuthPrincipal principal) { + if (EngineContextBinder.isSystemAdmin(principal)) { + return null; + } Map body = new LinkedHashMap<>(); body.put("status", 1); body.put("msg", "仅系统管理员可用"); diff --git a/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/FlowableClientTest.java b/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/FlowableClientTest.java index 997c64f..ed8758d 100644 --- a/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/FlowableClientTest.java +++ b/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/FlowableClientTest.java @@ -278,4 +278,123 @@ class FlowableClientTest { .satisfies(e -> assertThat(((FlowRemoteException) e).getStatus().value()).isEqualTo(400)); server.verify(); } + + // ---- 草稿 Model API 转发(T2.2):list/get/create/update/from-procdef ---- + // flowable-service ProcessModelController(T2.1) 契约:GET/POST/PUT /api/flow/models[/{id}] + // + POST /api/flow/models/from-procdef。全部返 Map 原样透传;POST/PUT body 经 Jackson 序列化转发; + // {id} 走 uri 模板变量严格编码(禁拼接);下游 4xx 透传 FlowRemoteException。 + + @Test + void 草稿列表_GET_models解析models数组() { + FlowGatewayProperties p = props(); + RestClient.Builder builder = RestClient.builder().baseUrl(p.getBaseUrl()); + MockRestServiceServer server = MockRestServiceServer.bindTo(builder).build(); + server.expect(ExpectedCount.once(), requestTo("http://localhost:8089/api/flow/models")) + .andExpect(method(HttpMethod.GET)) + .andRespond(withSuccess( + "{\"models\":[{\"id\":\"m1\",\"name\":\"总包合同交底\",\"key\":\"总包合同交底\"}]}", + MediaType.APPLICATION_JSON)); + FlowableClient client = new FlowableClient(builder.build(), p); + + Map resp = client.listModels(); + + @SuppressWarnings("unchecked") + List> models = (List>) resp.get("models"); + assertThat(models).hasSize(1); + assertThat(models.get(0)).containsEntry("id", "m1").containsEntry("name", "总包合同交底"); + server.verify(); + } + + @Test + void 取草稿_GET_models按id透传() { + FlowGatewayProperties p = props(); + RestClient.Builder builder = RestClient.builder().baseUrl(p.getBaseUrl()); + MockRestServiceServer server = MockRestServiceServer.bindTo(builder).build(); + server.expect(ExpectedCount.once(), requestTo("http://localhost:8089/api/flow/models/m1")) + .andExpect(method(HttpMethod.GET)) + .andRespond(withSuccess("{\"found\":true,\"id\":\"m1\",\"bpmnXml\":\"\"}", + MediaType.APPLICATION_JSON)); + FlowableClient client = new FlowableClient(builder.build(), p); + + Map resp = client.getModel("m1"); + + assertThat(resp).containsEntry("found", true).containsEntry("bpmnXml", ""); + server.verify(); + } + + @Test + void 建草稿_POST_models_body原样透传() { + FlowGatewayProperties p = props(); + RestClient.Builder builder = RestClient.builder().baseUrl(p.getBaseUrl()); + MockRestServiceServer server = MockRestServiceServer.bindTo(builder).build(); + server.expect(ExpectedCount.once(), requestTo("http://localhost:8089/api/flow/models")) + .andExpect(method(HttpMethod.POST)) + .andExpect(jsonPath("$.name").value("总包合同交底")) + .andExpect(jsonPath("$.key").value("总包合同交底")) + .andExpect(jsonPath("$.bpmnXml").value("")) + .andRespond(withSuccess("{\"modelId\":\"m9\"}", MediaType.APPLICATION_JSON)); + FlowableClient client = new FlowableClient(builder.build(), p); + + Map body = new java.util.LinkedHashMap<>(); + body.put("name", "总包合同交底"); + body.put("key", "总包合同交底"); + body.put("bpmnXml", ""); + Map resp = client.createModel(body); + + assertThat(resp).containsEntry("modelId", "m9"); + server.verify(); + } + + @Test + void 更新草稿_PUT_models按id_body原样透传() { + FlowGatewayProperties p = props(); + RestClient.Builder builder = RestClient.builder().baseUrl(p.getBaseUrl()); + MockRestServiceServer server = MockRestServiceServer.bindTo(builder).build(); + server.expect(ExpectedCount.once(), requestTo("http://localhost:8089/api/flow/models/m1")) + .andExpect(method(HttpMethod.PUT)) + .andExpect(jsonPath("$.bpmnXml").value("")) + .andRespond(withSuccess("{\"status\":0}", MediaType.APPLICATION_JSON)); + FlowableClient client = new FlowableClient(builder.build(), p); + + Map body = new java.util.LinkedHashMap<>(); + body.put("bpmnXml", ""); + Map resp = client.updateModel("m1", body); + + assertThat(resp).containsEntry("status", 0); + server.verify(); + } + + @Test + void 从流程定义建草稿_POST_from_procdef_body原样透传() { + FlowGatewayProperties p = props(); + RestClient.Builder builder = RestClient.builder().baseUrl(p.getBaseUrl()); + MockRestServiceServer server = MockRestServiceServer.bindTo(builder).build(); + server.expect(ExpectedCount.once(), requestTo("http://localhost:8089/api/flow/models/from-procdef")) + .andExpect(method(HttpMethod.POST)) + .andExpect(jsonPath("$.procDefId").value("总包合同交底:3:abc123")) + .andRespond(withSuccess("{\"modelId\":\"m7\"}", MediaType.APPLICATION_JSON)); + FlowableClient client = new FlowableClient(builder.build(), p); + + Map resp = client.modelFromProcDef(Map.of("procDefId", "总包合同交底:3:abc123")); + + assertThat(resp).containsEntry("modelId", "m7"); + server.verify(); + } + + @Test + void 草稿转发_下游4xx透传FlowRemote且不重试() { + FlowGatewayProperties p = props(); + RestClient.Builder builder = RestClient.builder().baseUrl(p.getBaseUrl()); + MockRestServiceServer server = MockRestServiceServer.bindTo(builder).build(); + server.expect(ExpectedCount.once(), // 业务错不重试 + requestTo("http://localhost:8089/api/flow/models")) + .andExpect(method(HttpMethod.POST)) + .andRespond(withStatus(HttpStatus.UNPROCESSABLE_ENTITY).body("BPMN 解析失败")); + FlowableClient client = new FlowableClient(builder.build(), p); + + assertThatThrownBy(() -> client.createModel(Map.of("bpmnXml", ""))) + .isInstanceOf(FlowRemoteException.class) + .satisfies(e -> assertThat(((FlowRemoteException) e).getStatus().value()).isEqualTo(422)); + server.verify(); + } } diff --git a/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/ProcessModelerControllerTest.java b/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/ProcessModelerControllerTest.java index 76e617a..c393268 100644 --- a/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/ProcessModelerControllerTest.java +++ b/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/ProcessModelerControllerTest.java @@ -2,22 +2,28 @@ package com.eip4.platform.flowgateway; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import java.sql.ResultSet; import java.util.List; import java.util.Map; import org.junit.jupiter.api.Test; import org.springframework.core.MethodParameter; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.RowMapper; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.bind.support.WebDataBinderFactory; @@ -26,6 +32,7 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.ModelAndViewContainer; import com.eip4.platform.auth.security.AuthPrincipal; +import com.eip4.platform.flowgateway.client.FlowRemoteException; import com.eip4.platform.flowgateway.client.FlowServiceUnavailableException; import com.eip4.platform.flowgateway.client.FlowableClient; import com.eip4.platform.flowgateway.web.FlowGatewayExceptionHandler; @@ -38,7 +45,9 @@ import com.eip4.platform.flowgateway.web.ProcessModelerController; class ProcessModelerControllerTest { private final FlowableClient flowableClient = mock(FlowableClient.class); - private final ProcessModelerController controller = new ProcessModelerController(flowableClient); + private final JdbcTemplate jdbcTemplate = mock(JdbcTemplate.class); + private final ProcessModelerController controller = + new ProcessModelerController(flowableClient, jdbcTemplate); /** 真实形态:中文 key + 冒号分隔的 procDefId。 */ private static final String CN_PROCDEF = "总包合同交底:3:abc123"; @@ -191,4 +200,153 @@ class ProcessModelerControllerTest { .andExpect(status().isServiceUnavailable()) .andExpect(jsonPath("$.error").value("FLOW_SERVICE_UNAVAILABLE")); } + + // ---- 草稿 CRUD 五端点转发(T2.2):每端点 admin 200 透传 + 非超管 403。 + // 两次调用(admin+非超管同参)后 verify 下游恰调 1 次 → 证明门确实拦下了非超管调用(若漏门会是 2 次)。---- + + @Test + void 草稿列表_超管透传200_非超管403门拦下游() { + Map downstream = Map.of("models", List.of(Map.of("id", "m1", "name", "总包合同交底"))); + when(flowableClient.listModels()).thenReturn(downstream); + + ResponseEntity> ok = controller.listModels(admin()); + assertThat(ok.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(ok.getBody()).isEqualTo(downstream); + + ResponseEntity> denied = controller.listModels(normalUser()); + assertThat(denied.getStatusCode()).isEqualTo(HttpStatus.FORBIDDEN); + assertThat(denied.getBody()).containsEntry("status", 1).containsEntry("msg", "仅系统管理员可用"); + verify(flowableClient).listModels(); // 恰 1 次(仅超管):非超管被门拦,未落下游 + } + + @Test + void 取草稿_超管透传200_非超管403门拦下游() { + Map downstream = Map.of("found", true, "id", "m1", "bpmnXml", ""); + when(flowableClient.getModel("m1")).thenReturn(downstream); + + ResponseEntity> ok = controller.getModel(admin(), "m1"); + assertThat(ok.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(ok.getBody()).isEqualTo(downstream); + + ResponseEntity> denied = controller.getModel(normalUser(), "m1"); + assertThat(denied.getStatusCode()).isEqualTo(HttpStatus.FORBIDDEN); + verify(flowableClient).getModel("m1"); // 恰 1 次(仅超管) + } + + @Test + void 建草稿_超管透传200_非超管403门拦下游() { + Map req = Map.of("name", "总包合同交底", "key", "总包合同交底", "bpmnXml", ""); + Map downstream = Map.of("modelId", "m9"); + when(flowableClient.createModel(req)).thenReturn(downstream); + + ResponseEntity> ok = controller.createModel(admin(), req); + assertThat(ok.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(ok.getBody()).isEqualTo(downstream); + + ResponseEntity> denied = controller.createModel(normalUser(), req); + assertThat(denied.getStatusCode()).isEqualTo(HttpStatus.FORBIDDEN); + verify(flowableClient).createModel(req); // 恰 1 次(仅超管):漏门会是 2 次 + } + + @Test + void 更新草稿_超管透传200_非超管403门拦下游() { + Map req = Map.of("bpmnXml", ""); + Map downstream = Map.of("status", 0); + when(flowableClient.updateModel("m1", req)).thenReturn(downstream); + + ResponseEntity> ok = controller.updateModel(admin(), "m1", req); + assertThat(ok.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(ok.getBody()).isEqualTo(downstream); + + ResponseEntity> denied = controller.updateModel(normalUser(), "m1", req); + assertThat(denied.getStatusCode()).isEqualTo(HttpStatus.FORBIDDEN); + verify(flowableClient).updateModel("m1", req); // 恰 1 次(仅超管) + } + + @Test + void 从流程定义建草稿_超管透传200_非超管403门拦下游() { + Map req = Map.of("procDefId", CN_PROCDEF); + Map downstream = Map.of("modelId", "m7"); + when(flowableClient.modelFromProcDef(req)).thenReturn(downstream); + + ResponseEntity> ok = controller.modelFromProcDef(admin(), req); + assertThat(ok.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(ok.getBody()).isEqualTo(downstream); + + ResponseEntity> denied = controller.modelFromProcDef(normalUser(), req); + assertThat(denied.getStatusCode()).isEqualTo(HttpStatus.FORBIDDEN); + verify(flowableClient).modelFromProcDef(req); // 恰 1 次(仅超管) + } + + @Test + void 无身份_建草稿403且不触发下游() { + ResponseEntity> resp = controller.createModel(null, Map.of("name", "x")); + assertThat(resp.getStatusCode()).isEqualTo(HttpStatus.FORBIDDEN); + assertThat(resp.getBody()).containsEntry("status", 1); + verify(flowableClient, never()).createModel(any()); + } + + // ---- 422 胶水透传:下游坏 XML 422 经既有 FlowGatewayExceptionHandler 出 FLOW_REMOTE_ERROR 信封 ---- + + @Test + void 胶水_建草稿_下游422经handler透传() throws Exception { + when(flowableClient.createModel(any())) + .thenThrow(new FlowRemoteException(HttpStatus.UNPROCESSABLE_ENTITY, "flowable-service 建草稿返回 422")); + + glueMvc().perform(post("/api/workflow/models") + .contentType(MediaType.APPLICATION_JSON) + .content("{\"name\":\"x\",\"key\":\"k\",\"bpmnXml\":\"\"}")) + .andExpect(status().isUnprocessableEntity()) + .andExpect(jsonPath("$.status").value(422)) + .andExpect(jsonPath("$.error").value("FLOW_REMOTE_ERROR")); + } + + // ---- wftemplates 选择器数据源:超管读库 trim CHAR 补白 + 无实体名回退 id;非超管 403 零读库 ---- + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Test + void wftemplates_超管_读库trim补白并回退id() { + // mock JdbcTemplate 反射调真实 RowMapper:第一行有实体名(取名+trim补白),第二行无名(回退 trim 后的 id) + when(jdbcTemplate.query(anyString(), any(RowMapper.class))).thenAnswer(inv -> { + RowMapper> rm = inv.getArgument(1); + ResultSet named = mock(ResultSet.class); + when(named.getString("id")).thenReturn("wft-0001 "); // CHAR(36) 补白 + when(named.getString("name")).thenReturn("通知管理"); + ResultSet unnamed = mock(ResultSet.class); + when(unnamed.getString("id")).thenReturn("wft-0002 "); + when(unnamed.getString("name")).thenReturn(null); // 无 entityid/实体名 → 回退 id + return List.of(rm.mapRow(named, 0), rm.mapRow(unnamed, 1)); + }); + + ResponseEntity> resp = controller.wftemplates(admin()); + + assertThat(resp.getStatusCode()).isEqualTo(HttpStatus.OK); + List> templates = (List>) resp.getBody().get("templates"); + assertThat(templates).hasSize(2); + assertThat(templates.get(0)).containsEntry("id", "wft-0001").containsEntry("name", "通知管理"); + assertThat(templates.get(1)).containsEntry("id", "wft-0002").containsEntry("name", "wft-0002"); + } + + @SuppressWarnings("rawtypes") + @Test + void wftemplates_非超管_403且不读库() { + ResponseEntity> resp = controller.wftemplates(normalUser()); + + assertThat(resp.getStatusCode()).isEqualTo(HttpStatus.FORBIDDEN); + assertThat(resp.getBody()).containsEntry("status", 1).containsEntry("msg", "仅系统管理员可用"); + verify(jdbcTemplate, never()).query(anyString(), any(RowMapper.class)); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Test + void wftemplates_读库异常_降级空列表不500() { + when(jdbcTemplate.query(anyString(), any(RowMapper.class))) + .thenThrow(new org.springframework.dao.DataAccessResourceFailureException("db down")); + + ResponseEntity> resp = controller.wftemplates(admin()); + + assertThat(resp.getStatusCode()).isEqualTo(HttpStatus.OK); + List> templates = (List>) resp.getBody().get("templates"); + assertThat(templates).isEmpty(); + } } From a25e7ce4b7be3acf7655871a8ead23ef87215a28 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 2 Jul 2026 11:49:45 +0800 Subject: [PATCH 06/11] =?UTF-8?q?docs(plan):=20=E5=9B=9E=E5=86=99=20T2.2?= =?UTF-8?q?=20=E5=AE=9E=E8=AF=81=E2=80=94=E2=80=94wftemplate=20=E6=97=A0?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=88=97,formKey=20=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E9=A1=BB=E8=BF=87=E6=BB=A4=E8=BE=93=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Fable 5 --- docs/plans/2026-07-02-在线流程Modeler-实施计划.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/plans/2026-07-02-在线流程Modeler-实施计划.md b/docs/plans/2026-07-02-在线流程Modeler-实施计划.md index 5e22e7d..98f3f89 100644 --- a/docs/plans/2026-07-02-在线流程Modeler-实施计划.md +++ b/docs/plans/2026-07-02-在线流程Modeler-实施计划.md @@ -275,6 +275,8 @@ commit:`feat(modeler): EIP4 侧板三控件+扩展属性/监听器编辑` ### Task 2.5 前端:存草稿 + 草稿列表打开 +> 📌 **T2.2 实证——wftemplates 名称现实**:view_wftemplate **无名称列**(计划原假设错),网关已按 entityid→sys_entity.name 解析——1016 活动模板仅 339 有中文名,其余下拉显 uuid。**formKey 下拉须加过滤输入框**(1016 项不可裸滚动),无名项显示「…(未命名)」。此项归本 task 或 T2.4 收口轮顺带。 + **Files:** Modify `processModeler.ts`(saveDraft/createDraft/listModels/getModel/fromProcDef)、`ProcessModelerPage.tsx`(顶栏「保存草稿」`saveXML({format:true})`→PUT;打开器加「草稿」tab);tests。 **阶段 2 live 验收**:打开「总包合同交底」→ from-procdef 建草稿 → 改办理人(加一个 user)→ 保存 → psql 查 `act_re_model` 新行 + `act_ge_bytearray` 编辑源含改动 + metaInfo 含 eip4IdMap → 重开草稿回显正确。 From e19bac805e3785e73312c1ad0dad9a0fbc6ff28e Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 2 Jul 2026 11:57:45 +0800 Subject: [PATCH 07/11] =?UTF-8?q?docs(plan):=20=E5=9B=9E=E5=86=99=20T2.2?= =?UTF-8?q?=20=E8=AF=84=E5=AE=A1=E2=80=94=E2=80=94=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=AB=AF=E7=82=B9=E6=8C=82=20T2.5/T4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Fable 5 --- docs/plans/2026-07-02-在线流程Modeler-实施计划.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/plans/2026-07-02-在线流程Modeler-实施计划.md b/docs/plans/2026-07-02-在线流程Modeler-实施计划.md index 98f3f89..c5fb3ca 100644 --- a/docs/plans/2026-07-02-在线流程Modeler-实施计划.md +++ b/docs/plans/2026-07-02-在线流程Modeler-实施计划.md @@ -275,6 +275,8 @@ commit:`feat(modeler): EIP4 侧板三控件+扩展属性/监听器编辑` ### Task 2.5 前端:存草稿 + 草稿列表打开 +> 📌 **T2.2 评审遗留——草稿删除端点**:五端点无 DELETE,POST 重试窗口产生的重复草稿无 API 可清、草稿列表 UX 也需要删除。**本 task 或 T4.1 补**:flowable-service `DELETE /api/flow/models/{id}`(deleteModel)+ 网关同门转发 + 前端草稿列表删除按钮(confirm)。 +> > 📌 **T2.2 实证——wftemplates 名称现实**:view_wftemplate **无名称列**(计划原假设错),网关已按 entityid→sys_entity.name 解析——1016 活动模板仅 339 有中文名,其余下拉显 uuid。**formKey 下拉须加过滤输入框**(1016 项不可裸滚动),无名项显示「…(未命名)」。此项归本 task 或 T2.4 收口轮顺带。 **Files:** Modify `processModeler.ts`(saveDraft/createDraft/listModels/getModel/fromProcDef)、`ProcessModelerPage.tsx`(顶栏「保存草稿」`saveXML({format:true})`→PUT;打开器加「草稿」tab);tests。 From 653866c85216c0aef8b2c5bd66ccf57e039222f9 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 2 Jul 2026 12:01:18 +0800 Subject: [PATCH 08/11] =?UTF-8?q?fix(gateway):=20T2.2=20=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E5=B0=8F=E9=A1=B9=E2=80=94=E2=80=94=E5=B9=82=E7=AD=89=E6=B3=A8?= =?UTF-8?q?=E9=87=8A/=E9=99=8D=E7=BA=A7=E6=A0=87=E8=AE=B0/PUT=E8=83=B6?= =?UTF-8?q?=E6=B0=B4=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit M-1(javadoc):FlowableClient put()/post() 点破幂等性差别——PUT 覆盖写幂等,execute 连接级重试安全; POST 非幂等,重试存在重复创建窗口,接受理由=草稿廉价可覆盖(非不可逆副作用)+本地同机链路瞬时故障概率极低, 语义级 4xx/5xx 绝不重试故无此窗口。 M-2(一行):wftemplates 读库异常降级分支返回 {templates:[],degraded:true},正常路径不带 degraded 键; 测试两分支各断言(正常 doesNotContainKey degraded / 降级 containsEntry degraded=true)。 M-3(胶水):照 glueMvc 补 PUT /api/workflow/models/{id} MockMvc 路由层测试(PUT 谓词匹配+@PathVariable 绑定 id=m1+200 透传)。 测试:ProcessModelerControllerTest 20→21(+PUT 胶水),FlowableClientTest 18(M-1 纯注释不加测试)。 platform-flow-gateway 全模块绿,BUILD SUCCESS,既有测试零改动。 Co-Authored-By: Claude Fable 5 --- .../flowgateway/client/FlowableClient.java | 9 +++++++ .../web/ProcessModelerController.java | 6 +++++ .../ProcessModelerControllerTest.java | 24 ++++++++++++++++++- 3 files changed, 38 insertions(+), 1 deletion(-) 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 50b0bc4..a55f919 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 @@ -368,6 +368,12 @@ public class FlowableClient { .body(TASK_LIST)); } + /** + * POST 转发。幂等性:POST 非幂等——{@link #execute} 的连接级重试(连不上/读超时后重放) + * 存在重复创建窗口。接受该风险的理由:①草稿创建廉价且可覆盖(重复草稿人工删即可,非扣款类不可逆副作用); + * ②本地网关↔flowable-service 同机链路,连接级瞬时故障概率极低。语义级 4xx/5xx 由 {@link #execute} 保证 + * 绝不重试,故业务错无重复窗口。对比 {@link #put}(覆盖写幂等,重试安全)。 + */ private T post(String op, String path, Object body, Class respType) { return execute(op, () -> restClient.post() .uri(path) @@ -387,6 +393,9 @@ public class FlowableClient { /** * PUT 转发(RestClient 无既有封装 → 照 {@link #post} 补)。{@code uriTemplate}+{@code uriVars} 走 RestClient * 严格编码({@code id} 作 uri 变量,禁字符串拼接);连接级重试 + 4xx/5xx 透传语义与 post 一致。 + * + *

幂等性:PUT 是覆盖写、天然幂等 → {@link #execute} 的连接级重试安全(重放同一 PUT 落到同一 + * 草稿 id,不产生额外副作用),无 {@link #post} 那种重复创建窗口。

*/ private T put(String op, String uriTemplate, Object body, Class respType, Object... uriVars) { return execute(op, () -> restClient.put() diff --git a/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/ProcessModelerController.java b/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/ProcessModelerController.java index 1f878f5..d7002fe 100644 --- a/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/ProcessModelerController.java +++ b/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/ProcessModelerController.java @@ -190,14 +190,20 @@ public class ProcessModelerController { return denied; } List> templates; + boolean degraded = false; try { templates = jdbcTemplate.query(WFTEMPLATES_SQL, WFTEMPLATE_ROW); } catch (RuntimeException e) { log.warn("view_wftemplate 选择器读取降级为空列表: {}", e.toString()); templates = List.of(); + degraded = true; } Map resp = new LinkedHashMap<>(); resp.put("templates", templates); + if (degraded) { + // 降级标记:正常路径不带此键,前端可据此区分「真无模板」与「读库失败」并提示重试。 + resp.put("degraded", true); + } return ResponseEntity.ok(resp); } diff --git a/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/ProcessModelerControllerTest.java b/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/ProcessModelerControllerTest.java index c393268..d08c69f 100644 --- a/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/ProcessModelerControllerTest.java +++ b/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/ProcessModelerControllerTest.java @@ -4,12 +4,14 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -325,6 +327,8 @@ class ProcessModelerControllerTest { assertThat(templates).hasSize(2); assertThat(templates.get(0)).containsEntry("id", "wft-0001").containsEntry("name", "通知管理"); assertThat(templates.get(1)).containsEntry("id", "wft-0002").containsEntry("name", "wft-0002"); + // 正常路径不带 degraded 键(与降级分支区分) + assertThat(resp.getBody()).doesNotContainKey("degraded"); } @SuppressWarnings("rawtypes") @@ -339,7 +343,7 @@ class ProcessModelerControllerTest { @SuppressWarnings({"unchecked", "rawtypes"}) @Test - void wftemplates_读库异常_降级空列表不500() { + void wftemplates_读库异常_降级空列表带degraded标记不500() { when(jdbcTemplate.query(anyString(), any(RowMapper.class))) .thenThrow(new org.springframework.dao.DataAccessResourceFailureException("db down")); @@ -348,5 +352,23 @@ class ProcessModelerControllerTest { assertThat(resp.getStatusCode()).isEqualTo(HttpStatus.OK); List> templates = (List>) resp.getBody().get("templates"); assertThat(templates).isEmpty(); + assertThat(resp.getBody()).containsEntry("degraded", true); // 降级分支带标记(正常路径无此键) + } + + // ---- PUT 路由胶水(M-3):MockMvc 真走 PUT /api/workflow/models/{id},验路径匹配 + @PathVariable 绑定 + 200 透传 ---- + + @Test + void 胶水_更新草稿_PUT路由绑定pathVar并200透传() throws Exception { + Map downstream = Map.of("status", 0); + when(flowableClient.updateModel(eq("m1"), any())).thenReturn(downstream); + + glueMvc().perform(put("/api/workflow/models/{id}", "m1") + .contentType(MediaType.APPLICATION_JSON) + .content("{\"bpmnXml\":\"\"}")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.status").value(0)); + + // 路由匹配 PUT 谓词 + {id} 绑定到 "m1" 交给控制器 + verify(flowableClient).updateModel(eq("m1"), any()); } } From f0d704d1b999afecf38a1a2fcb783409b00411ce Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 2 Jul 2026 12:21:05 +0800 Subject: [PATCH 09/11] =?UTF-8?q?feat(flow+gateway):=20=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=AB=AF=E7=82=B9=20DELETE=20/models/{id}(?= =?UTF-8?q?=E8=B6=85=E7=AE=A1=E9=97=A8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 补前端 T2.5 已按占位契约做好测试的草稿删除两层端点: flowable-service ProcessModelController:DELETE /api/flow/models/{id}——先 getModel 判 null→404 {status:1,msg};存在则 deleteModel(id)(连带 editorSource/metaInfo 一并删)→{status:0}。 网关:FlowableClient +deleteModel(id)(id 走 uri 变量严格编码,DELETE 无既有封装→照 put 补私有 delete() 助手,无请求体,幂等重试安全);ProcessModelerController +DELETE /api/workflow/models/{id} 过 requireSuperAdmin 门后透传,{status:0} 原样回(对齐前端 deleteDraft 只判成功),下游 404 经既有 FlowGatewayExceptionHandler 透传。 测试(严格 TDD,均先红后绿): - flowable ProcessModelControllerTest 14→16(删存在的 verify deleteModel 调 1 次/删不存在 404 verify 零删) - gateway FlowableClientTest 18→20(DELETE 按 id 透传/下游 404 透传 FlowRemote 不重试) - gateway ProcessModelerControllerTest 21→23(超管 200 透传+非超管 403 门拦下游恰调 1 次/404 胶水经 handler 出 FLOW_REMOTE_ERROR) 两模块 mvn -pl flowable-service,platform-flow-gateway -am test 全绿,BUILD SUCCESS,既有测试零改动。 Co-Authored-By: Claude Fable 5 --- .../api/ProcessModelController.java | 15 +++++++++ .../api/ProcessModelControllerTest.java | 24 ++++++++++++++ .../flowgateway/client/FlowableClient.java | 23 +++++++++++++ .../web/ProcessModelerController.java | 14 ++++++++ .../flowgateway/FlowableClientTest.java | 33 +++++++++++++++++++ .../ProcessModelerControllerTest.java | 27 +++++++++++++++ 6 files changed, 136 insertions(+) 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 a9613c4..d34ffd3 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 @@ -18,6 +18,7 @@ import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.util.StreamUtils; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -168,6 +169,20 @@ public class ProcessModelController { return ResponseEntity.ok(resp); } + @DeleteMapping("/models/{id}") + @Operation(summary = "删草稿", + description = "草稿不存在→404;存在则 deleteModel(id)(连带 editorSource/metaInfo 一并删) → {status:0}。") + public ResponseEntity> delete(@PathVariable String id) { + Model model = repositoryService.getModel(id); + if (model == null) { + return status(HttpStatus.NOT_FOUND, "草稿不存在: " + id); + } + repositoryService.deleteModel(id); + Map resp = new LinkedHashMap<>(); + resp.put("status", 0); + return ResponseEntity.ok(resp); + } + @PostMapping("/models/from-procdef") @Operation(summary = "从流程定义建草稿", description = "body {procDefId}。读部署 BPMN → BpmnIdSanitizer.sanitize 净化中文 id → 建草稿" diff --git a/flowable-service/src/test/java/com/eip4/flowservice/api/ProcessModelControllerTest.java b/flowable-service/src/test/java/com/eip4/flowservice/api/ProcessModelControllerTest.java index aa5e2a2..c64ea3d 100644 --- a/flowable-service/src/test/java/com/eip4/flowservice/api/ProcessModelControllerTest.java +++ b/flowable-service/src/test/java/com/eip4/flowservice/api/ProcessModelControllerTest.java @@ -6,6 +6,7 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; @@ -237,6 +238,29 @@ class ProcessModelControllerTest { verify(repositoryService, never()).addModelEditorSource(anyString(), any()); } + @Test + void 删草稿_存在则删除返status0() throws Exception { + Model m = Mockito.mock(Model.class); + when(repositoryService.getModel("m1")).thenReturn(m); + + mvc.perform(delete("/api/flow/models/m1")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.status").value(0)); + + verify(repositoryService).deleteModel("m1"); + } + + @Test + void 删草稿_不存在返404不删除() throws Exception { + when(repositoryService.getModel("nope")).thenReturn(null); + + mvc.perform(delete("/api/flow/models/nope")) + .andExpect(status().isNotFound()) + .andExpect(jsonPath("$.status").value(1)); + + verify(repositoryService, never()).deleteModel(anyString()); + } + @Test void fromProcDef_净化XML与idMap落metaInfo() throws Exception { // 存量流程 process id 为中文,from-procdef 净化后建草稿:editorSource 无中文 id,metaInfo JSON 含 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 a55f919..e09b9b4 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 @@ -317,6 +317,18 @@ public class FlowableClient { return post("从流程定义建草稿", "/api/flow/models/from-procdef", body, Map.class); } + /** + * 删草稿。对应 flowable-service {@code DELETE /api/flow/models/{id}},返回 {@code {status:0}}; + * 草稿不存在下游 404 → {@link FlowRemoteException} 透传。 + * + *

{@code id} 走 uri 模板变量严格编码(禁字符串拼接)。DELETE 幂等——{@link #execute} 连接级重试安全 + * (重放同一 DELETE 落到同一 id,删已删=下游 404,不产生额外副作用)。

+ */ + @SuppressWarnings("unchecked") + public Map deleteModel(String id) { + return delete("删草稿", "/api/flow/models/{id}", Map.class, id); + } + /** 按发起人查询历史流程实例。对应 flowable-service {@code GET /api/flow/process/started}。 */ public List started(String startedBy, int firstResult, int maxResults) { return execute("发起流程列表", () -> restClient.get() @@ -405,6 +417,17 @@ public class FlowableClient { .body(respType)); } + /** + * DELETE 转发(RestClient 无既有封装 → 照 {@link #put} 补)。{@code uriTemplate}+{@code uriVars} 走 RestClient + * 严格编码({@code id} 作 uri 变量,禁字符串拼接);无请求体;连接级重试 + 4xx/5xx 透传语义与 put 一致(幂等)。 + */ + private T delete(String op, String uriTemplate, Class respType, Object... uriVars) { + return execute(op, () -> restClient.delete() + .uri(uriTemplate, uriVars) + .retrieve() + .body(respType)); + } + /** * 统一执行:连接级故障带退避重试 maxRetries 次,耗尽 → 503 语义;业务错(4xx/5xx)立即透传不重试。 */ diff --git a/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/ProcessModelerController.java b/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/ProcessModelerController.java index d7002fe..67a4107 100644 --- a/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/ProcessModelerController.java +++ b/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/ProcessModelerController.java @@ -11,6 +11,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -177,6 +178,19 @@ public class ProcessModelerController { return ResponseEntity.ok(flowableClient.modelFromProcDef(body)); } + @Operation(summary = "删草稿(超管)", + description = "超管门后转发 flowable-service DELETE /api/flow/models/{id},返回 {status:0}。" + + "草稿不存在 404 经既有 handler 透传。id 以 uri 变量严格编码转发。") + @DeleteMapping("/models/{id}") + public ResponseEntity> deleteModel(@AuthenticationPrincipal AuthPrincipal principal, + @PathVariable String id) { + ResponseEntity> denied = requireSuperAdmin(principal); + if (denied != null) { + return denied; + } + return ResponseEntity.ok(flowableClient.deleteModel(id)); + } + // ---------------------------------------------------------------- formKey 选择器数据源(T2.2) @Operation(summary = "wftemplate 选择器数据源(超管)", diff --git a/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/FlowableClientTest.java b/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/FlowableClientTest.java index ed8758d..e2cb492 100644 --- a/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/FlowableClientTest.java +++ b/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/FlowableClientTest.java @@ -397,4 +397,37 @@ class FlowableClientTest { .satisfies(e -> assertThat(((FlowRemoteException) e).getStatus().value()).isEqualTo(422)); server.verify(); } + + @Test + void 删草稿_DELETE_models按id透传() { + FlowGatewayProperties p = props(); + RestClient.Builder builder = RestClient.builder().baseUrl(p.getBaseUrl()); + MockRestServiceServer server = MockRestServiceServer.bindTo(builder).build(); + server.expect(ExpectedCount.once(), requestTo("http://localhost:8089/api/flow/models/m1")) + .andExpect(method(HttpMethod.DELETE)) + .andRespond(withSuccess("{\"status\":0}", MediaType.APPLICATION_JSON)); + FlowableClient client = new FlowableClient(builder.build(), p); + + Map resp = client.deleteModel("m1"); + + assertThat(resp).containsEntry("status", 0); + server.verify(); + } + + @Test + void 删草稿_下游404透传FlowRemote且不重试() { + FlowGatewayProperties p = props(); + RestClient.Builder builder = RestClient.builder().baseUrl(p.getBaseUrl()); + MockRestServiceServer server = MockRestServiceServer.bindTo(builder).build(); + server.expect(ExpectedCount.once(), // 业务错不重试 + requestTo("http://localhost:8089/api/flow/models/nope")) + .andExpect(method(HttpMethod.DELETE)) + .andRespond(withStatus(HttpStatus.NOT_FOUND).body("草稿不存在")); + FlowableClient client = new FlowableClient(builder.build(), p); + + assertThatThrownBy(() -> client.deleteModel("nope")) + .isInstanceOf(FlowRemoteException.class) + .satisfies(e -> assertThat(((FlowRemoteException) e).getStatus().value()).isEqualTo(404)); + server.verify(); + } } diff --git a/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/ProcessModelerControllerTest.java b/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/ProcessModelerControllerTest.java index d08c69f..c0e1515 100644 --- a/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/ProcessModelerControllerTest.java +++ b/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/ProcessModelerControllerTest.java @@ -9,6 +9,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; @@ -288,6 +289,32 @@ class ProcessModelerControllerTest { verify(flowableClient, never()).createModel(any()); } + @Test + void 删草稿_超管透传200_非超管403门拦下游() { + Map downstream = Map.of("status", 0); + when(flowableClient.deleteModel("m1")).thenReturn(downstream); + + ResponseEntity> ok = controller.deleteModel(admin(), "m1"); + assertThat(ok.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(ok.getBody()).isEqualTo(downstream); + + ResponseEntity> denied = controller.deleteModel(normalUser(), "m1"); + assertThat(denied.getStatusCode()).isEqualTo(HttpStatus.FORBIDDEN); + assertThat(denied.getBody()).containsEntry("status", 1).containsEntry("msg", "仅系统管理员可用"); + verify(flowableClient).deleteModel("m1"); // 恰 1 次(仅超管):非超管被门拦,未落下游 + } + + @Test + void 胶水_删草稿_下游404经handler透传() throws Exception { + when(flowableClient.deleteModel("nope")) + .thenThrow(new FlowRemoteException(HttpStatus.NOT_FOUND, "flowable-service 删草稿返回 404")); + + glueMvc().perform(delete("/api/workflow/models/{id}", "nope")) + .andExpect(status().isNotFound()) + .andExpect(jsonPath("$.status").value(404)) + .andExpect(jsonPath("$.error").value("FLOW_REMOTE_ERROR")); + } + // ---- 422 胶水透传:下游坏 XML 422 经既有 FlowGatewayExceptionHandler 出 FLOW_REMOTE_ERROR 信封 ---- @Test From a9d21ec46c31a29c275b797e5c7b32e2c9b519fc Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 2 Jul 2026 12:42:56 +0800 Subject: [PATCH 10/11] =?UTF-8?q?docs(plan):=20=E5=9B=9E=E5=86=99=E9=98=B6?= =?UTF-8?q?=E6=AE=B52=20live=20=E5=AE=9E=E8=AF=81=E2=80=94=E2=80=94bpmn-js?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4=E8=BE=93?= =?UTF-8?q?=E5=87=BA=E8=A2=AB=E4=B8=A5=E6=A0=BCXSD=E6=8B=92(=E8=8D=89?= =?UTF-8?q?=E7=A8=BF=E5=B7=B2=E4=BF=AE+=E8=AD=A6=E7=A4=BAT3.1=E9=83=A8?= =?UTF-8?q?=E7=BD=B2=E8=B7=AF=E5=BE=84)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Fable 5 --- docs/plans/2026-07-02-在线流程Modeler-实施计划.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/plans/2026-07-02-在线流程Modeler-实施计划.md b/docs/plans/2026-07-02-在线流程Modeler-实施计划.md index c5fb3ca..4c12460 100644 --- a/docs/plans/2026-07-02-在线流程Modeler-实施计划.md +++ b/docs/plans/2026-07-02-在线流程Modeler-实施计划.md @@ -290,6 +290,8 @@ commit + 合 main:`feat(modeler): 阶段2 EIP4 控件+草稿闭环` ### Task 3.1 后端:deploy-from-model(id 还原 + 引擎校验门) +> 🔴 **阶段2 live 实证——bpmn-js 输出被严格 XSD 校验拒(已修,且警示 T3.1)**:flowable `convertToBpmnModel(src, validateSchema=true, ...)` 的严格 Xerces XSD 校验**拒绝 bpmn-js saveXML 的默认命名空间输出**(`cvc-complex-type.2.4.a: Invalid content ... {MODEL}Process`),原始带前缀 source 能过。草稿保存已改 validateSchema=false(草稿是半成品,XSD 不适用)+ 字节级 DOCTYPE 守卫保 XXE。**本 task deploy 必须验证同问题**:`createDeployment().addString().deploy()` 也解析 bpmn-js 输出,若 Flowable 部署校验拒默认命名空间/activiti 扩展,需在部署前把 bpmn-js XML 规范化(或确认 deploy 路径不走严格 XSD)——阶段 3 live 必须用「编辑器改过并 saveXML 的真实流程」部署,不能只用原始 source。 + > ⚠️ **T1.3 评审 I-2 预警——文本引用**:bpmn-js `saveXML` 会给流节点补 `/` **元素文本**引用(存量 1512 文档 0 命中,但编辑器导出会有),`BpmnIdSanitizer.restore` 只还原**属性位** → 直接部署会落库「属性=中文原 id、文本引用=净化 id」的脏 XML(Flowable 不解析 incoming/outgoing 故功能无害,但再次 from-procdef 重编辑时碰撞序号换位可能指错节点)。**本 task 必须**:restore 前剥除 incoming/outgoing 元素(Flowable 自行从 sequenceFlow 推导)或把文本引用位纳入 restore,二选一并加测试(含「编辑器导出态 XML → 部署 XML 无净化 id 残留」断言)。 **Files:** Modify `ProcessModelController.java` + test。 From 789cb90af3e6708fb542bc388d8cc0d4e2e3c26a Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 2 Jul 2026 12:52:51 +0800 Subject: [PATCH 11/11] =?UTF-8?q?fix(flow):=20=E8=8D=89=E7=A8=BF=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=85=B3=E4=B8=A5=E6=A0=BCXSD=E6=A0=A1=E9=AA=8C(bpmn-?= =?UTF-8?q?js=E9=BB=98=E8=AE=A4=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4?= =?UTF-8?q?=E8=BE=93=E5=87=BA)+=E5=AD=97=E8=8A=82=E7=BA=A7DOCTYPE=E5=AE=88?= =?UTF-8?q?=E5=8D=AB=E4=BF=9DXXE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 阶段2 live 验收阻断 bug:UI 保存草稿恒 422。根因=T2.1 评审 I-1 我把 enableSafeBpmnXml 从 false 改 true 时,convertToBpmnModel(source, validateSchema=true, ...) 的 validateSchema=true 开启严格 XSD 校验;bpmn-js saveXML 用默认命名空间(无前缀 definitions/process)重序列化,Flowable 严格 Xerces XSD 校验拒之(cvc-complex-type.2.4.a: element {MODEL}process ... expected)——bpmn-js 面向 BPMN 模型非字节级 XSD 合规,这是已知固有不兼容;原始 source(带前缀)故能过。 架构:草稿是可视化工具编辑的半成品,不该做完整 XSD 校验(完整校验属部署门 T3.1 ProcessValidator, 在解析后模型上跑,非 XSD)。修法: 1. parseGuard 的 convertToBpmnModel(..., true, true) → (..., false, true)(validateSchema=false)。 仍解析(非良构 XML 抛→422),不做严格 XSD。 2. XXE 不只靠此:解析前加字节级 DOCTYPE 拒绝守卫(移植 platform-report ReportXmlGuard hasDoctypeInBytes/hasDoctype 模式,含 BOM/UTF-16 编码识别,就地复刻不引 platform-* 依赖), 与 enableSafeBpmnXml=true 双保险防外部实体注入。 测试(TDD 先红后绿):ProcessModelControllerTest 16→19——①bpmn-js 默认命名空间输出(BPMNDiagram 先于 process,触发同族 cvc-complex-type.2.4.a)改前 422 改后 200 落库(回归锚点,改前实测必红); ②含 --- .../api/ProcessModelController.java | 110 ++++++++++++++++-- .../api/ProcessModelControllerTest.java | 68 ++++++++++- 2 files changed, 169 insertions(+), 9 deletions(-) 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 d34ffd3..7a8a9b8 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 @@ -42,9 +42,11 @@ import io.swagger.v3.oas.annotations.tags.Tag; *

存量隔离:本控制器建的草稿一律 {@code setCategory("eip4")},{@link #list()} 只查该分类, * 库里 143 条老 shape act_re_model(旧 metaInfo + 可能悬空 editorSource)不进 Modeler 列表、避免打不开。

* - *

写入前 XML 一律过 {@link BpmnXMLConverter} 解析守卫(validateSchema=true + enableSafeBpmnXml=true, - * 后者关外部 DTD/实体解析,防 XXE/SSRF):坏 XML 返 422 且绝不落库;422 只回通用文案,原始解析原因仅进日志。 - * 守卫异常在本控制器就地 catch 转 422,不逸出到 {@code FlowExceptionHandler}(那里 FlowableException→400,语义不符)。 + *

写入前 XML 一律过解析守卫({@link #parseGuard}):①字节级拒 DOCTYPE(XXE 门);②{@link BpmnXMLConverter} + * 以 {@code validateSchema=false}(草稿是半成品,不做严格 XSD——bpmn-js 默认命名空间输出与严格 XSD 已知固有不兼容, + * 完整校验属部署门)+ {@code enableSafeBpmnXml=true}(加固解析器,双保险防外部实体)解析。坏 XML 返 422 且绝不落库; + * 422 只回通用文案,原始解析原因仅进日志。守卫异常就地 catch 转 422,不逸出到 {@code FlowExceptionHandler} + * (那里 FlowableException→400,语义不符)。 * {@code from-procdef} 复用「按 procDefId 读部署 BPMN」逻辑(本控制器自带 {@link #readProcessModel} 小方法, * 零改动 ProcessDiagramController)→ {@link BpmnIdSanitizer#sanitize} 净化中文 id → 建草稿, * 原→净化映射连同源 procDefId/原 key 写进 metaInfo,供发布逆向还原。

@@ -62,6 +64,9 @@ public class ProcessModelController { /** EIP4 草稿分类:建草稿时打此标,list() 只查此分类,隔离库里 143 条老 shape 存量 act_re_model。 */ static final String EIP4_CATEGORY = "eip4"; + /** DOCTYPE 门 prolog 扫描字节上限(BOM/XML 声明/注释/DOCTYPE 都在最前)。 */ + private static final int PROLOG_SCAN_BYTES = 8192; + private final RepositoryService repositoryService; private final ObjectMapper objectMapper = new ObjectMapper(); @@ -229,16 +234,27 @@ public class ProcessModelController { * BPMN 解析守卫:过则返回 {@code null}(放行),坏 XML 返回 422 ResponseEntity({status:1,msg})。 * 就地 catch 一切异常,不让引擎 XMLException/FlowableException 逸出到全局 advice(那里映射成 400,语义不符)。 * - *

{@code convertToBpmnModel(source, validateSchema, enableSafeBpmnXml)} 两布尔参: - * {@code validateSchema=true} 走 BPMN 2.0 XSD 校验(拒非法结构); - * {@code enableSafeBpmnXml=true} 启用 flowable 加固解析器(禁外部 DTD/参数实体/DOCTYPE), - * 关掉 XXE/SSRF 面——校验路径也走加固解析器,不给外部实体注入留口。

+ *

两道关:①解析前字节级 {@link #hasDoctypeInBytes} 拒 DOCTYPE 声明(XXE 兜底,不依赖 flowable + * 内部 {@code supportDTD=false} 实现);②{@code convertToBpmnModel(source, validateSchema, enableSafeBpmnXml)} + * 解析——{@code validateSchema=false}:草稿是可视化工具编辑的半成品,不做严格 BPMN 2.0 XSD 校验。 + * bpmn-js {@code saveXML} 用默认命名空间(无前缀 definitions/process)重序列化,Flowable 严格 Xerces XSD 校验 + * 会拒({@code cvc-complex-type.2.4.a})——这是 bpmn-js(面向 BPMN 模型,非字节级 XSD 合规)与严格 XSD 的 + * 已知固有不兼容;完整校验属部署门(T3.1 {@code ProcessValidator} 在解析后的模型上跑,非 XSD)。 + * {@code validateSchema=false} 仍解析(非良构 XML 抛→422);{@code enableSafeBpmnXml=true} 保加固解析器 + * (禁外部 DTD/参数实体/DOCTYPE),双保险关 XXE/SSRF。

* *

422 只回通用文案;原始解析原因(可能含内部路径/实体细节)仅进 {@code log.warn},不回显给调用方。

*/ private ResponseEntity> parseGuard(String xml) { + // ① XXE 兜底:解析前字节级拒 DOCTYPE。按 StringStreamSource 喂解析器的 UTF-8 字节视角扫描(含 BOM/UTF-16 + // 识别),消除「扫描端 vs 解析端编码错位」绕过。null XML 同走 422(与解析必抛等价)。 + if (xml == null || hasDoctypeInBytes(xml.getBytes(StandardCharsets.UTF_8))) { + log.warn("[流程草稿] BPMN 拒绝: {}", xml == null ? "空 XML" : "含 DOCTYPE 声明(XXE 防御)"); + return status(HttpStatus.UNPROCESSABLE_ENTITY, "BPMN 解析失败"); + } try { - new BpmnXMLConverter().convertToBpmnModel(new StringStreamSource(xml), true, true); + // ② validateSchema=false(不做严格 XSD)+ enableSafeBpmnXml=true(加固解析器);详见方法 javadoc。 + new BpmnXMLConverter().convertToBpmnModel(new StringStreamSource(xml), false, true); return null; } catch (Exception e) { log.warn("[流程草稿] BPMN 解析守卫拒绝: {}", e.toString()); @@ -246,6 +262,84 @@ public class ProcessModelController { } } + /** + * 字节级 DOCTYPE 检测(XXE 门):按 BOM / 无 BOM 的 UTF-16 空字节特征识别编码后解码 prolog,再走 + * {@link #hasDoctype}。消除「扫描端与解析端编码视角不一致」的绕过(UTF-8 BOM / UTF-16 会让纯字节扫描漏判 + * {@code 1 ? raw[1] & 0xFF : -1; + int u2 = raw.length > 2 ? raw[2] & 0xFF : -1; + if (u0 == 0xEF && u1 == 0xBB && u2 == 0xBF) { + cs = StandardCharsets.UTF_8; + off = 3; // UTF-8 BOM + } else if (u0 == 0xFF && u1 == 0xFE) { + cs = StandardCharsets.UTF_16LE; + off = 2; // UTF-16LE BOM + } else if (u0 == 0xFE && u1 == 0xFF) { + cs = StandardCharsets.UTF_16BE; + off = 2; // UTF-16BE BOM + } else if (u0 == '<' && u1 == 0x00) { + cs = StandardCharsets.UTF_16LE; // 无 BOM UTF-16LE(ASCII 起始字符夹空字节) + } else if (u0 == 0x00 && u1 == '<') { + cs = StandardCharsets.UTF_16BE; // 无 BOM UTF-16BE + } else { + cs = StandardCharsets.ISO_8859_1; // UTF-8 / Latin1:prolog 为 ASCII,字节级保真扫描 + } + int scanLen = Math.min(raw.length - off, PROLOG_SCAN_BYTES); + return hasDoctype(new String(raw, off, scanLen, cs)); + } + + /** + * 文档 prolog(根元素之前)是否含 DOCTYPE 声明(大小写不敏感)。正确跳过 XML 声明 {@code } 与注释 + * {@code },命中根元素起始标签即停(元素内容里的字面 {@code ", i + 4); + if (end < 0) { + return false; + } + i = end + 3; + continue; + } + if (xml.startsWith("", i + 2); + if (end < 0) { + return false; + } + i = end + 2; + continue; + } + return false; // 到达根元素起始标签,prolog 结束,无 DOCTYPE + } + return false; + } + /** 读流程定义部署 BPMN XML(getProcessModel 返回资源流)。读失败/为空返回 null(前端降级)。 */ private String readProcessModel(String procDefId) { try (InputStream is = repositoryService.getProcessModel(procDefId)) { diff --git a/flowable-service/src/test/java/com/eip4/flowservice/api/ProcessModelControllerTest.java b/flowable-service/src/test/java/com/eip4/flowservice/api/ProcessModelControllerTest.java index c64ea3d..e3c1c72 100644 --- a/flowable-service/src/test/java/com/eip4/flowservice/api/ProcessModelControllerTest.java +++ b/flowable-service/src/test/java/com/eip4/flowservice/api/ProcessModelControllerTest.java @@ -49,7 +49,7 @@ class ProcessModelControllerTest { MockMvc mvc; - // 最小 schema 合法 BPMN(default ns=BPMN20 MODEL),供 convertToBpmnModel(validateSchema=true) 过门。 + // 最小 schema 合法 BPMN(default ns=BPMN20 MODEL)。 private static final String VALID_BPMN = "" + "" + "" @@ -58,6 +58,31 @@ class ProcessModelControllerTest { + "" + ""; + // bpmn-js saveXML 风格:默认命名空间(无前缀 definitions/process)+ 带前缀 BPMNDI 布局段。 + // 此处 BPMNDiagram 排在 process 之前(触发严格 XSD 的 cvc-complex-type.2.4.a 序列违例——definitions 内容 + // 模型要求 rootElement* 在 BPMNDiagram* 之前)——模拟 bpmn-js 输出被严格 XSD 拒的真实故障族。 + // 草稿保存关 validateSchema 后应良构解析通过 → 200。 + private static final String BPMN_JS_STYLE = "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + ""; + + // 含 DOCTYPE 声明(XXE 面):正文良构、关严格 XSD 后本可解析,但字节级 DOCTYPE 守卫必须拒。 + private static final String DOCTYPE_XML = "" + + "]>" + + "" + + ""; + @BeforeEach void setUp() { ProcessModelController controller = new ProcessModelController(repositoryService); @@ -178,6 +203,47 @@ class ProcessModelControllerTest { verify(repositoryService, never()).addModelEditorSource(anyString(), any()); } + @Test + void 建草稿_bpmnJs默认命名空间输出_关严格XSD后200落库() throws Exception { + // 回归锚点:bpmn-js saveXML 默认命名空间输出被严格 XSD 拒(改前必红=422)。草稿保存不该做完整 XSD 校验 + // (完整校验属部署时 ProcessValidator,非 XSD)→ 关 validateSchema 后良构解析通过 → 200 建草稿成功。 + Model m = Mockito.mock(Model.class); + when(m.getId()).thenReturn("draft-js"); + when(repositoryService.newModel()).thenReturn(m); + + String body = "{\"name\":\"新流程\",\"key\":\"newproc\",\"bpmnXml\":" + jsonString(BPMN_JS_STYLE) + "}"; + mvc.perform(post("/api/flow/models").contentType(MediaType.APPLICATION_JSON).content(body)) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.modelId").value("draft-js")); + + verify(repositoryService).saveModel(m); + verify(repositoryService).addModelEditorSource(eq("draft-js"), any()); + } + + @Test + void 建草稿_含DOCTYPE声明_字节级XXE守卫返422不落库() throws Exception { + // 正文良构(关 XSD 后本可解析),但 DOCTYPE 声明是 XXE 面 → 解析前字节级守卫拒,不依赖 flowable 内部实现。 + String body = "{\"name\":\"x\",\"key\":\"k\",\"bpmnXml\":" + jsonString(DOCTYPE_XML) + "}"; + mvc.perform(post("/api/flow/models").contentType(MediaType.APPLICATION_JSON).content(body)) + .andExpect(status().isUnprocessableEntity()) + .andExpect(jsonPath("$.status").value(1)); + + verify(repositoryService, never()).saveModel(any()); + verify(repositoryService, never()).addModelEditorSource(anyString(), any()); + } + + @Test + void 建草稿_非良构XML_关严格XSD后仍返422不落库() throws Exception { + // 关 validateSchema=false 仅关严格 XSD,仍解析:标签不匹配是非良构 XML,解析必抛 → 422。 + String body = "{\"name\":\"x\",\"key\":\"k\",\"bpmnXml\":" + + jsonString("") + "}"; + mvc.perform(post("/api/flow/models").contentType(MediaType.APPLICATION_JSON).content(body)) + .andExpect(status().isUnprocessableEntity()) + .andExpect(jsonPath("$.status").value(1)); + + verify(repositoryService, never()).saveModel(any()); + } + @Test void 更新_草稿不存在返404() throws Exception { when(repositoryService.getModel("nope")).thenReturn(null);