diff --git a/flowable-service/src/main/java/com/eip4/flowservice/api/ProcessDiagramController.java b/flowable-service/src/main/java/com/eip4/flowservice/api/ProcessDiagramController.java index 4800a08..98c12bc 100644 --- a/flowable-service/src/main/java/com/eip4/flowservice/api/ProcessDiagramController.java +++ b/flowable-service/src/main/java/com/eip4/flowservice/api/ProcessDiagramController.java @@ -112,15 +112,37 @@ public class ProcessDiagramController { @GetMapping("/process-definitions/{procDefId}/source") @Operation(summary = "按流程定义 id 取净化源 XML", - description = "返回 {found, bpmnXml(净化后), idMap(原id→净化id), procDefKey, version},供 bpmn-js Modeler 在线编辑载入。" + description = "返回 {procDefId, found, bpmnXml(净化后), idMap(原id→净化id), procDefKey, version},供 bpmn-js Modeler 在线编辑载入。" + "流程定义不存在 / BPMN 读取失败或为空 → found=false(HTTP 200,前端降级)。" + "中文 process id 经 BpmnIdSanitizer 可逆净化,idMap 供发布时逆向还原原 key(D7)。") public ResponseEntity> source(@PathVariable String procDefId) { - Map resp = new LinkedHashMap<>(); - resp.put("procDefId", procDefId); - ProcessDefinition def = repositoryService.createProcessDefinitionQuery() .processDefinitionId(procDefId).singleResult(); + return sourceResponse(procDefId, def); + } + + @GetMapping("/process-definitions/by-key/{key}/source") + @Operation(summary = "按流程 key 取最新版净化源 XML", + description = "返回与 by-id 端点完全相同的形状 {procDefId, found, bpmnXml, idMap, procDefKey, version}," + + "供 Modeler 打开器按真流程 key 载入(process-select 的 source='model' 项 id 是 act_re_model id 而非 procDefId," + + "by-id 永远 found:false → 改用本端点)。processDefinitionKey(key).latestVersion() 取最新版,key 不存在 found:false。") + public ResponseEntity> sourceByKey(@PathVariable String key) { + ProcessDefinition def = repositoryService.createProcessDefinitionQuery() + .processDefinitionKey(key).latestVersion().singleResult(); + String procDefId = def == null ? null : def.getId(); + return sourceResponse(procDefId, def); + } + + /** + * 按已解析的流程定义构建源响应(by-id / by-key 共用,逻辑单一不复制):净化 XML + 原→净化 idMap + key/version。 + * {@code def==null}(不存在)或 BPMN 空/读失败 → {@code found:false}(HTTP 200,前端降级)。 + * {@code procDefId} 是读取部署 BPMN 资源用的定义 id(by-id=入参、by-key=解析出的最新版 id),命中时随响应回显。 + */ + private ResponseEntity> sourceResponse(String procDefId, ProcessDefinition def) { + Map resp = new LinkedHashMap<>(); + if (procDefId != null) { + resp.put("procDefId", procDefId); + } if (def == null) { resp.put("found", false); return ResponseEntity.ok(resp); diff --git a/flowable-service/src/test/java/com/eip4/flowservice/api/ProcessDiagramControllerTest.java b/flowable-service/src/test/java/com/eip4/flowservice/api/ProcessDiagramControllerTest.java index 205570b..6ba95a5 100644 --- a/flowable-service/src/test/java/com/eip4/flowservice/api/ProcessDiagramControllerTest.java +++ b/flowable-service/src/test/java/com/eip4/flowservice/api/ProcessDiagramControllerTest.java @@ -198,6 +198,50 @@ class ProcessDiagramControllerTest { .andExpect(jsonPath("$.found").value(false)); } + @Test + void sourceByKey_按key命中返最新版净化XML与idMap及版本() throws Exception { + // process-select options 的 source='model' 项 id 是 act_re_model id(非 procDefId),by-id 永远 found:false; + // 打开器改用 option.key(真流程 key)走本端点。latestVersion() 在两版本(v1/v2)里取 v2。 + ProcessDefinition v2 = org.mockito.Mockito.mock(ProcessDefinition.class); + when(v2.getId()).thenReturn("总包合同交底:2:aa22"); + when(v2.getKey()).thenReturn("总包合同交底"); + when(v2.getVersion()).thenReturn(2); + when(repositoryService.createProcessDefinitionQuery()).thenReturn(processDefinitionQuery); + when(processDefinitionQuery.processDefinitionKey("总包合同交底")).thenReturn(processDefinitionQuery); + when(processDefinitionQuery.latestVersion()).thenReturn(processDefinitionQuery); + when(processDefinitionQuery.singleResult()).thenReturn(v2); + + String xml = "" + + "" + + "" + + "" + + ""; + when(repositoryService.getProcessModel("总包合同交底:2:aa22")) + .thenReturn(new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8))); + + mvc.perform(get("/api/flow/process-definitions/by-key/{key}/source", "总包合同交底")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.found").value(true)) + .andExpect(jsonPath("$.procDefId").value("总包合同交底:2:aa22")) + .andExpect(jsonPath("$.procDefKey").value("总包合同交底")) + .andExpect(jsonPath("$.version").value(2)) + .andExpect(jsonPath("$.idMap['总包合同交底']").isNotEmpty()) + .andExpect(jsonPath("$.bpmnXml", + org.hamcrest.Matchers.not(org.hamcrest.Matchers.containsString("id=\"总包合同交底\"")))); + } + + @Test + void sourceByKey_key不存在返found_false() throws Exception { + when(repositoryService.createProcessDefinitionQuery()).thenReturn(processDefinitionQuery); + when(processDefinitionQuery.processDefinitionKey("无此流程")).thenReturn(processDefinitionQuery); + when(processDefinitionQuery.latestVersion()).thenReturn(processDefinitionQuery); + when(processDefinitionQuery.singleResult()).thenReturn(null); + + mvc.perform(get("/api/flow/process-definitions/by-key/{key}/source", "无此流程")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.found").value(false)); + } + @Test void source_读取XML异常返found_false不抛500() throws Exception { ProcessDefinition def = org.mockito.Mockito.mock(ProcessDefinition.class); 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 b1d7b10..664813f 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 @@ -244,6 +244,22 @@ public class FlowableClient { .body(Map.class)); } + /** + * 按流程 key 取最新版净化源 XML(供 Modeler 打开器按真流程 key 载入)。对应 flowable-service + * {@code GET /api/flow/process-definitions/by-key/{key}/source},返回体与 {@link #procDefSource} 同形状。 + * + *

process-select 的 {@code source='model'} 选项 id 是 act_re_model id 而非 procDefId, + * by-id 端点永远 {@code found:false} → 打开器改用真流程 key 走本路。key 同样作为 uri 变量严格编码 + * (纯中文 key percent 编码),绝不字符串拼 URL。 + */ + @SuppressWarnings("unchecked") + public Map procDefSourceByKey(String key) { + return execute("流程源(按key)", () -> restClient.get() + .uri("/api/flow/process-definitions/by-key/{key}/source", key) + .retrieve() + .body(Map.class)); + } + /** 按发起人查询历史流程实例。对应 flowable-service {@code GET /api/flow/process/started}。 */ public List started(String startedBy, int firstResult, int maxResults) { return execute("发起流程列表", () -> restClient.get() 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 b7a9490..a4e79c3 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 @@ -51,6 +51,20 @@ public class ProcessModelerController { return ResponseEntity.ok(flowableClient.procDefSource(procDefId)); } + @Operation(summary = "按流程 key 取最新版净化源 XML(超管)", + description = "超管门后转发 flowable-service /api/flow/process-definitions/by-key/{key}/source," + + "返回与 by-id 端点同形状。打开器对 process-select 的 source='model' 选项改用真流程 key 走本路" + + "(该选项 id 是 act_re_model id 非 procDefId,by-id 永远 found:false)。非超管 403。" + + "中文 key 由 FlowableClient 以 uri 变量严格编码转发。") + @GetMapping("/process-definitions/by-key/{key}/source") + public ResponseEntity> sourceByKey(@AuthenticationPrincipal AuthPrincipal principal, + @PathVariable String key) { + if (!EngineContextBinder.isSystemAdmin(principal)) { + return forbidden(); + } + return ResponseEntity.ok(flowableClient.procDefSourceByKey(key)); + } + /** 超管门未过:403 + {status:1,msg} 风格对齐既有网关端点。 */ private static ResponseEntity> forbidden() { Map body = new LinkedHashMap<>(); 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 8d3e624..997c64f 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 @@ -235,6 +235,33 @@ class FlowableClientTest { server.verify(); } + /** + * by-key 端点:process-select options 的 source='model' 项 id 非 procDefId,打开器改用真流程 key 走此路。 + * 纯中文 key「总包合同交底」作为 uri 变量严格编码转发——percent 编码,绝无裸中文。 + */ + @Test + void 取流程源按key_纯中文key作为uri变量严格编码不裸传() { + FlowGatewayProperties p = props(); + RestClient.Builder builder = RestClient.builder().baseUrl(p.getBaseUrl()); + MockRestServiceServer server = MockRestServiceServer.bindTo(builder).build(); + String key = "总包合同交底"; + server.expect(ExpectedCount.once(), requestTo(allOf( + startsWith("http://localhost:8089/api/flow/process-definitions/by-key/"), + endsWith("/source"), + containsString("%E6%80%BB"), // 「总」的 UTF-8 percent 编码,证明已编码 + not(containsString("总包合同交底"))))) // 中文未裸传 + .andExpect(method(HttpMethod.GET)) + .andRespond(withSuccess("{\"found\":true,\"procDefKey\":\"总包合同交底\",\"version\":2}", + MediaType.APPLICATION_JSON)); + FlowableClient client = new FlowableClient(builder.build(), p); + + Map resp = client.procDefSourceByKey(key); + + assertThat(resp).containsEntry("procDefKey", "总包合同交底"); + assertThat(resp).containsEntry("found", true); + server.verify(); + } + @Test void 取流程源_下游4xx透传FlowRemote且不重试() { FlowGatewayProperties p = props(); 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 7bdc324..6667fd8 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 @@ -82,4 +82,30 @@ class ProcessModelerControllerTest { .isInstanceOf(FlowServiceUnavailableException.class); verify(flowableClient).procDefSource(CN_PROCDEF); } + + // ---- by-key:process-select options=model 的语义缺口修复,打开器用真流程 key ---- + + private static final String CN_KEY = "总包合同交底"; + + @Test + void byKey_超管_透传下游源XML返回200() { + Map downstream = Map.of("found", true, "procDefId", "总包合同交底:2:aa22", + "procDefKey", "总包合同交底", "bpmnXml", "", "idMap", Map.of(), "version", 2); + when(flowableClient.procDefSourceByKey(CN_KEY)).thenReturn(downstream); + + ResponseEntity> resp = controller.sourceByKey(admin(), CN_KEY); + + assertThat(resp.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(resp.getBody()).isEqualTo(downstream); + verify(flowableClient).procDefSourceByKey(CN_KEY); + } + + @Test + void byKey_非超管_403且不触发下游调用() { + ResponseEntity> resp = controller.sourceByKey(normalUser(), CN_KEY); + + assertThat(resp.getStatusCode()).isEqualTo(HttpStatus.FORBIDDEN); + assertThat(resp.getBody()).containsEntry("status", 1).containsEntry("msg", "仅系统管理员可用"); + verify(flowableClient, never()).procDefSourceByKey(anyString()); + } }