Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
此号慢热型
o2oa
提交
7c6e7347
o2oa
项目概览
此号慢热型
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7c6e7347
编写于
1月 18, 2021
作者:
Z
zhourui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复初始化脚本运行两次的bug
上级
3e90ec8c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
2 addition
and
6 deletion
+2
-6
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java
...splatform/service/processing/jaxrs/task/ActionAppend.java
+1
-0
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/AeiObjects.java
...cessplatform/service/processing/processor/AeiObjects.java
+1
-0
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/embed/EmbedProcessor.java
...rm/service/processing/processor/embed/EmbedProcessor.java
+0
-4
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ManualProcessor.java
.../service/processing/processor/manual/ManualProcessor.java
+0
-2
未找到文件。
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java
浏览文件 @
7c6e7347
...
@@ -156,6 +156,7 @@ class ActionAppend extends BaseAction {
...
@@ -156,6 +156,7 @@ class ActionAppend extends BaseAction {
bindings
.
put
(
ScriptFactory
.
BINDING_NAME_DICTIONARY
,
bindings
.
put
(
ScriptFactory
.
BINDING_NAME_DICTIONARY
,
new
ApplicationDictHelper
(
business
.
entityManagerContainer
(),
work
.
getApplication
()));
new
ApplicationDictHelper
(
business
.
entityManagerContainer
(),
work
.
getApplication
()));
bindings
.
put
(
ScriptFactory
.
BINDING_NAME_APPLICATIONS
,
ThisApplication
.
context
().
applications
());
bindings
.
put
(
ScriptFactory
.
BINDING_NAME_APPLICATIONS
,
ThisApplication
.
context
().
applications
());
// 重新创建的ScriptContext是需要初始化的
ScriptFactory
.
initialScriptText
().
eval
(
scriptContext
);
ScriptFactory
.
initialScriptText
().
eval
(
scriptContext
);
return
scriptContext
;
return
scriptContext
;
}
}
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/AeiObjects.java
浏览文件 @
7c6e7347
...
@@ -1622,6 +1622,7 @@ public class AeiObjects extends GsonPropertyObject {
...
@@ -1622,6 +1622,7 @@ public class AeiObjects extends GsonPropertyObject {
new
ApplicationDictHelper
(
this
.
entityManagerContainer
(),
this
.
getWork
().
getApplication
()));
new
ApplicationDictHelper
(
this
.
entityManagerContainer
(),
this
.
getWork
().
getApplication
()));
bindings
.
put
(
ScriptFactory
.
BINDING_NAME_APPLICATIONS
,
ThisApplication
.
context
().
applications
());
bindings
.
put
(
ScriptFactory
.
BINDING_NAME_APPLICATIONS
,
ThisApplication
.
context
().
applications
());
bindings
.
put
(
ScriptFactory
.
BINDING_NAME_ROUTES
,
this
.
getRoutes
());
bindings
.
put
(
ScriptFactory
.
BINDING_NAME_ROUTES
,
this
.
getRoutes
());
// 重新创建的ScriptContext是需要初始化的
ScriptFactory
.
initialScriptText
().
eval
(
this
.
scriptContext
);
ScriptFactory
.
initialScriptText
().
eval
(
this
.
scriptContext
);
}
}
return
this
.
scriptContext
;
return
this
.
scriptContext
;
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/embed/EmbedProcessor.java
浏览文件 @
7c6e7347
...
@@ -81,8 +81,6 @@ public class EmbedProcessor extends AbstractEmbedProcessor {
...
@@ -81,8 +81,6 @@ public class EmbedProcessor extends AbstractEmbedProcessor {
wrap
.
set
(
gson
.
toJson
(
assginData
));
wrap
.
set
(
gson
.
toJson
(
assginData
));
ScriptContext
scriptContext
=
aeiObjects
.
scriptContext
();
ScriptContext
scriptContext
=
aeiObjects
.
scriptContext
();
scriptContext
.
getBindings
(
ScriptContext
.
ENGINE_SCOPE
).
put
(
ScriptFactory
.
BINDING_NAME_ASSIGNDATA
,
wrap
);
scriptContext
.
getBindings
(
ScriptContext
.
ENGINE_SCOPE
).
put
(
ScriptFactory
.
BINDING_NAME_ASSIGNDATA
,
wrap
);
/* 重新注入对象需要重新运行 */
ScriptFactory
.
initialScriptText
().
eval
(
scriptContext
);
aeiObjects
.
business
().
element
().
getCompiledScript
(
aeiObjects
.
getWork
().
getApplication
(),
embed
,
aeiObjects
.
business
().
element
().
getCompiledScript
(
aeiObjects
.
getWork
().
getApplication
(),
embed
,
Business
.
EVENT_EMBEDTARGETASSIGNDATA
).
eval
(
scriptContext
);
Business
.
EVENT_EMBEDTARGETASSIGNDATA
).
eval
(
scriptContext
);
assginData
=
gson
.
fromJson
(
wrap
.
get
(),
AssginData
.
class
);
assginData
=
gson
.
fromJson
(
wrap
.
get
(),
AssginData
.
class
);
...
@@ -140,8 +138,6 @@ public class EmbedProcessor extends AbstractEmbedProcessor {
...
@@ -140,8 +138,6 @@ public class EmbedProcessor extends AbstractEmbedProcessor {
if
(
this
.
hasIdentityScript
(
embed
))
{
if
(
this
.
hasIdentityScript
(
embed
))
{
ScriptContext
scriptContext
=
aeiObjects
.
scriptContext
();
ScriptContext
scriptContext
=
aeiObjects
.
scriptContext
();
scriptContext
.
getBindings
(
ScriptContext
.
ENGINE_SCOPE
).
put
(
ScriptFactory
.
BINDING_NAME_IDENTITY
,
value
);
scriptContext
.
getBindings
(
ScriptContext
.
ENGINE_SCOPE
).
put
(
ScriptFactory
.
BINDING_NAME_IDENTITY
,
value
);
/* 重新注入对象需要重新运行 */
ScriptFactory
.
initialScriptText
().
eval
(
scriptContext
);
Object
objectValue
=
aeiObjects
.
business
().
element
()
Object
objectValue
=
aeiObjects
.
business
().
element
()
.
getCompiledScript
(
aeiObjects
.
getWork
().
getApplication
(),
embed
,
Business
.
EVENT_EMBEDTARGETIDENTITY
)
.
getCompiledScript
(
aeiObjects
.
getWork
().
getApplication
(),
embed
,
Business
.
EVENT_EMBEDTARGETIDENTITY
)
.
eval
(
scriptContext
);
.
eval
(
scriptContext
);
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ManualProcessor.java
浏览文件 @
7c6e7347
...
@@ -648,8 +648,6 @@ public class ManualProcessor extends AbstractManualProcessor {
...
@@ -648,8 +648,6 @@ public class ManualProcessor extends AbstractManualProcessor {
Bindings
bindings
=
scriptContext
.
getBindings
(
ScriptContext
.
ENGINE_SCOPE
);
Bindings
bindings
=
scriptContext
.
getBindings
(
ScriptContext
.
ENGINE_SCOPE
);
bindings
.
put
(
ScriptFactory
.
BINDING_NAME_TASK
,
task
);
bindings
.
put
(
ScriptFactory
.
BINDING_NAME_TASK
,
task
);
bindings
.
put
(
ScriptFactory
.
BINDING_NAME_EXPIRE
,
expire
);
bindings
.
put
(
ScriptFactory
.
BINDING_NAME_EXPIRE
,
expire
);
// 重新注入对象需要重新运行
ScriptFactory
.
initialScriptText
().
eval
(
scriptContext
);
aeiObjects
.
business
().
element
()
aeiObjects
.
business
().
element
()
.
getCompiledScript
(
aeiObjects
.
getWork
().
getApplication
(),
manual
,
Business
.
EVENT_MANUALTASKEXPIRE
)
.
getCompiledScript
(
aeiObjects
.
getWork
().
getApplication
(),
manual
,
Business
.
EVENT_MANUALTASKEXPIRE
)
.
eval
(
scriptContext
);
.
eval
(
scriptContext
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录