Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
2f77112f
o2oa
项目概览
ghsby
/
o2oa
落后 Fork 源项目 2880 个版本
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
1
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,发现更多精彩内容 >>
提交
2f77112f
编写于
9月 28, 2020
作者:
O
o2null
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'release' into 'master'
Release See merge request o2oa/o2oa!1754
上级
3452c706
c0bf7ebd
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
19 addition
and
21 deletion
+19
-21
o2server/x_base_core_project/src/main/java/com/x/base/core/project/AbstractContext.java
...rc/main/java/com/x/base/core/project/AbstractContext.java
+4
-10
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ProcessPlatform.java
.../java/com/x/base/core/project/config/ProcessPlatform.java
+7
-0
o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/cache/ActionReceive.java
...va/com/x/base/core/project/jaxrs/cache/ActionReceive.java
+6
-9
o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/fireschedule/ActionExecute.java
...x/base/core/project/jaxrs/fireschedule/ActionExecute.java
+1
-1
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
-1
未找到文件。
o2server/x_base_core_project/src/main/java/com/x/base/core/project/AbstractContext.java
浏览文件 @
2f77112f
...
@@ -2,17 +2,9 @@ package com.x.base.core.project;
...
@@ -2,17 +2,9 @@ package com.x.base.core.project;
import
javax.servlet.ServletContext
;
import
javax.servlet.ServletContext
;
import
org.quartz.DateBuilder
;
import
org.quartz.JobBuilder
;
import
org.quartz.JobDataMap
;
import
org.quartz.JobDetail
;
import
org.quartz.SimpleScheduleBuilder
;
import
org.quartz.Trigger
;
import
org.quartz.TriggerBuilder
;
import
org.quartz.DateBuilder.IntervalUnit
;
import
com.x.base.core.project.annotation.Module
;
import
com.x.base.core.project.annotation.Module
;
import
com.x.base.core.project.config.Config
;
import
com.x.base.core.project.jaxrs.WrapClearCacheRequest
;
import
com.x.base.core.project.queue.AbstractQueue
;
import
com.x.base.core.project.schedule.AbstractJob
;
import
com.x.base.core.project.schedule.AbstractJob
;
import
com.x.base.core.project.thread.ThreadFactory
;
import
com.x.base.core.project.thread.ThreadFactory
;
...
@@ -54,4 +46,6 @@ public abstract class AbstractContext {
...
@@ -54,4 +46,6 @@ public abstract class AbstractContext {
}
}
public
abstract
<
T
extends
AbstractJob
>
void
fireScheduleOnLocal
(
Class
<
T
>
cls
,
Integer
delay
)
throws
Exception
;
public
abstract
<
T
extends
AbstractJob
>
void
fireScheduleOnLocal
(
Class
<
T
>
cls
,
Integer
delay
)
throws
Exception
;
public
abstract
AbstractQueue
<
WrapClearCacheRequest
>
clearCacheRequestQueue
();
}
}
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ProcessPlatform.java
浏览文件 @
2f77112f
...
@@ -338,6 +338,13 @@ public class ProcessPlatform extends ConfigObject {
...
@@ -338,6 +338,13 @@ public class ProcessPlatform extends ConfigObject {
return
o
;
return
o
;
}
}
public
Merge
()
{
this
.
enable
=
DEFAULT_ENABLE
;
this
.
cron
=
DEFAULT_CRON
;
this
.
thresholdDays
=
DEFAULT_THRESHOLDDAYS
;
this
.
batchSize
=
DEFAULT_BATCHSIZE
;
}
public
static
final
Boolean
DEFAULT_ENABLE
=
false
;
public
static
final
Boolean
DEFAULT_ENABLE
=
false
;
public
static
final
String
DEFAULT_CRON
=
"30 30 6 * * ?"
;
public
static
final
String
DEFAULT_CRON
=
"30 30 6 * * ?"
;
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/cache/ActionReceive.java
浏览文件 @
2f77112f
...
@@ -3,6 +3,7 @@ package com.x.base.core.project.jaxrs.cache;
...
@@ -3,6 +3,7 @@ package com.x.base.core.project.jaxrs.cache;
import
javax.servlet.ServletContext
;
import
javax.servlet.ServletContext
;
import
com.google.gson.JsonElement
;
import
com.google.gson.JsonElement
;
import
com.x.base.core.project.AbstractContext
;
import
com.x.base.core.project.cache.ApplicationCache
;
import
com.x.base.core.project.cache.ApplicationCache
;
import
com.x.base.core.project.cache.CacheManager
;
import
com.x.base.core.project.cache.CacheManager
;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.ActionResult
;
...
@@ -21,19 +22,15 @@ class ActionReceive extends BaseAction {
...
@@ -21,19 +22,15 @@ class ActionReceive extends BaseAction {
logger
.
debug
(
effectivePerson
,
"receive:{}."
,
jsonElement
);
logger
.
debug
(
effectivePerson
,
"receive:{}."
,
jsonElement
);
ActionResult
<
Wo
>
result
=
new
ActionResult
<>();
ActionResult
<
Wo
>
result
=
new
ActionResult
<>();
Wi
wi
=
this
.
convertToWrapIn
(
jsonElement
,
Wi
.
class
);
Wi
wi
=
this
.
convertToWrapIn
(
jsonElement
,
Wi
.
class
);
Object
o
=
servletContext
.
getAttribute
(
com
.
x
.
base
.
core
.
project
.
AbstractContext
.
class
.
getName
());
// Object o =
if
(
null
!=
o
)
{
// servletContext.getAttribute(com.x.base.core.project.AbstractContext.class.getName());
com
.
x
.
base
.
core
.
project
.
Context
ctx
=
(
com
.
x
.
base
.
core
.
project
.
Context
)
o
;
AbstractContext
ctx
=
AbstractContext
.
fromServletContext
(
servletContext
)
;
if
(
null
!=
ctx
.
clearCacheRequestQueue
())
{
if
(
null
!=
ctx
.
clearCacheRequestQueue
())
{
ctx
.
clearCacheRequestQueue
().
send
(
wi
);
ctx
.
clearCacheRequestQueue
().
send
(
wi
);
}
else
{
}
else
{
ApplicationCache
.
receive
(
wi
);
ApplicationCache
.
receive
(
wi
);
CacheManager
.
receive
(
wi
);
CacheManager
.
receive
(
wi
);
}
}
}
else
{
ApplicationCache
.
receive
(
wi
);
CacheManager
.
receive
(
wi
);
}
result
.
setData
(
new
Wo
(
wi
.
getClassName
()));
result
.
setData
(
new
Wo
(
wi
.
getClassName
()));
return
result
;
return
result
;
}
}
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/fireschedule/ActionExecute.java
浏览文件 @
2f77112f
...
@@ -19,7 +19,7 @@ class ActionExecute extends BaseAction {
...
@@ -19,7 +19,7 @@ class ActionExecute extends BaseAction {
throws
Exception
{
throws
Exception
{
logger
.
debug
(
effectivePerson
,
"execute:{}."
,
className
);
logger
.
debug
(
effectivePerson
,
"execute:{}."
,
className
);
ActionResult
<
Wo
>
result
=
new
ActionResult
<>();
ActionResult
<
Wo
>
result
=
new
ActionResult
<>();
AbstractContext
ctx
=
com
.
x
.
base
.
core
.
project
.
Context
.
fromServletContext
(
servletContext
);
AbstractContext
ctx
=
Abstract
Context
.
fromServletContext
(
servletContext
);
Class
<?>
clz
=
Class
.
forName
(
className
);
Class
<?>
clz
=
Class
.
forName
(
className
);
ctx
.
fireScheduleOnLocal
((
Class
<
AbstractJob
>)
clz
,
1
);
ctx
.
fireScheduleOnLocal
((
Class
<
AbstractJob
>)
clz
,
1
);
Wo
wo
=
new
Wo
();
Wo
wo
=
new
Wo
();
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java
浏览文件 @
2f77112f
...
@@ -128,8 +128,8 @@ class ActionAppend extends BaseAction {
...
@@ -128,8 +128,8 @@ class ActionAppend extends BaseAction {
identities
=
business
.
organization
().
identity
().
list
(
ListTools
.
trim
(
identities
,
true
,
true
));
identities
=
business
.
organization
().
identity
().
list
(
ListTools
.
trim
(
identities
,
true
,
true
));
emc
.
beginTransaction
(
Work
.
class
);
emc
.
beginTransaction
(
Work
.
class
);
work
.
setManualTaskIdentityList
(
identities
);
work
.
setManualTaskIdentityList
(
identities
);
emc
.
beginTransaction
(
Task
.
class
);
// 转派后设置过期为空
// 转派后设置过期为空
emc
.
beginTransaction
(
Task
.
class
);
task
.
setExpired
(
false
);
task
.
setExpired
(
false
);
task
.
setExpireTime
(
null
);
task
.
setExpireTime
(
null
);
emc
.
commit
();
emc
.
commit
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录