From bc23909feb094409f15f7292cdb9589f77ef882d Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 11 Jun 2026 22:23:41 +0800 Subject: [PATCH] =?UTF-8?q?F2-1b=EF=BC=9A=E8=A7=86=E5=9B=BE=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E6=89=A7=E8=A1=8C=E8=B7=AF=E5=BE=84=E8=A1=A5=E5=85=A8?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=AF=BC=E5=85=A5=EF=BC=88GetServicesFunctio?= =?UTF-8?q?n/DateTime=20=E5=8F=AF=E7=94=A8=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit dataDic.binding.ScriptingEnginesManager 换用 SecureGroovyScriptEngineFactory, 与服务流路径对齐,注入 8 条 DEFAULTIMPORTSLIST + org.joda.time 星号导入。 修复 execute-template 端点「No such property: GetServicesFunction」和 「unable to resolve class DateTime」。迁移手册 §10.4 新增坑位登记。 Co-Authored-By: Claude Fable 5 --- docs/迁移手册.md | 20 +++++++++++++++++++ .../binding/ScriptingEnginesManager.java | 14 +++++++++---- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/docs/迁移手册.md b/docs/迁移手册.md index a5803df..579668b 100644 --- a/docs/迁移手册.md +++ b/docs/迁移手册.md @@ -809,4 +809,24 @@ com.dsasp.* com.eip4.* --- +--- + +### 10.4 视图脚本执行路径默认导入缺失,GetServicesFunction/DateTime 不可用 [NEW 2026-06-11] + +**现象**:POST /api/script/execute-template 执行含 `GetServicesFunction.loadPOJO(...)` 静态类名引用的脚本报「No such property: GetServicesFunction」;`new DateTime[2]` 报 unable to resolve class DateTime。 + +**根因**:视图脚本执行路径(`ScriptExecuteController` → `com.dsasp.server.dataDic.binding.ScriptingEnginesManager.evaluateGroovy`)使用裸 `GroovyScriptEngineFactory`,不含 `DEFAULTIMPORTSLIST`(8 条服务端导入)和 `DEFAULTSTARIMPORTSLIST`(org.joda.time)。服务流路径(`com.dsasp.server.core.service.script.ScriptingEnginesManager`)已正确使用 `SecureGroovyScriptEngineFactory`,两路径存在不一致。 + +**对策(F2-1b)**:`com.dsasp.server.dataDic.binding.ScriptingEnginesManager` 换用 `SecureGroovyScriptEngineFactory`(与服务流路径对齐),自动注入 8 条默认导入(`GeneralPOJO/CustomSearchConditional/POJOCRUDService/StringUtil/GetServicesFunction/GetDefaultValueFunction/GetValueFunction/Console`)+ `org.joda.time` 星号导入。属「替换类登记」最小适配,ArchUnit「保真层禁止依赖现代层」不受影响。 + +**验证**: +- `GetServicesFunction.class.simpleName` → `"GetServicesFunction"` (passed: True) +- `GetValueFunction.class.simpleName` → `"GetValueFunction"` (passed: True) +- `new DateTime[2]; arr.length` → `2` (passed: True) +- 087739c4-3dee-4bac-b031-772497addc6b seq1(含 `new DateTime[2]`)→ passed: True + +**影响范围**:所有经 execute-template 端点执行的改写后脚本(FULL_AUTO/NO_S3 均走此路径)。 + +--- + **手册维护说明**:本手册随工程化进展持续更新;新坑位发现即追加,以 `[NEW yyyy-mm-dd]` 标记;章节完成后移除「待补」标记。任何对引擎行为契约的更改必须同步更新第五章并过 code review。 diff --git a/platform-legacy-core/src/main/java/com/dsasp/server/dataDic/binding/ScriptingEnginesManager.java b/platform-legacy-core/src/main/java/com/dsasp/server/dataDic/binding/ScriptingEnginesManager.java index 26b98d4..2c07d36 100644 --- a/platform-legacy-core/src/main/java/com/dsasp/server/dataDic/binding/ScriptingEnginesManager.java +++ b/platform-legacy-core/src/main/java/com/dsasp/server/dataDic/binding/ScriptingEnginesManager.java @@ -12,15 +12,21 @@ import javax.script.ScriptEngineFactory; import javax.script.ScriptEngineManager; import javax.script.ScriptException; -import org.codehaus.groovy.jsr223.GroovyScriptEngineFactory; - import com.dsasp.server.common.exception.PrivilegeException; import com.dsasp.server.common.exception.SameCodeException; import com.dsasp.server.common.exception.ValidationException; import com.dsasp.server.common.util.StringUtil; +import com.dsasp.server.core.script.secure.SecureGroovyScriptEngineFactory; + +// 适配(F2-1b 默认导入补全):视图脚本执行路径(ScriptExecuteController → evaluateGroovy) +// 原使用裸 GroovyScriptEngineFactory,缺少 DEFAULTIMPORTSLIST 注入,导致脚本中的 +// GetServicesFunction/GetValueFunction/GetDefaultValueFunction/DateTime 等无法解析。 +// 换用 SecureGroovyScriptEngineFactory(与服务流路径对齐),自动注入 8 条默认导入 + +// org.joda.time 星号导入,脚本可直接使用 GetServicesFunction.loadPOJO/new DateTime[] 等。 +// 迁移手册 §5.x 新增坑位登记:视图脚本路径默认导入缺失(F2-1b)。 public class ScriptingEnginesManager { - + public static final String GROOVY_SCRIPTING_LANGUAGE = "groovy"; private static ScriptingEnginesManager scriptingEnginesManager; @@ -32,7 +38,7 @@ public class ScriptingEnginesManager { public ScriptingEnginesManager() { scriptEngineManager = new ScriptEngineManager(); scriptEngineManager.registerEngineName(GROOVY_SCRIPTING_LANGUAGE, - new GroovyScriptEngineFactory()); + new SecureGroovyScriptEngineFactory()); } public ScriptingEnginesManager addScriptEngineFactory(