From ffe89e62bf6b41c7e0b06a3eeefaa0dbd97330a4 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 24 Jun 2026 10:36:41 +0800 Subject: [PATCH 1/8] =?UTF-8?q?test(arch):=20ArchUnit=20=E8=A7=84=E5=88=99?= =?UTF-8?q?=201=E2=86=926=20=E6=9D=A1(=E5=BC=BA=E5=88=B6+=E6=A3=98?= =?UTF-8?q?=E8=BD=AE),=E9=94=81=E4=BD=8F=E6=8E=A7=E5=88=B6=E5=99=A8?= =?UTF-8?q?=E5=88=86=E5=B1=82=E5=80=BA=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 强制:库模块(converter/parity)不得依赖应用编排层 + 模块切片无环。 棘轮(基线化存量、只挡新增):控制器不得新增直用 JdbcTemplate(26)/互相注入(4)/Poc 调试控制器(3)。 架构允许 com.eip4→com.dsasp,故不拦控制器调引擎,只拦直拼原始 SQL。 验证:6/6 绿,临时探针走完整 RED→GREEN 确认棘轮非空绿。见总览 §10 A4。 Co-Authored-By: Claude Opus 4.8 (1M context) --- .../platform/app/ArchitectureRulesTest.java | 97 ++++++++++++++++++- 1 file changed, 94 insertions(+), 3 deletions(-) diff --git a/platform-app/src/test/java/com/eip4/platform/app/ArchitectureRulesTest.java b/platform-app/src/test/java/com/eip4/platform/app/ArchitectureRulesTest.java index e2f8961..7514705 100644 --- a/platform-app/src/test/java/com/eip4/platform/app/ArchitectureRulesTest.java +++ b/platform-app/src/test/java/com/eip4/platform/app/ArchitectureRulesTest.java @@ -1,21 +1,112 @@ package com.eip4.platform.app; +import com.tngtech.archunit.base.DescribedPredicate; +import com.tngtech.archunit.core.domain.JavaClass; +import com.tngtech.archunit.core.importer.ImportOption; import com.tngtech.archunit.junit.AnalyzeClasses; import com.tngtech.archunit.junit.ArchTest; import com.tngtech.archunit.lang.ArchRule; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.web.bind.annotation.RestController; +import java.util.Set; + +import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes; import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses; +import static com.tngtech.archunit.library.dependencies.SlicesRuleDefinition.slices; /** - * 架构纪律(《架构设计》(docs/架构设计.md)第一节,ArchUnit 固化): - * com.eip4.* 可调 com.dsasp.*,反向禁止——保真层不得感知现代层。 + * 架构纪律(ArchUnit 编译期固化)。规则分两类: + * + *

强制规则(hard,当前已绿):违反即红,守护双层制方向、库模块独立性、模块无环。 + * + *

棘轮规则(ratchet,存量债务基线化):把现存技术债以「已知债务清单」白名单化, + * 只挡新增违规、不强拆旧代码。清单 = 待偿债务台账,清理一个就从清单删一个, + * 直到清单清空即可把该规则升级为强制规则(删去白名单参数)。 + * + *

背景、严重度与偿还路线见 {@code docs/项目进度与路线-总览-2026-06-21.md} §10 + * (控制器 SQL 收口=A4 / 控制器解耦=A3 / Poc 端点移除=§10.1 P0)。 + * + *

原则提醒:架构允许 {@code com.eip4.* → com.dsasp.*}(现代层是保真层的薄门面), + * 故「控制器调用保真层引擎服务」不是违规,本测试不拦;真正的坏味道是控制器直拼原始 SQL。 */ -@AnalyzeClasses(packages = {"com.dsasp", "com.eip4"}) +@AnalyzeClasses(packages = {"com.dsasp", "com.eip4"}, importOptions = ImportOption.DoNotIncludeTests.class) class ArchitectureRulesTest { + // ───────────────────────── 强制规则(hard,当前已绿) ───────────────────────── + @ArchTest static final ArchRule 保真层禁止依赖现代层 = noClasses().that().resideInAPackage("com.dsasp..") .should().dependOnClassesThat().resideInAPackage("com.eip4..") .because("双层制:移植的旧代码不重写、不感知新代码,保证与 framework 源码 diff 最小"); + + @ArchTest + static final ArchRule 库模块不得依赖应用编排层 = + noClasses().that().resideInAnyPackage("com.eip4.platform.converter..", "com.eip4.platform.parity..") + .should().dependOnClassesThat().resideInAnyPackage( + "com.eip4.platform.metadata..", + "com.eip4.platform.ai..", + "com.eip4.platform.flowgateway..", + "com.eip4.platform.auth..", + "com.eip4.platform.app..") + .because("转换器/对拍是可独立 CLI 跑批的库,不得反向依赖应用编排层(保持可独立运行)"); + + @ArchTest + static final ArchRule 模块间无循环依赖 = + slices().matching("com.eip4.platform.(*)..").should().beFreeOfCycles() + .because("模块化单体:模块间依赖必须是 DAG,出现环说明模块边界被破坏"); + + // ───────────────────────── 棘轮规则(ratchet,存量债务基线化) ───────────────────────── + + /** + * 控制器直接持有 JdbcTemplate 拼原始 SQL = 现代层退化成第二个「SQL 散落层」的根源(总览 §10 A4)。 + * 偿还方向:把 SQL 收口到 Service/Repository 层;清理一个就从本清单删一个。 + */ + private static final Set 控制器直用JdbcTemplate_存量债 = Set.of( + "FlowController", "AdminUserController", "TodoController", "ScriptExecuteController", + "EntityController", "PickerController", "PocScriptTestController", "ReportMenuController", + "AdminWriteController", "DesignFeatureController", "OrgController", "ProcessSelectController", + "PocWriteTestController", "AmisSchemaController", "ScheduleJobNotifyController", "TemplateTreeController", + "MetaController", "DataImportConfigController", "MenuController", "UserSelectController", + "EditGridScriptController", "FileController", "PocMasterSubController", "PageSchemaController", + "FieldEditorController", "FormDefaultsController"); + + @ArchTest + static final ArchRule 控制器不得新增直用JdbcTemplate = + noClasses().that().areAnnotatedWith(RestController.class) + .and(不在债务清单(控制器直用JdbcTemplate_存量债)) + .should().dependOnClassesThat().areAssignableTo(JdbcTemplate.class) + .because("控制器应把 SQL 收口到 Service/Repository(总览 §10 A4);存量见清单,新增禁止"); + + /** + * 控制器互相注入 = 横向耦合,应共同依赖 Service 而非彼此(总览 §10 A3)。 + */ + private static final Set 控制器互相依赖_存量债 = Set.of( + "EntityController", "TemplateTreeController", "ScheduleJobNotifyController", "FlowController"); + + @ArchTest + static final ArchRule 控制器不得新增互相依赖 = + noClasses().that().areAnnotatedWith(RestController.class) + .and(不在债务清单(控制器互相依赖_存量债)) + .should().dependOnClassesThat().areAnnotatedWith(RestController.class) + .because("@RestController 之间不得互相注入,应抽公共 Service 切断横向耦合(总览 §10 A3)"); + + /** + * Poc/调试控制器随生产 jar 装配 = 可达 RCE / 任意 DROP(总览 §10.1 P0)。 + * 下列 3 个是待移除的 P0 债,本清单仅为保持构建绿;P0 落地移除后,删清单并把本规则升为强制。 + */ + private static final Set Poc控制器_待移除P0 = Set.of( + "PocScriptTestController", "PocWriteTestController", "PocMasterSubController"); + + @ArchTest + static final ArchRule 不得新增Poc调试控制器 = + classes().that().areAnnotatedWith(RestController.class) + .and(不在债务清单(Poc控制器_待移除P0)) + .should().haveSimpleNameNotStartingWith("Poc") + .because("Poc/调试控制器不应进生产装配(总览 §10.1 P0:可达 RCE/任意 DROP);新增禁止,存量待移除"); + + private static DescribedPredicate 不在债务清单(Set debt) { + return DescribedPredicate.describe("不在已知债务清单", c -> !debt.contains(c.getSimpleName())); + } } From 0106088084587dc0030bfcebf736d0c27be10246 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 24 Jun 2026 10:36:41 +0800 Subject: [PATCH 2/8] =?UTF-8?q?feat(stability):=20perPage=20=E5=B0=81?= =?UTF-8?q?=E9=A1=B6=20+=20statement=5Ftimeout=20+=20=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E6=B1=A0=205=E2=86=9220?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 防 perPage=999999 一次物化全表致 OOM/连接耗尽: - Pagination.clampPerPage(上限 5000,安全护栏非产品限),接入 FlowController/PickerController 两 REST 入口(page 不封) - application.yml 加 hikari.connection-init-sql=SET statement_timeout='${EIP4_DB_STATEMENT_TIMEOUT:120s}'(dev/local/prod 继承 base,可覆盖/设0关闭) - maximum-pool-size 5→20(prod 无 profile 继承 base 受益) 验证:68/68 绿(PaginationTest+经真实 executeGet 集成+无回归);statement_timeout 经真实 PG SHOW=2min。见总览 §10.2。 Co-Authored-By: Claude Opus 4.8 (1M context) --- .../src/main/resources/application.yml | 8 ++++- .../platform/metadata/web/FlowController.java | 3 +- .../platform/metadata/web/Pagination.java | 25 ++++++++++++++ .../metadata/web/PickerController.java | 6 ++-- .../metadata/web/FlowControllerTest.java | 20 +++++++++++ .../platform/metadata/web/PaginationTest.java | 33 +++++++++++++++++++ 6 files changed, 91 insertions(+), 4 deletions(-) create mode 100644 platform-metadata/src/main/java/com/eip4/platform/metadata/web/Pagination.java create mode 100644 platform-metadata/src/test/java/com/eip4/platform/metadata/web/PaginationTest.java diff --git a/platform-app/src/main/resources/application.yml b/platform-app/src/main/resources/application.yml index a7715f2..842a3cc 100644 --- a/platform-app/src/main/resources/application.yml +++ b/platform-app/src/main/resources/application.yml @@ -10,9 +10,15 @@ spring: username: ceshi password: ceshi hikari: - maximum-pool-size: 5 + # 基础默认池(总览 §10.2)。default/prod profile 无独立 yml 时继承本值; + # dev/local 各自覆盖为更小值。生产高负载可经独立 prod profile 或环境进一步上调。 + maximum-pool-size: 20 # PoC 阶段对共享测试库默认只读,对拍写操作需显式改 false read-only: false + # 慢查询熔断(总览 §10.2):杀死单条运行超时的 SQL,防失控/恶意查询(如超大 perPage 全表扫) + # 长期占用连接、与小池叠加拖垮实例。会话级,随连接复用持续生效;dev/local 继承本项。 + # 默认 120s 对 OLTP 足够宽,重报表/批量场景经环境变量放宽,设 0 关闭。 + connection-init-sql: "SET statement_timeout = '${EIP4_DB_STATEMENT_TIMEOUT:120s}'" server: port: 8084 diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FlowController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FlowController.java index 1b43c0d..f358566 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FlowController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FlowController.java @@ -300,7 +300,8 @@ public class FlowController { return; } int page = parsePositiveInt(map.remove("page"), 1); - int perPage = parsePositiveInt(map.remove("perPage"), DEFAULT_PER_PAGE); + // perPage 封顶(总览 §10.2):防 perPage=999999 一次物化全表致 OOM/连接耗尽;page 不封(深翻页合法) + int perPage = Pagination.clampPerPage(parsePositiveInt(map.remove("perPage"), DEFAULT_PER_PAGE)); map.put(POJOCRUDService.PAGE_START, (page - 1) * perPage); map.put(POJOCRUDService.PAGE_SIZE, perPage); } diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/Pagination.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/Pagination.java new file mode 100644 index 0000000..62f6b5c --- /dev/null +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/Pagination.java @@ -0,0 +1,25 @@ +package com.eip4.platform.metadata.web; + +/** + * 分页参数安全护栏(总览 §10.2 稳定性)。 + * + *

仅作「安全上限」用途——防止客户端传 {@code perPage=999999} 让引擎一次把全表物化进内存, + * 与小连接池叠加即可单请求耗尽连接 / OOM。这不是产品级分页上限: + * 交互式大数据集应走服务端搜索({@code q});超大导出应走流式通道(未来工作)。 + */ +final class Pagination { + + /** 每页条数硬上限:远超任何真实页大小(amis 默认 10 / picker 20),远低于 OOM 阈值。 */ + static final int MAX_PER_PAGE = 5000; + + private Pagination() { + } + + /** 把每页条数夹到 {@code [1, MAX_PER_PAGE]};用于所有 REST 分页入口。 */ + static int clampPerPage(int perPage) { + if (perPage > MAX_PER_PAGE) { + return MAX_PER_PAGE; + } + return Math.max(perPage, 1); + } +} diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PickerController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PickerController.java index 1a06b8c..d423527 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PickerController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PickerController.java @@ -174,8 +174,10 @@ public class PickerController { : buildCtx(asUser, roles, asDepart, asOrg); Map cond = new HashMap<>(); - cond.put(POJOCRUDService.PAGE_START, (page - 1) * perPage); - cond.put(POJOCRUDService.PAGE_SIZE, perPage); + // perPage 封顶(总览 §10.2):防客户端传超大 perPage 一次拉全表致 OOM/连接耗尽 + int safePerPage = Pagination.clampPerPage(perPage); + cond.put(POJOCRUDService.PAGE_START, (page - 1) * safePerPage); + cond.put(POJOCRUDService.PAGE_SIZE, safePerPage); // 模糊搜索:仅当有关键字且存在可读标识列时下推 LIKE。q 经转义后进引擎(引擎对 String 条件裸拼 // col like '%值%',转义单引号与 LIKE 通配符,杜绝注入与通配符逃逸)。标识列名本身来自元数据,天然合法。 if (q != null && !q.isBlank() && labelColumn != null) { diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/FlowControllerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/FlowControllerTest.java index 2aee45b..cf5ebcc 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/FlowControllerTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/FlowControllerTest.java @@ -616,6 +616,26 @@ class FlowControllerTest { assertEquals("放假", sent.get("TITLE"), "其它 query 参数仍作过滤条件保留"); } + @Test + @DisplayName("14. perPage 超大封顶: 防一次拉全表致 OOM/连接耗尽(总览 §10.2)") + void clampsExcessivePerPage() { + String flowId = "PM_PROJECT_SEARCH"; + FlowExcuteService engine = mock(FlowExcuteService.class); + when(engine.excute(any(), any(), any())).thenReturn(new HashMap<>()); + FlowController controller = new FlowController(engine, resolverReturning(flowId, synthesized(flowId))); + + Map params = new HashMap<>(); + params.put("perPage", "999999"); // 恶意/失误的超大每页 + controller.executeGet(flowId, params); + + @SuppressWarnings("unchecked") + ArgumentCaptor> mapCap = ArgumentCaptor.forClass(Map.class); + org.mockito.Mockito.verify(engine).excute(mapCap.capture(), any(Properties.class), eq(flowId)); + Map sent = mapCap.getValue(); + assertEquals(Pagination.MAX_PER_PAGE, sent.get(POJOCRUDService.PAGE_SIZE), + "perPage 超上限应被夹到 MAX_PER_PAGE,不得原样下传引擎"); + } + @Test @DisplayName("13. 分页缺省: 只给 page,perPage 回落 amis 默认 10;page 缺省 1") void pagingDefaults() { diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PaginationTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PaginationTest.java new file mode 100644 index 0000000..26e9fb9 --- /dev/null +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PaginationTest.java @@ -0,0 +1,33 @@ +package com.eip4.platform.metadata.web; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +/** 分页护栏单测(总览 §10.2):封顶 perPage,挡住一次拉全表的 OOM/DoS 向量。 */ +class PaginationTest { + + @Test + @DisplayName("超大 perPage 夹到上限") + void clampsExcessive() { + assertEquals(Pagination.MAX_PER_PAGE, Pagination.clampPerPage(999999)); + assertEquals(Pagination.MAX_PER_PAGE, Pagination.clampPerPage(Integer.MAX_VALUE)); + assertEquals(Pagination.MAX_PER_PAGE, Pagination.clampPerPage(Pagination.MAX_PER_PAGE + 1)); + } + + @Test + @DisplayName("正常与边界值原样保留") + void keepsNormal() { + assertEquals(10, Pagination.clampPerPage(10)); + assertEquals(20, Pagination.clampPerPage(20)); + assertEquals(Pagination.MAX_PER_PAGE, Pagination.clampPerPage(Pagination.MAX_PER_PAGE)); + } + + @Test + @DisplayName("非正数夹到 1,避免 PAGE_SIZE<=0 的退化语义") + void clampsNonPositive() { + assertEquals(1, Pagination.clampPerPage(0)); + assertEquals(1, Pagination.clampPerPage(-1)); + } +} From 49e745912de59f6b3b7147ede638bc57c0d4f28b Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 24 Jun 2026 10:36:41 +0800 Subject: [PATCH 3/8] =?UTF-8?q?docs(=E6=80=BB=E8=A7=88):=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20=C2=A710=20=E6=9E=B6=E6=9E=84=E6=94=B9=E8=BF=9B?= =?UTF-8?q?=E5=BE=85=E5=8A=9E,=E5=90=88=E5=B9=B6=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E8=AF=84=E5=AE=A1=E5=B9=B6=E7=BA=A0=E5=81=8F=E4=B8=A5=E9=87=8D?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 8 维度架构评审 + 逐条核实其他 agent《架构分析与改进建议》(已删除,内容并入): - 真 P0:script-execute RCE / permitAll fail-open / asUser 越权 / CI 孤儿 - 可采纳工程项:A4 ArchUnit / A5 写收口 / D1 render runner / D5 LocalHostPolicy / 前端去重 - 严重度纠偏:ColumnSQL 不可达降 low、deleteByType 已缓解、A2 归因更正 标记 A4 与稳定性三件套已完成(含验证证据)。 Co-Authored-By: Claude Opus 4.8 (1M context) --- docs/项目进度与路线-总览-2026-06-21.md | 69 +++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) diff --git a/docs/项目进度与路线-总览-2026-06-21.md b/docs/项目进度与路线-总览-2026-06-21.md index a27c82c..ddaaf6b 100644 --- a/docs/项目进度与路线-总览-2026-06-21.md +++ b/docs/项目进度与路线-总览-2026-06-21.md @@ -165,4 +165,71 @@ EIP3(Vaadin / 老引擎)→ EIP4(amis 前端 + 保真层 + 转换器)迁 --- -*本文为人工可读的进度权威;逐视图细目见 framework backlog + TODO,方法论/部署 recipe 见用户管理 Delta 移植交接文档,特性设计见 plans/ 下 06-19/06-20 三份 design。* +## 10. 架构改进待办(2026-06-24 核实并并入) + +> 来源:① 一轮 8 维度架构评审(模块边界 / 巨型类 / 安全 / 性能 / 前端 / AI 五环 / 测试 / 运维),② 对另一份《EIP4 架构分析与改进建议》(其他 agent 产出)逐条对照**真实代码**核实(确认 / 夸大 / 已缓解 / 有意取舍)。**本节合并其可采纳内容,原文档已删除**(无外部引用)。 +> **定级第一原则=可达性**(无需前提即可触达 > 需管理员/DBA 前提的二阶面),而非「是否存在字符串拼接」。下列项**独立于 §5/§9**:§9 收口的是 AI 写路径安全门,本节是评审新发现的、AI 链之外的可达攻陷面与工程缺口。 + +### 10.1 P0 — 安全/工程止血(可达攻陷面 + 零回归防护) + +> 三条安全项强耦合(都靠「非 prod permitAll / prod 仅 authenticated」放大),建议作为一个「**安全基线**」批次一起做。 + +| 项 | 严重度 | 证据(file:line) | 建议 | +|---|---|---|---| +| **RCE — `/api/script/execute` + `/api/poc/write-test`** | 🔴 critical | `ScriptExecuteController.java:65→:193-198` 真执行请求体 Groovy(不受 facade 绑定约束=任意 Java/RCE),无 `@Profile`、无鉴权;`PocWriteTestController.java:181` `jdbcTemplate.execute("DROP TABLE IF EXISTS "+target)` 裸拼旁路 `DropTableSqlGuard`,无 `@Profile`。三个 `Poc*Controller` + 散落 `/api/poc/*` 随生产 jar 装配;全平台 `@PreAuthorize` 0 命中且无 `@EnableMethodSecurity` | 生产构建移除 / `@Profile("!prod")` 隔离全部 `Poc*`/`ScriptExecute` 端点;保留者加平台管理员级鉴权(开 `@EnableMethodSecurity`);新增 ArchUnit 规则禁生产源码出现 `Poc*` 的 `@RestController` | +| **安全默认 fail-open** | 🔴 critical | `SecurityConfig.java:68-71` `@Profile("!prod")`→`anyRequest().permitAll()`(default/local/ci/dev 全放行);prod 严格链(`:50-61`)存在但仅 `@Profile("prod")`,且**仓内无 `application-prod.yml`**=prod 必须显式激活否则默认洞开;`JwtService.java:44-55` 仅校验长度,`application.yml:29` dev 默认密钥能静默签发可伪造令牌 | 补 `application-prod.yml`(JWT secret 强制环境变量、缺省启动失败);**反转 fail-safe**:未知/无 profile 默认走严格链,`permitAll` 收窄到仅 `local\|ci\|test`;prod 若 JWT secret 仍为 dev 默认值则 fail-fast | +| **`asUser/roles` 越权(prod 同样生效)** | 🔴 critical | `EntityController.java:222-241` 客户端 `asUser/roles`(无 `@Profile` 的 `@RequestParam`)**优先于** `:247` JWT 绑定的 `UserSession.get()`,直驱 `DataPrivilegeServiceImpl` 行级数据权限,不校验是否等于 JWT 主体 | `asUser/roles` 测试通道 `@Profile("!prod")` 硬隔离;prod 引擎身份只能来自 JWT;确需 impersonation 须校验调用者持 `IMPERSONATE` 角色 | +| **CI 孤儿=自动回归实质为零** | 🔴 critical(工程) | `eip4-platform/.github/workflows/ci.yml` 是 GitHub Actions 语法但 origin=`git.latent.chat`(Gitea 不执行 GHA);`java-version "17"` 写死(项目 JDK21,即便能跑也编译失败=从未真跑过);`eip4-web` 无任何 CI | 把 `scripts/ci.sh` 迁成 `.gitea/workflows/ci.yml`(JDK 改 21)或公司 Jenkins;前端加最小 CI(vitest + `tsc -b`);Gitea 配 branch protection。**理由:P0 安全项修完后没有门禁防再退化。** | + +### 10.2 P1 — 稳定性 / 交付能力 / 验证体系 / 可维护性 + +**【稳定性】** +- **✅【已完成 2026-06-24·稳定性三件套】稳定性配置真空 · high**:原状=HikariCP `maximum-pool-size:5` + `statement_timeout` 全仓零命中 + perPage 无封顶 + `queryForRowSet` 全量物化,四者叠加=一个大/恶意查询(`perPage=999999`)即耗尽连接 + OOM。**已做**:① perPage 硬封顶——新增 `Pagination.clampPerPage`(上限 5000,护栏非产品限),接入 `FlowController.applyPaging` 与 `PickerController.list` 两处 REST 入口(`page` 不封,深翻页合法);② `statement_timeout`——base `application.yml` 加 `hikari.connection-init-sql: SET statement_timeout='${EIP4_DB_STATEMENT_TIMEOUT:120s}'`(dev/local 继承、prod 无 profile 亦继承 base,可环境变量放宽/设 0 关闭);③ 连接池 `maximum-pool-size` 5→20(prod 继承 base 受益)。**验证**:`PaginationTest` 3/3 + `FlowControllerTest`(含新「perPage 超大封顶」集成测试,经真实 `executeGet` 路径) + `PickerControllerTest` 无回归=68/68 绿;`SET statement_timeout='120s'` 经真实 PG(localhost:5433)执行 `SHOW`=2min 确认语法/取值正确;`application.yml` YAML 解析校验通过。**残留(独立较大项,未做)**:`SqlRowSet` 全量物化 → 导出走流式 `RowCallbackHandler`(属性能 P2,见 §10.3)。 + +**【生产交付能力 — 意图与实现最大成体系缺口,对应 A10】** +- **Flyway 平台表迁移未实现 · medium · L**:`架构设计.md:36` 承诺 Flyway,全仓零命中;SYS_* 建表散落 bootstrap/`*_upsert.sql`/CLI 内嵌(`bootstrap-ai-agent.sql` 两份易漂移)。→ 引入 Flyway 收敛为 `V{n}__*.sql` 单一真相。 +- **4 进程交付无 compose/Dockerfile/Nginx 配置 · medium · L**:`find docker-compose*` 零命中,切流/回滚仅停留文档。→ 补 `deploy/`(compose 四服务 + 健康检查 + `nginx.conf` 切流 upstream + `.env.example`)。 +- **可观测性近零 · medium · M**:pom 无 actuator/micrometer,无健康端点,无 `logback-spring.xml`。→ 加 actuator `/health`(liveness/readiness)+ prod JSON 结构化日志。 + +**【验证体系】** +- **逐行对拍框架已冻结 · high · M**:`parity-reports/` 全是 `20260611` 时间戳,对拍 main 末次提交 0611,11 天引擎/转换器改动从未重拍;`--discover`/`--realprivilege` 从不在 CI 跑。→ 接夜间 job + 基线锁定(本次 vs 上次 diff,非 0 即阻断)。 +- **保真层引擎核心无单测 + 集成测试静默跳过 · high · L**:`FlowExcuteServiceImpl`(534 行服务流主干)无单测;`FlowExecuteLocalIT.java:60` `assumeTrue(false,"本地不可达,跳过")`=无 DB 的 CI 永远绿但什么都没测(反模式:把「未运行」伪装成「通过」)。→ CI 必须起 testcontainers,DB 不可达应**红**而非跳过。 +- **测试金字塔倒置 · high · L**:根目录 71 png + 前端 121 png 人工 dogfooding 是主回归手段;前端 vitest 仅 17 个;3 套 e2e config 故意不配 webServer(复用已跑环境)无法干净 CI 跑起。→ 关键闭环固化成自启动可进 CI 的稳定 e2e;扩 vitest 把「翻译正确但运行时哑火」下沉到单测。 + +**【可维护性核心】** +- **【采纳自原文档 A5】AiLocalReleaseExecutor 裸写 sys_serviceflow/sys_menu · high · M**:`:126-148` 裸 INSERT serviceflow、`:181-211` 裸写 menu,仅 `sys_page_schema` 收口到 `PageSchemaWriter`(`:154-159`)。→ 复用已有 `MenuRegistrar` + 新建 serviceflow writer,令其走受控写入口(与 M3a 单一写真相纪律齐平)。 +- **✅【已完成 2026-06-24】【采纳自原文档 A4】ArchUnit 规则扩充**:`ArchitectureRulesTest.java` 从 1 条扩到 **6 条**——3 条强制(保真层禁依赖现代层 / 库模块[converter·parity]不得依赖应用编排层 / 模块切片 `beFreeOfCycles` 无环)+ 3 条**棘轮**(控制器不得新增直用 `JdbcTemplate` / 不得新增 Controller→Controller 互注入 / 不得新增 `Poc*` 调试控制器)。棘轮以「已知债务清单」基线化存量(JdbcTemplate 26 个 / 互注入 4 个 / Poc 3 个),只挡新增、清单即待偿台账。**验证**:`mvn -pl platform-app test -Dtest=ArchitectureRulesTest` 6/6 绿;并以临时探针走完整 RED→GREEN(探针触发恰好 3 条棘轮失败、强制规则不受影响,证明非空绿)。**一处刻意偏离原文档**:未加「禁控制器调 `POJOCRUDService`/引擎」——因 `com.eip4.*→com.dsasp.*` 是双层制明确允许(现代层=保真层薄门面),真正的坏味道是控制器直拼原始 SQL(已由 JdbcTemplate 棘轮覆盖)。**后续**:随 A1/A3 把控制器 SQL 收口到 Service 后,从清单删项,清空即把棘轮升为强制规则。 +- **【采纳自原文档 D1】render-plan 无执行闭环 · high · M**:`AiAgentService.validateRenderPlanGate:987-1085` 纯字段校验,Playwright 全是注释,`READY_FOR_HUMAN_REVIEW` 不含渲染证据。→ 新增 headless render runner 真跑 renderTests 后回写 `runEvidence`。 +- **AiAgentService(1846 LOC)SRP 严重违反 · high · L**:~28 public 入口 + 内联 9+ `validate*Gate` + 部署/回滚 SQL 生成 + 运行记录映射揉一类。→ 门禁抽 `AiDraftGateValidator`、SQL 抽 `AiDeploymentSqlBuilder`、持久化抽 `AiRunStore`,主类收敛为薄编排门面。 +- **【采纳自原文档 A1/A3】platform-metadata 过厚(31 Controller / 4 Service / 0 Repository)+ Controller 互注入 · medium · L**:`EntityController.java:46/:398` 直接注入并调用 `PickerController`。→ 抽 `PickerService`/`ReferenceResolutionService` 切断互注入;建 web/service/repository 分层(与 ArchUnit 合并做)。 +- **前端 scriptCommands 联动静默哑火 · medium · M**:`scriptCommands.ts:60-117` 把 `setRequired/setOptions/setFilter` 翻成 amis 未注册的 `setValue` 非标准 arg → 运行时 no-op、不报错、单测只断翻译形状。「动态必填/动态选项/数据过滤」可能整类失效。→ 改走 amis 真支持机制 + 补真实 DOM 断言 e2e。 +- **WritePrivilegeChecker 复杂规则 fail-open(读写权限不对称)· medium · M**:`WritePrivilegeChecker.java:156-159` 对部门集合/范围比较类规则 default 放行,而读侧对同类型生成真实约束 → 若客户库含此类写规则可越权 update/delete。→ 不支持类型改 fail-closed。 + +### 10.3 P2 — 整洁度 / 一致性收敛(多为采纳自原文档的真问题,但属低优先) + +- **【D5】抽共享 `LocalHostPolicy`**:`AiToolRegistry:155`/`AiSmokeRunner:105`/`AiLocalReleaseExecutor:298` 三处本机白名单写法不一致(`[::1]` vs `0:0:…`),统一以防新增绕过点。 +- **【B4】抽 `isAdmin(profile)` 单函数**:`profile?.account==='admin'||profile?.userId==='ADMIN'` 在 Topbar/ModelerPage/NewFeatureShell/AiFeatureForm/DesignCenterPage 5 处逐字硬编码。 +- **【B2】删 `api/schema.ts:65-102` overlay 死代码**(零调用,真相在 `editor/overlayApi.ts`);**【B1/B5】**拆 AmisRenderer SDK 注册逻辑、合并 todo.ts/done.ts 503 降级——均**低优先整洁度**,非架构风险。 +- **【D2/D3】AI 多入口来源审计**:REST/CLI/MCP 三通道 actor 恒「agent」无区分,加 `X-EIP4-Agent-Channel` 头 + 审计;`runLocalSmoke` 过 `smoke.run` 工具门对齐 `applyLocalRelease`(localhost 硬门已兜底,非可利用洞)。 +- **converter 单测 4820 行/164 用例塞 1 文件**(按控件族拆 6-10 个);**cli/mcp 各仅 1 测试文件**(对外 AI 门面加契约/快照测试);**e2e 5 套 config 碎片化**(合并为 1 主 config + projects)。 +- **保真层级联/附件加载残留 N+1**(`loadDoc` 按子行 id 集合一次 IN);端口契约(8084/8093/8094 漂移)+ 源码树 `.omc` 卫生。 + +### 10.4 严重度纠偏与已缓解(核实原文档后修正,避免误导排期) + +| 原文档断言 | 核实结论 | 纠偏 | +|---|---|---| +| **ColumnSQL =最大残余注入面(high/P0)** | **降为 low/二阶纵深防御** | 裸拼属实(`POInfo.java:377` `LEFT JOIN lateral ("+ColumnSQL+")`),但**无可达写路径**:`MetaController.saveAttr` 不写 columnsql、`FieldEditorController` 改业务数据且受 `IdentifierWhitelist` 守卫、`MasterDetailLinker` INSERT 列清单不含它=需 DBA 直改库才触发。价值在加守卫禁任何写路径设 columnsql,优先级远低于 10.1 | +| Admin/AdminWrite 拼 SQL+级联删+调引擎 | **归因部分不实** | AdminController **只读、不调引擎**;级联删只在 AdminWriteController;调引擎实为 EntityController | +| `deleteByType` 列为待修注入热点 | **已缓解** | 已被 `LogController.deleteByType:73` 枚举白名单闸住(非法 type 拒绝);保真层主 CRUD 值位置多数已 `escapeSqlLiteral` 转义 | +| NewFeatureShell/AiFeatureForm 各内联 250+ 行 schema | **夸大** | 合计 ~290 行,但 AiFeatureForm 仅 ~69 行 | +| LLM 修复客户端泄露风险(high) | **已默认关闭** | `HttpAiLlmRepairClient` 经 `@ConditionalOnProperty havingValue=true` + endpoint 空串双重默认关;聚焦「开启时脱敏 + https 白名单」 | + +### 10.5 有意取舍(design-intent,不当缺陷) + +不引 ORM / 保真层 `com.dsasp.*` 逐字节复刻不重写(故保真层字符串拼接、类级 `@Transactional`、`DataLogManager` 的 `DiscardOldestPolicy` 均源于此,改写须跨流回归不可当普通坏味道)/ 无多租户单客户私有化 / 保真层 MD5 无盐口令(复刻旧 `EncryptUtil` 验存量库)/ AI 红线焊死(部署包恒人审、本机三处校验、LLM 默认关)。这些是已记录的有意决策,**别当 bug**。 + +> **采纳裁决一句话**:原文档的「工程整洁度 + AI 门禁」清单(A4/A5/D1/D5/B2/B4 等)核实属实、可放心采纳为 P1/P2;但其安全威胁建模做反了(把不可达的 ColumnSQL 当 critical、漏了可达的 RCE/permitAll/asUser),**安全 P0 以本节 10.1 为准**。 + +--- + +*本文为人工可读的进度权威;逐视图细目见 framework backlog + TODO,方法论/部署 recipe 见用户管理 Delta 移植交接文档,特性设计见 plans/ 下 06-19/06-20 三份 design。架构改进待办见 §10(2026-06-24 并入,取代已删除的《EIP4 架构分析与改进建议》)。* From 378fd746823e6a5c6f859818fea28d051f6bffa1 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 24 Jun 2026 10:52:25 +0800 Subject: [PATCH 4/8] =?UTF-8?q?refactor(ai):=20AI=20=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E8=A3=B8=E5=86=99=E4=B8=8B=E6=B2=89=E5=88=B0?= =?UTF-8?q?=20AiReleaseWriter=20+=20=E8=A1=A5=E5=80=BC=E6=96=AD=E8=A8=80?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A5 安全半步:把 AiLocalReleaseExecutor 里所有 sys_serviceflow/sys_menu 裸 JDBC(含 ensureAiMenuParent/tableExists/实体复用查询)收拢到新类 AiReleaseWriter,执行器只剩编排;SQL 逐字保留=零行为变更。 新增 AiReleaseWriterTest 4 值断言(serviceflow 审计/?::xml/bool→int、菜单 INSERT 全列值、UPDATE 全字段、自动建「AI Agent」目录),补上原黄金测试只查表名的宽松缺口。 platform-ai 30/30 绿(黄金测试经搬迁仍绿=行为未变)。与人走五环 MenuRegistrar 的完整统一(两者已分叉)留作专项,见总览 §10 A5。 Co-Authored-By: Claude Opus 4.8 (1M context) --- docs/项目进度与路线-总览-2026-06-21.md | 2 +- .../ai/service/AiLocalReleaseExecutor.java | 134 ++------------- .../platform/ai/service/AiReleaseWriter.java | 157 ++++++++++++++++++ .../ai/service/AiReleaseWriterTest.java | 112 +++++++++++++ 4 files changed, 284 insertions(+), 121 deletions(-) create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/service/AiReleaseWriter.java create mode 100644 platform-ai/src/test/java/com/eip4/platform/ai/service/AiReleaseWriterTest.java diff --git a/docs/项目进度与路线-总览-2026-06-21.md b/docs/项目进度与路线-总览-2026-06-21.md index ddaaf6b..0acfd10 100644 --- a/docs/项目进度与路线-总览-2026-06-21.md +++ b/docs/项目进度与路线-总览-2026-06-21.md @@ -197,7 +197,7 @@ EIP3(Vaadin / 老引擎)→ EIP4(amis 前端 + 保真层 + 转换器)迁 - **测试金字塔倒置 · high · L**:根目录 71 png + 前端 121 png 人工 dogfooding 是主回归手段;前端 vitest 仅 17 个;3 套 e2e config 故意不配 webServer(复用已跑环境)无法干净 CI 跑起。→ 关键闭环固化成自启动可进 CI 的稳定 e2e;扩 vitest 把「翻译正确但运行时哑火」下沉到单测。 **【可维护性核心】** -- **【采纳自原文档 A5】AiLocalReleaseExecutor 裸写 sys_serviceflow/sys_menu · high · M**:`:126-148` 裸 INSERT serviceflow、`:181-211` 裸写 menu,仅 `sys_page_schema` 收口到 `PageSchemaWriter`(`:154-159`)。→ 复用已有 `MenuRegistrar` + 新建 serviceflow writer,令其走受控写入口(与 M3a 单一写真相纪律齐平)。 +- **🟡【已完成安全半步 2026-06-24】【采纳自原文档 A5】AiLocalReleaseExecutor 裸写 sys_serviceflow/sys_menu**:**已做**——把执行器里所有裸 JDBC(sys_serviceflow UPSERT + sys_menu INSERT/UPDATE + ensureAiMenuParent + tableExists + 实体复用查询)下沉到新类 `platform-ai/.../service/AiReleaseWriter`,执行器只剩编排不再直接碰库;SQL 逐字保留(纯搬迁零行为变更)。**顺带补缺口**:新增 `AiReleaseWriterTest`(4 值断言:serviceflow 审计/`?::xml`/bool→int、菜单 INSERT 全列值、UPDATE 全字段、自动建「AI Agent」目录)——补上原 `AiLocalReleaseExecutorTest` 只查「SQL 含表名」的宽松缺口。**验证**:platform-ai 30/30 绿(黄金测试经搬迁仍绿=行为未变)。**未做(推迟为专项)**:与人走五环 `MenuRegistrar` 统一成单一写器——调查发现两者已实质分叉(本类 UPDATE 全字段 + operator 字面量 'AI_AGENT' + 顶级目录「AI Agent」vs MenuRegistrar 窄 UPDATE + `?` operator + 「新功能」),且各有钉死测试,真统一需重写两路测试 + 重验两条红线邻近路径(建议 live e2e),风险/工作量超「快速增量」,留作 A5 完整版专项。 - **✅【已完成 2026-06-24】【采纳自原文档 A4】ArchUnit 规则扩充**:`ArchitectureRulesTest.java` 从 1 条扩到 **6 条**——3 条强制(保真层禁依赖现代层 / 库模块[converter·parity]不得依赖应用编排层 / 模块切片 `beFreeOfCycles` 无环)+ 3 条**棘轮**(控制器不得新增直用 `JdbcTemplate` / 不得新增 Controller→Controller 互注入 / 不得新增 `Poc*` 调试控制器)。棘轮以「已知债务清单」基线化存量(JdbcTemplate 26 个 / 互注入 4 个 / Poc 3 个),只挡新增、清单即待偿台账。**验证**:`mvn -pl platform-app test -Dtest=ArchitectureRulesTest` 6/6 绿;并以临时探针走完整 RED→GREEN(探针触发恰好 3 条棘轮失败、强制规则不受影响,证明非空绿)。**一处刻意偏离原文档**:未加「禁控制器调 `POJOCRUDService`/引擎」——因 `com.eip4.*→com.dsasp.*` 是双层制明确允许(现代层=保真层薄门面),真正的坏味道是控制器直拼原始 SQL(已由 JdbcTemplate 棘轮覆盖)。**后续**:随 A1/A3 把控制器 SQL 收口到 Service 后,从清单删项,清空即把棘轮升为强制规则。 - **【采纳自原文档 D1】render-plan 无执行闭环 · high · M**:`AiAgentService.validateRenderPlanGate:987-1085` 纯字段校验,Playwright 全是注释,`READY_FOR_HUMAN_REVIEW` 不含渲染证据。→ 新增 headless render runner 真跑 renderTests 后回写 `runEvidence`。 - **AiAgentService(1846 LOC)SRP 严重违反 · high · L**:~28 public 入口 + 内联 9+ `validate*Gate` + 部署/回滚 SQL 生成 + 运行记录映射揉一类。→ 门禁抽 `AiDraftGateValidator`、SQL 抽 `AiDeploymentSqlBuilder`、持久化抽 `AiRunStore`,主类收敛为薄编排门面。 diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java index f0e60a5..a4ff409 100644 --- a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java @@ -8,7 +8,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.UUID; import org.springframework.http.HttpStatus; import org.springframework.jdbc.core.JdbcTemplate; @@ -18,24 +17,21 @@ import org.springframework.web.server.ResponseStatusException; import com.eip4.platform.ai.model.AiApplyStepResult; import com.eip4.platform.ai.model.AiArtifactType; import com.eip4.platform.ai.model.AiDraft; -import com.eip4.platform.metadata.schema.PageSchemaWriter; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @Component public class AiLocalReleaseExecutor { - private final JdbcTemplate jdbcTemplate; + private final AiReleaseWriter writer; private final AiSmokeHttpClient httpClient; private final ObjectMapper objectMapper; - private final PageSchemaWriter pageSchemaWriter; public AiLocalReleaseExecutor(JdbcTemplate jdbcTemplate, AiSmokeHttpClient httpClient, ObjectMapper objectMapper) { - this.jdbcTemplate = jdbcTemplate; + // A5 收口:所有 sys_serviceflow/sys_menu 裸写下沉到 AiReleaseWriter(页面 schema 仍经其内的 PageSchemaWriter) + this.writer = new AiReleaseWriter(jdbcTemplate); this.httpClient = httpClient; this.objectMapper = objectMapper; - // M3a 收口:标准层页面 schema 写统一走 PageSchemaWriter(与设计中心新建端点共用单一写真相) - this.pageSchemaWriter = new PageSchemaWriter(jdbcTemplate); } public List apply(String baseUrl, List drafts) { @@ -93,9 +89,7 @@ public class AiLocalReleaseExecutor { if (root.path("status").asInt(1) != 0) { String message = root.path("msg").asText("unknown"); if (message.contains("实体已存在")) { - List ids = jdbcTemplate.queryForList( - "SELECT TRIM(sys_entity_id) FROM sys_entity WHERE tablename=? AND isactive=1", - String.class, tableName); + List ids = writer.findActiveEntityIdsByTable(tableName); if (!ids.isEmpty()) { ctx.entityId(ids.get(0)); ctx.tableName(tableName); @@ -123,28 +117,13 @@ public class AiLocalReleaseExecutor { for (JsonNode flow : draft.payload().path("flows")) { String key = flow.path("key").asText(); String xml = flow.path("contentXml").asText().replace("${entityId}", ctx.entityId()); - jdbcTemplate.update(""" - INSERT INTO sys_serviceflow - (sys_serviceflow_id, displayname, contentxml, entityid, iscontrol, isupdateable, - isactive, createtime, updatetime, createby, updateby, version) - VALUES (?, ?, ?::xml, ?, ?, ?, 1, ?, ?, 'AI_AGENT', 'AI_AGENT', 0) - ON CONFLICT (sys_serviceflow_id) DO UPDATE SET - displayname = EXCLUDED.displayname, - contentxml = EXCLUDED.contentxml, - entityid = EXCLUDED.entityid, - iscontrol = EXCLUDED.iscontrol, - isupdateable = EXCLUDED.isupdateable, - updatetime = EXCLUDED.updatetime, - updateby = EXCLUDED.updateby, - version = sys_serviceflow.version + 1 - """, + writer.upsertServiceFlow( key, flow.path("displayName").asText(key), xml, ctx.entityId(), - flow.path("control").asBoolean(true) ? 1 : 0, - flow.path("updateable").asBoolean(true) ? 1 : 0, - now, + flow.path("control").asBoolean(true), + flow.path("updateable").asBoolean(true), now); count++; } @@ -155,106 +134,23 @@ public class AiLocalReleaseExecutor { // M3a 收口:不再裸 INSERT sys_page_schema;走 PageSchemaWriter 唯一写真相(typed 校验告警 + etag + UPSERT) String schemaJson = objectMapper.writeValueAsString(draft.payload()); String name = draft.payload().path("title").asText(draft.targetId()); - String etag = pageSchemaWriter.upsertStandard(draft.targetId(), name, schemaJson, "AI_AGENT"); + String etag = writer.upsertPageSchema(draft.targetId(), name, schemaJson); return applied(index, draft, "页面 schema 已发布", Map.of("templateId", draft.targetId(), "etag", etag)); } private AiApplyStepResult applyMenu(ApplyContext ctx, AiDraft draft, int index) { - if (!tableExists("sys_menu")) { + if (!writer.tableExists("sys_menu")) { return skipped(index, draft, "本地库缺少 sys_menu,菜单挂载跳过,部署包保留人工 SQL"); } String templateId = draft.payload().path("viewTemplateId").asText(draft.targetId()); String menuName = draft.payload().path("name").asText(templateId); String parentId = textOrBlank(draft.payload().get("parentId")); String menuRoot = textOrBlank(draft.payload().get("menuroot")); - if (parentId.isBlank()) { - ParentMenu parent = ensureAiMenuParent(menuRoot); - parentId = parent.parentId(); - menuRoot = parent.menuRoot(); - } - List existing = jdbcTemplate.queryForList( - "SELECT TRIM(sys_menu_id) FROM sys_menu WHERE TRIM(view_templateid)=? AND isactive=1", - String.class, templateId); - String menuId = existing.isEmpty() ? UUID.randomUUID().toString() : existing.get(0); - long now = System.currentTimeMillis(); - if (existing.isEmpty()) { - jdbcTemplate.update(""" - INSERT INTO sys_menu - (sys_menu_id, name, parentid, view_templateid, typename, menuroot, seq, - isactive, version, createtime, createby, updatetime, updateby) - VALUES (?, ?, ?, ?, ?, ?, ?, 1, 0, ?, 'AI_AGENT', ?, 'AI_AGENT') - """, - menuId, - menuName, - parentId, - templateId, - draft.payload().path("typename").asText("功能菜单"), - menuRoot.isBlank() ? null : menuRoot, - draft.payload().path("seq").asInt(0), - now, - now); - } else { - jdbcTemplate.update(""" - UPDATE sys_menu - SET name=?, parentid=?, view_templateid=?, typename=?, menuroot=?, seq=?, - updatetime=?, updateby='AI_AGENT', version=version+1 - WHERE TRIM(sys_menu_id)=? - """, - menuName, - parentId, - templateId, - draft.payload().path("typename").asText("功能菜单"), - menuRoot.isBlank() ? null : menuRoot, - draft.payload().path("seq").asInt(0), - now, - menuId); - } - return applied(index, draft, "菜单已挂载", Map.of("menuId", menuId, "parentId", parentId)); - } - - private ParentMenu ensureAiMenuParent(String preferredRoot) { - List existingDir = jdbcTemplate.queryForList( - "SELECT TRIM(sys_menu_id) FROM sys_menu WHERE name='AI Agent' AND parentid IS NULL AND isactive=1 ORDER BY seq LIMIT 1", - String.class); - if (!existingDir.isEmpty()) { - String root = preferredRoot; - if (root == null || root.isBlank()) { - List roots = jdbcTemplate.queryForList( - "SELECT TRIM(menuroot) FROM sys_menu WHERE TRIM(sys_menu_id)=?", - String.class, existingDir.get(0)); - root = roots.isEmpty() ? "" : roots.get(0); - } - return new ParentMenu(existingDir.get(0), root == null ? "" : root); - } - String root = preferredRoot; - if (root == null || root.isBlank()) { - List roots = jdbcTemplate.queryForList( - "SELECT TRIM(sys_menu_root_id) FROM sys_menu_root WHERE isactive=1 ORDER BY seq LIMIT 1", - String.class); - if (roots.isEmpty()) { - throw new ResponseStatusException(HttpStatus.CONFLICT, "缺少 sys_menu_root,不能自动挂载菜单"); - } - root = roots.get(0); - } - String dirId = UUID.randomUUID().toString(); - long now = System.currentTimeMillis(); - jdbcTemplate.update(""" - INSERT INTO sys_menu - (sys_menu_id, name, parentid, view_templateid, typename, menuroot, seq, - isactive, version, createtime, createby, updatetime, updateby) - VALUES (?, 'AI Agent', NULL, NULL, '目录', ?, 9999, 1, 0, ?, 'AI_AGENT', ?, 'AI_AGENT') - """, - dirId, root, now, now); - return new ParentMenu(dirId, root); - } - - private boolean tableExists(String tableName) { - try { - Boolean exists = jdbcTemplate.queryForObject("SELECT to_regclass(?) IS NOT NULL", Boolean.class, tableName); - return Boolean.TRUE.equals(exists); - } catch (RuntimeException ex) { - return false; - } + String typename = draft.payload().path("typename").asText("功能菜单"); + int seq = draft.payload().path("seq").asInt(0); + AiReleaseWriter.MenuWrite mw = writer.upsertMenu(templateId, menuName, parentId, menuRoot, typename, seq, + System.currentTimeMillis()); + return applied(index, draft, "菜单已挂载", Map.of("menuId", mw.menuId(), "parentId", mw.parentId())); } private static AiApplyStepResult applied(int index, AiDraft draft, String message, Map details) { @@ -341,6 +237,4 @@ public class AiLocalReleaseExecutor { } } - private record ParentMenu(String parentId, String menuRoot) { - } } diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiReleaseWriter.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiReleaseWriter.java new file mode 100644 index 0000000..d16278d --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiReleaseWriter.java @@ -0,0 +1,157 @@ +package com.eip4.platform.ai.service; + +import java.util.List; +import java.util.UUID; + +import org.springframework.http.HttpStatus; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.web.server.ResponseStatusException; + +import com.eip4.platform.metadata.schema.PageSchemaWriter; + +/** + * AI 本地发布的受控写真相(总览 §10 A5)。 + * + *

把原先散在 {@link AiLocalReleaseExecutor} 里的裸 {@code JdbcTemplate} 写 + * (sys_serviceflow / sys_menu)收拢到本类,使执行器只管编排、不直接碰库; + * 标准层页面 schema 继续走 {@link PageSchemaWriter}(M3a 单一写真相)。 + * + *

SQL 与原执行器逐字一致(纯搬迁、零行为变更)。菜单挂载逻辑刻意未复用 + * 人走五环的 {@code MenuRegistrar}:两者已分叉(本类 UPDATE 全字段 + operator 字面量 + * 'AI_AGENT' + 顶级目录「AI Agent」),统一为单一写器属后续专项(见 §10 A5)。 + */ +class AiReleaseWriter { + + private final JdbcTemplate jdbcTemplate; + private final PageSchemaWriter pageSchemaWriter; + + AiReleaseWriter(JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; + this.pageSchemaWriter = new PageSchemaWriter(jdbcTemplate); + } + + /** 物理表是否存在(本地库可能缺 sys_menu 等)。 */ + boolean tableExists(String tableName) { + try { + Boolean exists = jdbcTemplate.queryForObject("SELECT to_regclass(?) IS NOT NULL", Boolean.class, tableName); + return Boolean.TRUE.equals(exists); + } catch (RuntimeException ex) { + return false; + } + } + + /** 实体「已存在」时按表名查回既有 sys_entity_id(发布幂等)。 */ + List findActiveEntityIdsByTable(String tableName) { + return jdbcTemplate.queryForList( + "SELECT TRIM(sys_entity_id) FROM sys_entity WHERE tablename=? AND isactive=1", + String.class, tableName); + } + + /** UPSERT 单条服务流(主键冲突则更新 + version+1);createby/updateby 恒 'AI_AGENT'。 */ + void upsertServiceFlow(String key, String displayName, String contentXml, String entityId, + boolean control, boolean updateable, long now) { + jdbcTemplate.update(""" + INSERT INTO sys_serviceflow + (sys_serviceflow_id, displayname, contentxml, entityid, iscontrol, isupdateable, + isactive, createtime, updatetime, createby, updateby, version) + VALUES (?, ?, ?::xml, ?, ?, ?, 1, ?, ?, 'AI_AGENT', 'AI_AGENT', 0) + ON CONFLICT (sys_serviceflow_id) DO UPDATE SET + displayname = EXCLUDED.displayname, + contentxml = EXCLUDED.contentxml, + entityid = EXCLUDED.entityid, + iscontrol = EXCLUDED.iscontrol, + isupdateable = EXCLUDED.isupdateable, + updatetime = EXCLUDED.updatetime, + updateby = EXCLUDED.updateby, + version = sys_serviceflow.version + 1 + """, + key, displayName, contentXml, entityId, + control ? 1 : 0, updateable ? 1 : 0, now, now); + } + + /** 标准层页面 schema 写,委托 PageSchemaWriter(typed 校验告警 + etag + UPSERT)。返回 etag。 */ + String upsertPageSchema(String targetId, String name, String schemaJson) { + return pageSchemaWriter.upsertStandard(targetId, name, schemaJson, "AI_AGENT"); + } + + /** + * 挂载/更新功能菜单:dedup by view_templateid(命中走 UPDATE 全字段),parentId 为空则 + * 自动 ensure/复用顶级目录「AI Agent」。返回最终 menuId 与 parentId。 + */ + MenuWrite upsertMenu(String templateId, String menuName, String parentId, String menuRoot, + String typename, int seq, long now) { + String pid = parentId; + String root = menuRoot; + if (pid == null || pid.isBlank()) { + ParentMenu parent = ensureAiMenuParent(root); + pid = parent.parentId(); + root = parent.menuRoot(); + } + List existing = jdbcTemplate.queryForList( + "SELECT TRIM(sys_menu_id) FROM sys_menu WHERE TRIM(view_templateid)=? AND isactive=1", + String.class, templateId); + String menuId = existing.isEmpty() ? UUID.randomUUID().toString() : existing.get(0); + Object rootArg = (root == null || root.isBlank()) ? null : root; + if (existing.isEmpty()) { + jdbcTemplate.update(""" + INSERT INTO sys_menu + (sys_menu_id, name, parentid, view_templateid, typename, menuroot, seq, + isactive, version, createtime, createby, updatetime, updateby) + VALUES (?, ?, ?, ?, ?, ?, ?, 1, 0, ?, 'AI_AGENT', ?, 'AI_AGENT') + """, + menuId, menuName, pid, templateId, typename, rootArg, seq, now, now); + } else { + jdbcTemplate.update(""" + UPDATE sys_menu + SET name=?, parentid=?, view_templateid=?, typename=?, menuroot=?, seq=?, + updatetime=?, updateby='AI_AGENT', version=version+1 + WHERE TRIM(sys_menu_id)=? + """, + menuName, pid, templateId, typename, rootArg, seq, now, menuId); + } + return new MenuWrite(menuId, pid); + } + + private ParentMenu ensureAiMenuParent(String preferredRoot) { + List existingDir = jdbcTemplate.queryForList( + "SELECT TRIM(sys_menu_id) FROM sys_menu WHERE name='AI Agent' AND parentid IS NULL AND isactive=1 ORDER BY seq LIMIT 1", + String.class); + if (!existingDir.isEmpty()) { + String root = preferredRoot; + if (root == null || root.isBlank()) { + List roots = jdbcTemplate.queryForList( + "SELECT TRIM(menuroot) FROM sys_menu WHERE TRIM(sys_menu_id)=?", + String.class, existingDir.get(0)); + root = roots.isEmpty() ? "" : roots.get(0); + } + return new ParentMenu(existingDir.get(0), root == null ? "" : root); + } + String root = preferredRoot; + if (root == null || root.isBlank()) { + List roots = jdbcTemplate.queryForList( + "SELECT TRIM(sys_menu_root_id) FROM sys_menu_root WHERE isactive=1 ORDER BY seq LIMIT 1", + String.class); + if (roots.isEmpty()) { + throw new ResponseStatusException(HttpStatus.CONFLICT, "缺少 sys_menu_root,不能自动挂载菜单"); + } + root = roots.get(0); + } + String dirId = UUID.randomUUID().toString(); + long now = System.currentTimeMillis(); + jdbcTemplate.update(""" + INSERT INTO sys_menu + (sys_menu_id, name, parentid, view_templateid, typename, menuroot, seq, + isactive, version, createtime, createby, updatetime, updateby) + VALUES (?, 'AI Agent', NULL, NULL, '目录', ?, 9999, 1, 0, ?, 'AI_AGENT', ?, 'AI_AGENT') + """, + dirId, root, now, now); + return new ParentMenu(dirId, root); + } + + /** 菜单写结果:最终 menuId 与 parentId。 */ + record MenuWrite(String menuId, String parentId) { + } + + private record ParentMenu(String parentId, String menuRoot) { + } +} diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiReleaseWriterTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiReleaseWriterTest.java new file mode 100644 index 0000000..ba518c9 --- /dev/null +++ b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiReleaseWriterTest.java @@ -0,0 +1,112 @@ +package com.eip4.platform.ai.service; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.contains; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.util.List; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; +import org.springframework.jdbc.core.JdbcTemplate; + +/** + * AiReleaseWriter 值断言单测(总览 §10 A5):钉死 sys_serviceflow / sys_menu 的列值, + * 补上 AiLocalReleaseExecutorTest 只查「SQL 含表名」的宽松缺口,使 A5 搬迁可证行为无变。 + */ +class AiReleaseWriterTest { + + private static final String DEDUP_SQL = + "SELECT TRIM(sys_menu_id) FROM sys_menu WHERE TRIM(view_templateid)=? AND isactive=1"; + private static final String DIR_SQL = + "SELECT TRIM(sys_menu_id) FROM sys_menu WHERE name='AI Agent' AND parentid IS NULL AND isactive=1 ORDER BY seq LIMIT 1"; + private static final String ROOT_OF_DIR_SQL = + "SELECT TRIM(menuroot) FROM sys_menu WHERE TRIM(sys_menu_id)=?"; + private static final String MENU_ROOT_TABLE_SQL = + "SELECT TRIM(sys_menu_root_id) FROM sys_menu_root WHERE isactive=1 ORDER BY seq LIMIT 1"; + + @Test + @DisplayName("服务流 UPSERT:?::xml 转型 + bool→int + 审计恒 'AI_AGENT' + 同批 now") + void serviceFlowUpsertWritesExactValues() { + JdbcTemplate jdbc = mock(JdbcTemplate.class); + AiReleaseWriter w = new AiReleaseWriter(jdbc); + + w.upsertServiceFlow("FLOW_ADD", "新增流", "", "e-1", true, false, 123L); + + ArgumentCaptor sql = ArgumentCaptor.forClass(String.class); + verify(jdbc, times(1)).update(sql.capture(), + eq("FLOW_ADD"), eq("新增流"), eq(""), eq("e-1"), eq(1), eq(0), eq(123L), eq(123L)); + assertTrue(sql.getValue().contains("INSERT INTO sys_serviceflow")); + assertTrue(sql.getValue().contains("?::xml")); + assertTrue(sql.getValue().contains("ON CONFLICT (sys_serviceflow_id) DO UPDATE")); + assertTrue(sql.getValue().contains("'AI_AGENT'")); + } + + @Test + @DisplayName("菜单首挂:dedup 空 → INSERT 全列值正确,parentId=既有「AI Agent」目录") + void menuInsertUnderExistingAiDir() { + JdbcTemplate jdbc = mock(JdbcTemplate.class); + when(jdbc.queryForList(eq(DEDUP_SQL), eq(String.class), eq("TPL"))).thenReturn(List.of()); + when(jdbc.queryForList(eq(DIR_SQL), eq(String.class))).thenReturn(List.of("DIR-AI")); + when(jdbc.queryForList(eq(ROOT_OF_DIR_SQL), eq(String.class), eq("DIR-AI"))).thenReturn(List.of("ROOT")); + AiReleaseWriter w = new AiReleaseWriter(jdbc); + + AiReleaseWriter.MenuWrite mw = w.upsertMenu("TPL", "菜单名", "", "", "功能菜单", 0, 999L); + + assertEquals("DIR-AI", mw.parentId()); + assertTrue(mw.menuId() != null && !mw.menuId().isBlank()); + ArgumentCaptor sql = ArgumentCaptor.forClass(String.class); + verify(jdbc, times(1)).update(sql.capture(), + eq(mw.menuId()), eq("菜单名"), eq("DIR-AI"), eq("TPL"), eq("功能菜单"), eq("ROOT"), + eq(0), eq(999L), eq(999L)); + assertTrue(sql.getValue().contains("INSERT INTO sys_menu")); + assertTrue(sql.getValue().contains("'AI_AGENT'")); + } + + @Test + @DisplayName("菜单重挂:dedup 命中 → 走 UPDATE 全字段(含 parentid/typename/menuroot/seq,区别于人路径窄更新)") + void menuUpdateWritesAllFields() { + JdbcTemplate jdbc = mock(JdbcTemplate.class); + when(jdbc.queryForList(eq(DEDUP_SQL), eq(String.class), eq("TPL"))).thenReturn(List.of("MENU-X")); + AiReleaseWriter w = new AiReleaseWriter(jdbc); + + AiReleaseWriter.MenuWrite mw = w.upsertMenu("TPL", "改名", "P-1", "R-1", "功能菜单", 5, 999L); + + assertEquals("MENU-X", mw.menuId()); + assertEquals("P-1", mw.parentId()); + ArgumentCaptor sql = ArgumentCaptor.forClass(String.class); + verify(jdbc, times(1)).update(sql.capture(), + eq("改名"), eq("P-1"), eq("TPL"), eq("功能菜单"), eq("R-1"), eq(5), eq(999L), eq("MENU-X")); + assertTrue(sql.getValue().contains("UPDATE sys_menu")); + assertTrue(sql.getValue().contains("version=version+1")); + } + + @Test + @DisplayName("无「AI Agent」目录时自动建之(typename '目录' / seq 9999 / 取首个 menu_root)") + void ensureCreatesAiDirWhenMissing() { + JdbcTemplate jdbc = mock(JdbcTemplate.class); + when(jdbc.queryForList(eq(DEDUP_SQL), eq(String.class), eq("TPL"))).thenReturn(List.of()); + when(jdbc.queryForList(eq(DIR_SQL), eq(String.class))).thenReturn(List.of()); + when(jdbc.queryForList(eq(MENU_ROOT_TABLE_SQL), eq(String.class))).thenReturn(List.of("ROOT-9")); + AiReleaseWriter w = new AiReleaseWriter(jdbc); + + AiReleaseWriter.MenuWrite mw = w.upsertMenu("TPL", "菜单名", "", "", "功能菜单", 0, 999L); + + // 目录 INSERT:'AI Agent' 字面量 + root='ROOT-9'(dirId/now 为生成值) + verify(jdbc, times(1)).update(contains("'AI Agent'"), anyString(), eq("ROOT-9"), anyLong(), anyLong()); + // 菜单挂到新建目录下(parentId=新 dirId,非空) + assertTrue(mw.parentId() != null && !mw.parentId().isBlank()); + verify(jdbc, times(1)).update(contains("INSERT INTO sys_menu"), + eq(mw.menuId()), eq("菜单名"), eq(mw.parentId()), eq("TPL"), eq("功能菜单"), eq("ROOT-9"), + eq(0), eq(999L), eq(999L)); + } +} From 21a181f44b733764e8065211f00d1bfcabb683b4 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 24 Jun 2026 11:05:33 +0800 Subject: [PATCH 5/8] =?UTF-8?q?feat(observability):=20Actuator=20=E5=81=A5?= =?UTF-8?q?=E5=BA=B7=E7=AB=AF=E7=82=B9=20+=20=E6=BB=9A=E5=8A=A8=E6=97=A5?= =?UTF-8?q?=E5=BF=97=20+=20base=20=E6=97=A5=E5=BF=97=E9=99=8D=E5=99=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 总览 §10.2 可观测性: - platform-app 加 spring-boot-starter-actuator,management 只暴露 health(开 liveness/readiness 探针,show-details when-authorized 不泄露 db 等组件细节);不上 Prometheus 全家桶 - SecurityConfig.PUBLIC_PATHS 加 /actuator/health(/**),prod 链探针免认证可达 - 新增 logback-spring.xml(控制台 + 50MB×14 天滚动文件,文件 appender 仅 dev/local/prod 启用,不污染单测) - base application.yml 日志 com.dsasp/jdbc.core DEBUG→INFO(prod 继承 INFO,dev 仍 DEBUG);.gitignore 忽略 logs/ 验证:真启动 dev profile(1.7s)curl /actuator/health=200 {UP,groups:[liveness,readiness]} + readiness/liveness 均 200 UP;SecurityProfileTest 3/3 + ArchitectureRulesTest 6/6 无回归。 Co-Authored-By: Claude Opus 4.8 (1M context) --- .gitignore | 2 + docs/项目进度与路线-总览-2026-06-21.md | 2 +- platform-app/pom.xml | 2 + .../src/main/resources/application.yml | 19 ++++++- .../src/main/resources/logback-spring.xml | 49 +++++++++++++++++++ .../auth/security/SecurityConfig.java | 3 +- 6 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 platform-app/src/main/resources/logback-spring.xml diff --git a/.gitignore b/.gitignore index 427fe68..4fde07c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,8 @@ parity-reports/ .DS_Store # C3 卫生:可再生噪声(2026-06-13) +# 运行时日志(logback 滚动文件;§10.2 可观测性) +logs/ __pycache__/ *.pyc /data/ diff --git a/docs/项目进度与路线-总览-2026-06-21.md b/docs/项目进度与路线-总览-2026-06-21.md index 0acfd10..cfaf1d3 100644 --- a/docs/项目进度与路线-总览-2026-06-21.md +++ b/docs/项目进度与路线-总览-2026-06-21.md @@ -189,7 +189,7 @@ EIP3(Vaadin / 老引擎)→ EIP4(amis 前端 + 保真层 + 转换器)迁 **【生产交付能力 — 意图与实现最大成体系缺口,对应 A10】** - **Flyway 平台表迁移未实现 · medium · L**:`架构设计.md:36` 承诺 Flyway,全仓零命中;SYS_* 建表散落 bootstrap/`*_upsert.sql`/CLI 内嵌(`bootstrap-ai-agent.sql` 两份易漂移)。→ 引入 Flyway 收敛为 `V{n}__*.sql` 单一真相。 - **4 进程交付无 compose/Dockerfile/Nginx 配置 · medium · L**:`find docker-compose*` 零命中,切流/回滚仅停留文档。→ 补 `deploy/`(compose 四服务 + 健康检查 + `nginx.conf` 切流 upstream + `.env.example`)。 -- **可观测性近零 · medium · M**:pom 无 actuator/micrometer,无健康端点,无 `logback-spring.xml`。→ 加 actuator `/health`(liveness/readiness)+ prod JSON 结构化日志。 +- **✅【已完成 2026-06-24】可观测性近零**:原状=无 actuator/无健康端点/无 logback 配置/base 日志 DEBUG(prod 继承会刷屏)。**已做**:① platform-app 加 `spring-boot-starter-actuator`,`management` 只暴露 `health`(`probes.enabled` 开 liveness/readiness,`show-details/components: when-authorized` 匿名不泄露 db 等组件细节)——不上 Prometheus 全家桶,守中间件最小化;② `SecurityConfig.PUBLIC_PATHS` 加 `/actuator/health(/**)`,prod 链探针免认证可达;③ 新增 `logback-spring.xml`(控制台 + 50MB×14 天滚动文件,文件 appender 仅 dev/local/prod 启用、不污染单测);④ base `application.yml` 的 `com.dsasp`/`jdbc.core` 日志 DEBUG→INFO(prod 继承 INFO,dev 仍 DEBUG)。**验证**:真启动 dev profile(1.7s 起)curl `/actuator/health`=`200 {"status":"UP","groups":["liveness","readiness"]}`、`/health/readiness`=200 UP、`/health/liveness`=200 UP;SecurityProfileTest 3/3 + ArchitectureRulesTest 6/6 无回归。**残留**:prod JSON 结构化日志需 Spring Boot 3.4 内建或 logstash-encoder 依赖,留作后续(避免现在加依赖)。 **【验证体系】** - **逐行对拍框架已冻结 · high · M**:`parity-reports/` 全是 `20260611` 时间戳,对拍 main 末次提交 0611,11 天引擎/转换器改动从未重拍;`--discover`/`--realprivilege` 从不在 CI 跑。→ 接夜间 job + 基线锁定(本次 vs 上次 diff,非 0 即阻断)。 diff --git a/platform-app/pom.xml b/platform-app/pom.xml index f2da973..a83ab95 100644 --- a/platform-app/pom.xml +++ b/platform-app/pom.xml @@ -20,6 +20,8 @@ com.eip4platform-converter com.eip4platform-ai org.springframework.bootspring-boot-starter-web + + org.springframework.bootspring-boot-starter-actuator org.postgresqlpostgresqlruntime org.springframework.bootspring-boot-starter-testtest diff --git a/platform-app/src/main/resources/application.yml b/platform-app/src/main/resources/application.yml index 842a3cc..edfe220 100644 --- a/platform-app/src/main/resources/application.yml +++ b/platform-app/src/main/resources/application.yml @@ -40,7 +40,22 @@ eip4: file: root: ${EIP4_FILE_ROOT:./data/files} +# 可观测性(总览 §10.2):只暴露 health(含 liveness/readiness 探针),不开 env/beans 等敏感端点。 +# 健康详情仅对已认证者可见(匿名探针只见 UP/DOWN,不泄露 db 等组件细节)。 +management: + endpoints: + web: + exposure: + include: health + endpoint: + health: + probes: + enabled: true + show-details: when-authorized + show-components: when-authorized + logging: level: - com.dsasp: DEBUG - org.springframework.jdbc.core: DEBUG + # base 默认 INFO(prod 无独立 profile 时继承此处,避免 DEBUG 刷屏);dev profile 覆盖为 DEBUG 调试 + com.dsasp: INFO + org.springframework.jdbc.core: INFO diff --git a/platform-app/src/main/resources/logback-spring.xml b/platform-app/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..658a208 --- /dev/null +++ b/platform-app/src/main/resources/logback-spring.xml @@ -0,0 +1,49 @@ + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + UTF-8 + + + + + ${LOG_FILE} + + ${FILE_LOG_PATTERN} + UTF-8 + + + ${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz + 50MB + 14 + 2GB + + + + + + + + + + + + + + + + + + diff --git a/platform-auth/src/main/java/com/eip4/platform/auth/security/SecurityConfig.java b/platform-auth/src/main/java/com/eip4/platform/auth/security/SecurityConfig.java index 2aeb3bc..41e2bb5 100644 --- a/platform-auth/src/main/java/com/eip4/platform/auth/security/SecurityConfig.java +++ b/platform-auth/src/main/java/com/eip4/platform/auth/security/SecurityConfig.java @@ -30,11 +30,12 @@ import org.springframework.security.web.util.matcher.AntPathRequestMatcher; @Configuration public class SecurityConfig { - /** 始终放行的路径:登录端点 + API 文档(认证前置依赖,不得拦)。 */ + /** 始终放行的路径:登录端点 + API 文档(认证前置依赖) + 健康探针(LB/k8s 探活,prod 亦免认证)。 */ static final String[] PUBLIC_PATHS = { "/api/auth/**", "/swagger-ui/**", "/swagger-ui.html", "/v3/api-docs/**", "/v3/api-docs.yaml", + "/actuator/health", "/actuator/health/**", }; private final JwtService jwtService; From c4ef673b0a8103c1b808d082febf58f1b9f76118 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 24 Jun 2026 11:12:22 +0800 Subject: [PATCH 6/8] =?UTF-8?q?refactor(ai):=20=E4=B8=89=E5=A4=84=E6=9C=AC?= =?UTF-8?q?=E6=9C=BA=E5=88=A4=E5=AE=9A=E7=BB=9F=E4=B8=80=E5=88=B0=20LocalH?= =?UTF-8?q?ostPolicy(D5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit AiToolRegistry/AiSmokeRunner/AiLocalReleaseExecutor 原各写一份本机白名单且互异(一处认 0:0:0:0:0:0:0:1 漏 [::1],另两处反之)。 新增 LocalHostPolicy.isLocalHost:去 IPv6 方括号归一 + 精确比对回环集 {localhost,127.0.0.1,::1,0:0:0:0:0:0:0:1},杜绝 127.0.0.1.evil.com 伪本地绕过;三处删副本统一委托。 验证:新增 LocalHostPolicyTest(全回环形态接受 + 伪本地/非本机拒绝)3/3 + 三处既有测试无回归,platform-ai 69/69 绿。见总览 §10 D5。 Co-Authored-By: Claude Opus 4.8 (1M context) --- docs/项目进度与路线-总览-2026-06-21.md | 2 +- .../ai/service/AiLocalReleaseExecutor.java | 10 +--- .../platform/ai/service/AiSmokeRunner.java | 10 +--- .../platform/ai/service/AiToolRegistry.java | 8 ++-- .../platform/ai/service/LocalHostPolicy.java | 38 +++++++++++++++ .../ai/service/LocalHostPolicyTest.java | 46 +++++++++++++++++++ 6 files changed, 90 insertions(+), 24 deletions(-) create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/service/LocalHostPolicy.java create mode 100644 platform-ai/src/test/java/com/eip4/platform/ai/service/LocalHostPolicyTest.java diff --git a/docs/项目进度与路线-总览-2026-06-21.md b/docs/项目进度与路线-总览-2026-06-21.md index cfaf1d3..5e1f1e4 100644 --- a/docs/项目进度与路线-总览-2026-06-21.md +++ b/docs/项目进度与路线-总览-2026-06-21.md @@ -207,7 +207,7 @@ EIP3(Vaadin / 老引擎)→ EIP4(amis 前端 + 保真层 + 转换器)迁 ### 10.3 P2 — 整洁度 / 一致性收敛(多为采纳自原文档的真问题,但属低优先) -- **【D5】抽共享 `LocalHostPolicy`**:`AiToolRegistry:155`/`AiSmokeRunner:105`/`AiLocalReleaseExecutor:298` 三处本机白名单写法不一致(`[::1]` vs `0:0:…`),统一以防新增绕过点。 +- **✅【已完成 2026-06-24】【D5】抽共享 `LocalHostPolicy`**:原状=`AiToolRegistry`/`AiSmokeRunner`/`AiLocalReleaseExecutor` 三处本机白名单互异(ToolRegistry 认展开式 `0:0:0:0:0:0:0:1` 漏 `[::1]`,另两处反之)。**已做**:新增 `LocalHostPolicy.isLocalHost`(去 IPv6 方括号归一 + 精确比对回环集 `{localhost,127.0.0.1,::1,0:0:0:0:0:0:0:1}`,杜绝 `127.0.0.1.evil.com` 伪本地绕过),三处删本地副本统一委托。**验证**:新增 `LocalHostPolicyTest`(接受全部回环形态 + 拒绝伪本地/非本机)3/3 + 三处既有测试(AiToolRegistry 6/AiSmokeRunner 3/AiLocalReleaseExecutor 3)无回归,整套 platform-ai 69/69 绿。 - **【B4】抽 `isAdmin(profile)` 单函数**:`profile?.account==='admin'||profile?.userId==='ADMIN'` 在 Topbar/ModelerPage/NewFeatureShell/AiFeatureForm/DesignCenterPage 5 处逐字硬编码。 - **【B2】删 `api/schema.ts:65-102` overlay 死代码**(零调用,真相在 `editor/overlayApi.ts`);**【B1/B5】**拆 AmisRenderer SDK 注册逻辑、合并 todo.ts/done.ts 503 降级——均**低优先整洁度**,非架构风险。 - **【D2/D3】AI 多入口来源审计**:REST/CLI/MCP 三通道 actor 恒「agent」无区分,加 `X-EIP4-Agent-Channel` 头 + 审计;`runLocalSmoke` 过 `smoke.run` 工具门对齐 `applyLocalRelease`(localhost 硬门已兜底,非可利用洞)。 diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java index a4ff409..4a1d43e 100644 --- a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java @@ -181,7 +181,7 @@ public class AiLocalReleaseExecutor { if (!"http".equalsIgnoreCase(scheme) && !"https".equalsIgnoreCase(scheme)) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "baseUrl 只允许 http/https"); } - if (!isLocalHost(host)) { + if (!LocalHostPolicy.isLocalHost(host)) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "本地发布仅允许访问本机地址"); } String normalized = uri.toString(); @@ -191,14 +191,6 @@ public class AiLocalReleaseExecutor { return URI.create(normalized); } - private static boolean isLocalHost(String host) { - if (host == null) { - return false; - } - String h = host.toLowerCase(Locale.ROOT); - return "localhost".equals(h) || "127.0.0.1".equals(h) || "::1".equals(h) || "[::1]".equals(h); - } - private static String textOrBlank(JsonNode node) { if (node == null || node.isNull()) { return ""; diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiSmokeRunner.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiSmokeRunner.java index fdd37d4..b96be1a 100644 --- a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiSmokeRunner.java +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiSmokeRunner.java @@ -92,7 +92,7 @@ public class AiSmokeRunner { if (!"http".equalsIgnoreCase(scheme) && !"https".equalsIgnoreCase(scheme)) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "baseUrl 只允许 http/https"); } - if (!isLocalHost(host)) { + if (!LocalHostPolicy.isLocalHost(host)) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "smoke 仅允许访问本机地址"); } String normalized = uri.toString(); @@ -102,14 +102,6 @@ public class AiSmokeRunner { return URI.create(normalized); } - private static boolean isLocalHost(String host) { - if (host == null) { - return false; - } - String h = host.toLowerCase(Locale.ROOT); - return "localhost".equals(h) || "127.0.0.1".equals(h) || "::1".equals(h) || "[::1]".equals(h); - } - private static String text(JsonNode node, String field, String fallback) { JsonNode value = node == null ? null : node.get(field); if (value == null || value.isNull()) { diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiToolRegistry.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiToolRegistry.java index 1138eb3..f5bc06c 100644 --- a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiToolRegistry.java +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiToolRegistry.java @@ -156,11 +156,9 @@ public final class AiToolRegistry { if (targetEnv.isBlank() || targetEnv.equals("local") || targetEnv.equals("dev")) { return true; } - // 解析 host 精确比对,而非 startsWith 前缀:防 http://127.0.0.1.evil.com / http://localhost.evil.com - // 这类「伪本地」域名绕过(对抗审查 major)。与下游 AiLocalReleaseExecutor.safeLocalBase 同口径。 - String host = hostOf(targetEnv); - return host.equals("localhost") || host.equals("127.0.0.1") - || host.equals("::1") || host.equals("0:0:0:0:0:0:0:1"); + // 解析 host 后交统一的 LocalHostPolicy 精确比对(非前缀),防 http://127.0.0.1.evil.com / + // http://localhost.evil.com 伪本地绕过(对抗审查 major);三处本机判定同口径(总览 §10 D5)。 + return LocalHostPolicy.isLocalHost(hostOf(targetEnv)); } private static boolean isProductionEnv(String targetEnv) { diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/LocalHostPolicy.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/LocalHostPolicy.java new file mode 100644 index 0000000..ec2f5c1 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/LocalHostPolicy.java @@ -0,0 +1,38 @@ +package com.eip4.platform.ai.service; + +import java.util.Locale; +import java.util.Set; + +/** + * AI「仅限本机」红线的单一本机判定(总览 §10 D5)。 + * + *

原先 {@code AiToolRegistry} / {@code AiSmokeRunner} / {@code AiLocalReleaseExecutor} 三处各写一份 + * 白名单且互异——一处认展开式 {@code 0:0:0:0:0:0:0:1} 却漏方括号式 {@code [::1]},另两处反之, + * 同一回环地址一处放行一处拒绝。本类统一为去括号归一 + 精确比对的回环集,消除漂移。 + * + *

精确比对(非前缀):杜绝 {@code http://127.0.0.1.evil.com} / + * {@code http://localhost.evil.com} 这类「伪本地」域名绕过(对抗审查曾揪出的 major)。 + */ +final class LocalHostPolicy { + + private static final Set LOOPBACK = Set.of( + "localhost", "127.0.0.1", "::1", "0:0:0:0:0:0:0:1"); + + private LocalHostPolicy() { + } + + /** + * host 是否为本机回环地址。接受 {@link java.net.URI#getHost()} 的形态: + * 自动小写化并剥去 IPv6 字面量方括号(getHost 对 {@code [::1]} 返回带括号串)。 + */ + static boolean isLocalHost(String host) { + if (host == null) { + return false; + } + String h = host.trim().toLowerCase(Locale.ROOT); + if (h.startsWith("[") && h.endsWith("]")) { + h = h.substring(1, h.length() - 1); + } + return LOOPBACK.contains(h); + } +} diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/service/LocalHostPolicyTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/service/LocalHostPolicyTest.java new file mode 100644 index 0000000..20d093e --- /dev/null +++ b/platform-ai/src/test/java/com/eip4/platform/ai/service/LocalHostPolicyTest.java @@ -0,0 +1,46 @@ +package com.eip4.platform.ai.service; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +/** + * 本机判定红线测试(总览 §10 D5):统一后须接受全部 loopback 形态、拒绝一切伪本地/非本机。 + */ +class LocalHostPolicyTest { + + @Test + @DisplayName("接受全部回环形态(含原三处各漏的 [::1] / 0:0:0:0:0:0:0:1 + 括号/大小写/空白)") + void acceptsAllLoopbackForms() { + assertTrue(LocalHostPolicy.isLocalHost("localhost")); + assertTrue(LocalHostPolicy.isLocalHost("127.0.0.1")); + assertTrue(LocalHostPolicy.isLocalHost("::1")); + assertTrue(LocalHostPolicy.isLocalHost("[::1]")); // 方括号式(原 ToolRegistry 漏) + assertTrue(LocalHostPolicy.isLocalHost("0:0:0:0:0:0:0:1")); // 展开式(原 Smoke/Executor 漏) + assertTrue(LocalHostPolicy.isLocalHost("[0:0:0:0:0:0:0:1]")); + assertTrue(LocalHostPolicy.isLocalHost("LOCALHOST")); // 大小写无关 + assertTrue(LocalHostPolicy.isLocalHost(" localhost ")); // 去空白 + } + + @Test + @DisplayName("拒绝伪本地域名(精确比对防 127.0.0.1.evil.com / localhost.evil.com 绕过)") + void rejectsSpoofedLocalHosts() { + assertFalse(LocalHostPolicy.isLocalHost("127.0.0.1.evil.com")); + assertFalse(LocalHostPolicy.isLocalHost("localhost.evil.com")); + assertFalse(LocalHostPolicy.isLocalHost("evil.com")); + assertFalse(LocalHostPolicy.isLocalHost("notlocalhost")); + } + + @Test + @DisplayName("拒绝非本机地址(含非 .1 回环段与通配地址,保持精确匹配)") + void rejectsNonLocalHosts() { + assertFalse(LocalHostPolicy.isLocalHost("10.0.0.5")); + assertFalse(LocalHostPolicy.isLocalHost("192.168.1.1")); + assertFalse(LocalHostPolicy.isLocalHost("127.0.0.2")); // 127/8 但非精确 127.0.0.1,保守拒绝 + assertFalse(LocalHostPolicy.isLocalHost("0.0.0.0")); + assertFalse(LocalHostPolicy.isLocalHost(null)); + assertFalse(LocalHostPolicy.isLocalHost("")); + } +} From 8df60e810c9831fc1c3b143a4c22d1b939700707 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 24 Jun 2026 11:20:24 +0800 Subject: [PATCH 7/8] =?UTF-8?q?docs(=E6=80=BB=E8=A7=88):=20=E6=A0=87?= =?UTF-8?q?=E8=AE=B0=20B4(isAdminProfile=20=E6=94=B6=E5=8F=A3)=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit B4 代码在 eip4-web 分支 feat/arch-review-followup(commit 768ffa8);本提交仅同步总览 §10 B4 状态为已完成。 Co-Authored-By: Claude Opus 4.8 (1M context) --- docs/项目进度与路线-总览-2026-06-21.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/项目进度与路线-总览-2026-06-21.md b/docs/项目进度与路线-总览-2026-06-21.md index 5e1f1e4..77227b2 100644 --- a/docs/项目进度与路线-总览-2026-06-21.md +++ b/docs/项目进度与路线-总览-2026-06-21.md @@ -208,7 +208,7 @@ EIP3(Vaadin / 老引擎)→ EIP4(amis 前端 + 保真层 + 转换器)迁 ### 10.3 P2 — 整洁度 / 一致性收敛(多为采纳自原文档的真问题,但属低优先) - **✅【已完成 2026-06-24】【D5】抽共享 `LocalHostPolicy`**:原状=`AiToolRegistry`/`AiSmokeRunner`/`AiLocalReleaseExecutor` 三处本机白名单互异(ToolRegistry 认展开式 `0:0:0:0:0:0:0:1` 漏 `[::1]`,另两处反之)。**已做**:新增 `LocalHostPolicy.isLocalHost`(去 IPv6 方括号归一 + 精确比对回环集 `{localhost,127.0.0.1,::1,0:0:0:0:0:0:0:1}`,杜绝 `127.0.0.1.evil.com` 伪本地绕过),三处删本地副本统一委托。**验证**:新增 `LocalHostPolicyTest`(接受全部回环形态 + 拒绝伪本地/非本机)3/3 + 三处既有测试(AiToolRegistry 6/AiSmokeRunner 3/AiLocalReleaseExecutor 3)无回归,整套 platform-ai 69/69 绿。 -- **【B4】抽 `isAdmin(profile)` 单函数**:`profile?.account==='admin'||profile?.userId==='ADMIN'` 在 Topbar/ModelerPage/NewFeatureShell/AiFeatureForm/DesignCenterPage 5 处逐字硬编码。 +- **✅【已完成 2026-06-24·eip4-web】【B4】抽 `isAdminProfile(profile)` 单函数**:原状=`profile?.account==='admin'||profile?.userId==='ADMIN'` 在 Topbar/ModelerPage/NewFeatureShell/AiFeatureForm/DesignCenterPage 5 处逐字硬编码。**已做**:`auth/token.ts` 加纯函数 `isAdminProfile`(口径逐字保留),5 处统一委托。顺带把 5 个页面测试的 `vi.mock('../auth/token')` 从整模块替换改为 `importOriginal` 只覆盖 `getProfile`(不再 mock 纯函数,修复因 mock 漏 `isAdminProfile` 致的 render 崩)。**验证**:新增 `token.test.ts` 4 测试 + `tsc -b` 干净 + `vitest` 18 文件/77 测试全绿。 - **【B2】删 `api/schema.ts:65-102` overlay 死代码**(零调用,真相在 `editor/overlayApi.ts`);**【B1/B5】**拆 AmisRenderer SDK 注册逻辑、合并 todo.ts/done.ts 503 降级——均**低优先整洁度**,非架构风险。 - **【D2/D3】AI 多入口来源审计**:REST/CLI/MCP 三通道 actor 恒「agent」无区分,加 `X-EIP4-Agent-Channel` 头 + 审计;`runLocalSmoke` 过 `smoke.run` 工具门对齐 `applyLocalRelease`(localhost 硬门已兜底,非可利用洞)。 - **converter 单测 4820 行/164 用例塞 1 文件**(按控件族拆 6-10 个);**cli/mcp 各仅 1 测试文件**(对外 AI 门面加契约/快照测试);**e2e 5 套 config 碎片化**(合并为 1 主 config + projects)。 From 03a514e57fd6c21d4d668634c4ac032d48f04ffb Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 24 Jun 2026 11:22:47 +0800 Subject: [PATCH 8/8] =?UTF-8?q?docs(=E6=80=BB=E8=A7=88):=20=E6=A0=87?= =?UTF-8?q?=E8=AE=B0=20B2(=E5=88=A0=20overlay=20=E6=AD=BB=E4=BB=A3?= =?UTF-8?q?=E7=A0=81)=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit B2 代码在 eip4-web 分支;本提交同步总览 §10 B2 状态。 Co-Authored-By: Claude Opus 4.8 (1M context) --- docs/项目进度与路线-总览-2026-06-21.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/项目进度与路线-总览-2026-06-21.md b/docs/项目进度与路线-总览-2026-06-21.md index 77227b2..f22d9ad 100644 --- a/docs/项目进度与路线-总览-2026-06-21.md +++ b/docs/项目进度与路线-总览-2026-06-21.md @@ -209,7 +209,7 @@ EIP3(Vaadin / 老引擎)→ EIP4(amis 前端 + 保真层 + 转换器)迁 - **✅【已完成 2026-06-24】【D5】抽共享 `LocalHostPolicy`**:原状=`AiToolRegistry`/`AiSmokeRunner`/`AiLocalReleaseExecutor` 三处本机白名单互异(ToolRegistry 认展开式 `0:0:0:0:0:0:0:1` 漏 `[::1]`,另两处反之)。**已做**:新增 `LocalHostPolicy.isLocalHost`(去 IPv6 方括号归一 + 精确比对回环集 `{localhost,127.0.0.1,::1,0:0:0:0:0:0:0:1}`,杜绝 `127.0.0.1.evil.com` 伪本地绕过),三处删本地副本统一委托。**验证**:新增 `LocalHostPolicyTest`(接受全部回环形态 + 拒绝伪本地/非本机)3/3 + 三处既有测试(AiToolRegistry 6/AiSmokeRunner 3/AiLocalReleaseExecutor 3)无回归,整套 platform-ai 69/69 绿。 - **✅【已完成 2026-06-24·eip4-web】【B4】抽 `isAdminProfile(profile)` 单函数**:原状=`profile?.account==='admin'||profile?.userId==='ADMIN'` 在 Topbar/ModelerPage/NewFeatureShell/AiFeatureForm/DesignCenterPage 5 处逐字硬编码。**已做**:`auth/token.ts` 加纯函数 `isAdminProfile`(口径逐字保留),5 处统一委托。顺带把 5 个页面测试的 `vi.mock('../auth/token')` 从整模块替换改为 `importOriginal` 只覆盖 `getProfile`(不再 mock 纯函数,修复因 mock 漏 `isAdminProfile` 致的 render 崩)。**验证**:新增 `token.test.ts` 4 测试 + `tsc -b` 干净 + `vitest` 18 文件/77 测试全绿。 -- **【B2】删 `api/schema.ts:65-102` overlay 死代码**(零调用,真相在 `editor/overlayApi.ts`);**【B1/B5】**拆 AmisRenderer SDK 注册逻辑、合并 todo.ts/done.ts 503 降级——均**低优先整洁度**,非架构风险。 +- **✅【已完成 2026-06-24·eip4-web】【B2】删 `api/schema.ts` overlay 死代码**:核实 `fetchSchemaLayer`/`putOverlay`/`restoreStandard` 全仓(含 e2e)零引用(真实 overlay API 在 `editor/overlayApi.ts`)后删除;tsc 干净 + vitest 77/77。**未做【B1/B5】**:拆 AmisRenderer SDK 注册逻辑、合并 todo.ts/done.ts 503 降级——均**低优先整洁度**,非架构风险。 - **【D2/D3】AI 多入口来源审计**:REST/CLI/MCP 三通道 actor 恒「agent」无区分,加 `X-EIP4-Agent-Channel` 头 + 审计;`runLocalSmoke` 过 `smoke.run` 工具门对齐 `applyLocalRelease`(localhost 硬门已兜底,非可利用洞)。 - **converter 单测 4820 行/164 用例塞 1 文件**(按控件族拆 6-10 个);**cli/mcp 各仅 1 测试文件**(对外 AI 门面加契约/快照测试);**e2e 5 套 config 碎片化**(合并为 1 主 config + projects)。 - **保真层级联/附件加载残留 N+1**(`loadDoc` 按子行 id 集合一次 IN);端口契约(8084/8093/8094 漂移)+ 源码树 `.omc` 卫生。