From 93d86a0fb070ffde47a2d3423281a3662c32a373 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Sun, 14 Jun 2026 10:24:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=89=B9=20dogfoodi?= =?UTF-8?q?ng=20=E4=BF=AE=E5=A4=8D:=E6=A1=A5=E6=8E=A5=E6=B8=85=E6=B4=97=20?= =?UTF-8?q?joda=20=E6=97=B6=E9=97=B4=E5=8F=98=E9=87=8F=E9=81=BF=E5=85=8D?= =?UTF-8?q?=20Flowable=20=E5=BA=8F=E5=88=97=E5=8C=96=E5=B4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit P4 写路径巡检(HR_HOLIDAYAPPLY_SUBMIT)揪到:业务变量含 org.joda.time.DateTime(BEGINTIME), FlowableClient POST 时 Jackson 无 joda 模块→InvalidDefinitionException 起审批崩+泄露类名。 桥接 jsonSafeValue 反射检测 joda 时间类→epoch 毫秒(不引 joda 编译依赖)。集成重跑 status 0。 Co-Authored-By: Claude Opus 4.8 (1M context) --- .../workflow/ProcessCoreServiceBridge.java | 22 +++++++++++++++++++ .../ProcessCoreServiceBridgeTest.java | 21 ++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/workflow/ProcessCoreServiceBridge.java b/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/workflow/ProcessCoreServiceBridge.java index efd581c..61bfdd3 100644 --- a/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/workflow/ProcessCoreServiceBridge.java +++ b/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/workflow/ProcessCoreServiceBridge.java @@ -83,6 +83,11 @@ public class ProcessCoreServiceBridge { vars.put(ProcessCoreService.INITIATORDEPARTID, currentDepart); vars.put(INITIATORTIME, new java.util.Date()); + // dogfooding(HR_HOLIDAYAPPLY_SUBMIT)实测:保真层 POJO 的日期列是 org.joda.time.DateTime, + // FlowableClient 经 RestClient 序列化 POST 时 Jackson 默认无 joda 模块 → InvalidDefinitionException + // 起审批崩(且 msg 泄露类名)。此处把变量里的 joda 时间类型清洗为 JSON 安全形态。 + vars.replaceAll((k, v) -> jsonSafeValue(v)); + Map startRequest = new LinkedHashMap<>(); startRequest.put("processDefinitionKey", processName); startRequest.put("businessKey", businessKey); @@ -101,4 +106,21 @@ public class ProcessCoreServiceBridge { processName, businessKey, tableName, inst != null && inst.ended, target); return true; } + + /** + * 把流程变量值清洗成 JSON 可序列化形态:joda 时间类型(Jackson 默认不支持)→ epoch 毫秒 + * (Instant 族有 getMillis)或 ISO 字符串(LocalDate 等无 getMillis)。其它类型原样保留。 + * + *

用反射按类名检测,避免对 joda-time 形成编译期硬依赖(其仅为保真层传递依赖)。 + */ + private static Object jsonSafeValue(Object v) { + if (v == null || !v.getClass().getName().startsWith("org.joda.time.")) { + return v; + } + try { + return (Long) v.getClass().getMethod("getMillis").invoke(v); + } catch (ReflectiveOperationException | ClassCastException e) { + return v.toString(); + } + } } diff --git a/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/ProcessCoreServiceBridgeTest.java b/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/ProcessCoreServiceBridgeTest.java index a3ec981..ab3740e 100644 --- a/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/ProcessCoreServiceBridgeTest.java +++ b/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/ProcessCoreServiceBridgeTest.java @@ -110,6 +110,27 @@ class ProcessCoreServiceBridgeTest { eq("BK-2"), eq("OA_NOTICE"), eq(ProcessCoreService.STATUS_PASS)); } + @Test + @SuppressWarnings("unchecked") + void joda时间变量_清洗为epoch毫秒_避免FlowableClient序列化崩() { + // dogfooding(HR_HOLIDAYAPPLY_SUBMIT)实测:业务变量含 org.joda.time.DateTime(如 BEGINTIME), + // FlowableClient POST 时 Jackson 无 joda 模块 → InvalidDefinitionException 起审批崩。 + // 桥接须把 joda 时间类型清洗为 epoch 毫秒(Jackson 安全 + flowable 可存)。 + when(flowableClient.start(org.mockito.ArgumentMatchers.anyMap())).thenReturn(instance(false)); + + Map variables = new LinkedHashMap<>(); + variables.put("BEGINTIME", new org.joda.time.DateTime(1700000000000L)); + variables.put("AMOUNT", 100); // 非时间类型原样保留 + + bridge().startWorkflow("请假审批", variables, "HR_HOLIDAYAPPLY", "BK-3", ctxWith("U-1", "D-1")); + + ArgumentCaptor> reqCap = ArgumentCaptor.forClass(Map.class); + verify(flowableClient).start(reqCap.capture()); + Map vars = (Map) reqCap.getValue().get("variables"); + assertThat(vars.get("BEGINTIME")).isInstanceOf(Long.class).isEqualTo(1700000000000L); + assertThat(vars.get("AMOUNT")).isEqualTo(100); + } + @Test void businessKey空_抛ValidationException_不起流程不回写() { ProcessCoreServiceBridge b = bridge();