From 7c6e7347cdb1d4421fe7094e11edf6206c46132e Mon Sep 17 00:00:00 2001 From: zhourui Date: Mon, 18 Jan 2021 19:03:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E8=BF=90=E8=A1=8C=E4=B8=A4=E6=AC=A1=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/processing/jaxrs/task/ActionAppend.java | 1 + .../service/processing/processor/AeiObjects.java | 1 + .../service/processing/processor/embed/EmbedProcessor.java | 4 ---- .../service/processing/processor/manual/ManualProcessor.java | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java index 334a329ab7..97f53d95ef 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java @@ -156,6 +156,7 @@ class ActionAppend extends BaseAction { bindings.put(ScriptFactory.BINDING_NAME_DICTIONARY, new ApplicationDictHelper(business.entityManagerContainer(), work.getApplication())); bindings.put(ScriptFactory.BINDING_NAME_APPLICATIONS, ThisApplication.context().applications()); + // 重新创建的ScriptContext是需要初始化的 ScriptFactory.initialScriptText().eval(scriptContext); return scriptContext; } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/AeiObjects.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/AeiObjects.java index 2c81fd5124..64bac3bba7 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/AeiObjects.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/AeiObjects.java @@ -1622,6 +1622,7 @@ public class AeiObjects extends GsonPropertyObject { new ApplicationDictHelper(this.entityManagerContainer(), this.getWork().getApplication())); bindings.put(ScriptFactory.BINDING_NAME_APPLICATIONS, ThisApplication.context().applications()); bindings.put(ScriptFactory.BINDING_NAME_ROUTES, this.getRoutes()); + // 重新创建的ScriptContext是需要初始化的 ScriptFactory.initialScriptText().eval(this.scriptContext); } return this.scriptContext; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/embed/EmbedProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/embed/EmbedProcessor.java index 4c3c921f8b..977a0b837a 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/embed/EmbedProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/embed/EmbedProcessor.java @@ -81,8 +81,6 @@ public class EmbedProcessor extends AbstractEmbedProcessor { wrap.set(gson.toJson(assginData)); ScriptContext scriptContext = aeiObjects.scriptContext(); scriptContext.getBindings(ScriptContext.ENGINE_SCOPE).put(ScriptFactory.BINDING_NAME_ASSIGNDATA, wrap); - /* 重新注入对象需要重新运行 */ - ScriptFactory.initialScriptText().eval(scriptContext); aeiObjects.business().element().getCompiledScript(aeiObjects.getWork().getApplication(), embed, Business.EVENT_EMBEDTARGETASSIGNDATA).eval(scriptContext); assginData = gson.fromJson(wrap.get(), AssginData.class); @@ -140,8 +138,6 @@ public class EmbedProcessor extends AbstractEmbedProcessor { if (this.hasIdentityScript(embed)) { ScriptContext scriptContext = aeiObjects.scriptContext(); scriptContext.getBindings(ScriptContext.ENGINE_SCOPE).put(ScriptFactory.BINDING_NAME_IDENTITY, value); - /* 重新注入对象需要重新运行 */ - ScriptFactory.initialScriptText().eval(scriptContext); Object objectValue = aeiObjects.business().element() .getCompiledScript(aeiObjects.getWork().getApplication(), embed, Business.EVENT_EMBEDTARGETIDENTITY) .eval(scriptContext); diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ManualProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ManualProcessor.java index 62e4c1e719..bd63d7c9b0 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ManualProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ManualProcessor.java @@ -648,8 +648,6 @@ public class ManualProcessor extends AbstractManualProcessor { Bindings bindings = scriptContext.getBindings(ScriptContext.ENGINE_SCOPE); bindings.put(ScriptFactory.BINDING_NAME_TASK, task); bindings.put(ScriptFactory.BINDING_NAME_EXPIRE, expire); - // 重新注入对象需要重新运行 - ScriptFactory.initialScriptText().eval(scriptContext); aeiObjects.business().element() .getCompiledScript(aeiObjects.getWork().getApplication(), manual, Business.EVENT_MANUALTASKEXPIRE) .eval(scriptContext); -- GitLab