Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
86da532c
o2oa
项目概览
fuyue82
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
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,发现更多精彩内容 >>
提交
86da532c
编写于
11月 26, 2020
作者:
O
o2null
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix/callabletimeout' into 'wrdp'
修改copier的说明 See merge request o2oa/o2oa!2284
上级
20b30d59
16b2af8e
变更
4
展开全部
显示空白变更内容
内联
并排
Showing
4 changed file
with
758 addition
and
1 deletion
+758
-1
o2server/x_base_core_project/src/main/java/com/x/base/core/container/factory/PersistenceXmlHelper.java
...m/x/base/core/container/factory/PersistenceXmlHelper.java
+1
-0
o2server/x_base_core_project/src/main/java/com/x/base/core/project/bean/WrapCopier.java
...rc/main/java/com/x/base/core/project/bean/WrapCopier.java
+2
-1
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2GetWorkOrWorkCompleted2.java
...ssemble/surface/jaxrs/work/V2GetWorkOrWorkCompleted2.java
+736
-0
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/WorkAction.java
...ocessplatform/assemble/surface/jaxrs/work/WorkAction.java
+19
-0
未找到文件。
o2server/x_base_core_project/src/main/java/com/x/base/core/container/factory/PersistenceXmlHelper.java
浏览文件 @
86da532c
...
@@ -282,6 +282,7 @@ public class PersistenceXmlHelper {
...
@@ -282,6 +282,7 @@ public class PersistenceXmlHelper {
properties
.
put
(
"openjpa.QueryCompilationCache"
,
"false"
);
properties
.
put
(
"openjpa.QueryCompilationCache"
,
"false"
);
properties
.
put
(
"openjpa.LockManager"
,
"none"
);
properties
.
put
(
"openjpa.LockManager"
,
"none"
);
properties
.
put
(
"openjpa.jdbc.ResultSetType"
,
"scroll-insensitive"
);
properties
.
put
(
"openjpa.jdbc.ResultSetType"
,
"scroll-insensitive"
);
//使用false,使用ture支持多线程访问,但是是通过lock同步执行的.
properties
.
put
(
"openjpa.Multithreaded"
,
"false"
);
properties
.
put
(
"openjpa.Multithreaded"
,
"false"
);
/* 如果启用本地初始化会导致classLoad的问题 */
/* 如果启用本地初始化会导致classLoad的问题 */
properties
.
put
(
"openjpa.DynamicEnhancementAgent"
,
"false"
);
properties
.
put
(
"openjpa.DynamicEnhancementAgent"
,
"false"
);
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/bean/WrapCopier.java
浏览文件 @
86da532c
...
@@ -50,7 +50,8 @@ public class WrapCopier<T, W> {
...
@@ -50,7 +50,8 @@ public class WrapCopier<T, W> {
}
}
copyFields
.
stream
().
forEach
(
f
->
{
copyFields
.
stream
().
forEach
(
f
->
{
try
{
try
{
if
(
StringUtils
.
equals
(
f
,
JpaObject
.
IDCOLUMN
))
{
//openjpa在访问主键(getId()会执行pcGetId())会发起一个锁定所以在这里对id(xid column)进行单独的处理
if
(
StringUtils
.
equals
(
f
,
JpaObject
.
id_FIELDNAME
))
{
Field
field
=
FieldUtils
.
getField
(
orig
.
getClass
(),
f
,
true
);
Field
field
=
FieldUtils
.
getField
(
orig
.
getClass
(),
f
,
true
);
if
(
null
!=
field
)
{
if
(
null
!=
field
)
{
Object
o
=
FieldUtils
.
readField
(
field
,
orig
,
true
);
Object
o
=
FieldUtils
.
readField
(
field
,
orig
,
true
);
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2GetWorkOrWorkCompleted2.java
0 → 100644
浏览文件 @
86da532c
此差异已折叠。
点击以展开。
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/WorkAction.java
浏览文件 @
86da532c
...
@@ -1275,4 +1275,23 @@ public class WorkAction extends StandardJaxrsAction {
...
@@ -1275,4 +1275,23 @@ public class WorkAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"V2_根据Work或workCompleted取得内容."
,
action
=
V2GetWorkOrWorkCompleted2
.
class
)
@GET
@Path
(
"v2/workorworkcompleted2/{workOrWorkCompleted}"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
V2GetWorkOrWorkCompleted2
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"workOrWorkCompleted"
)
String
workOrWorkCompleted
)
{
ActionResult
<
V2GetWorkOrWorkCompleted2
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
V2GetWorkOrWorkCompleted2
().
execute
(
effectivePerson
,
workOrWorkCompleted
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录