Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
84d5043c
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,发现更多精彩内容 >>
提交
84d5043c
编写于
10月 14, 2020
作者:
Z
zhourui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改agent和invoke 默认注释
上级
7a4973bd
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
33 addition
and
33 deletion
+33
-33
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/agent/ActionEdit.java
...ain/java/com/x/program/center/jaxrs/agent/ActionEdit.java
+1
-1
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/agent/ActionUpdate.java
...n/java/com/x/program/center/jaxrs/agent/ActionUpdate.java
+2
-2
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/agent/BaseAction.java
...ain/java/com/x/program/center/jaxrs/agent/BaseAction.java
+26
-26
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/invoke/ActionEdit.java
...in/java/com/x/program/center/jaxrs/invoke/ActionEdit.java
+2
-2
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/invoke/ActionUpdate.java
.../java/com/x/program/center/jaxrs/invoke/ActionUpdate.java
+2
-2
未找到文件。
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/agent/ActionEdit.java
浏览文件 @
84d5043c
...
...
@@ -38,7 +38,7 @@ class ActionEdit extends BaseAction {
}
emc
.
beginTransaction
(
Agent
.
class
);
Wi
.
copier
.
copy
(
wi
,
agent
);
this
.
addComment
(
agent
);
//
this.addComment(agent);
emc
.
check
(
agent
,
CheckPersistType
.
all
);
emc
.
commit
();
CacheManager
.
notify
(
Agent
.
class
);
...
...
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/agent/ActionUpdate.java
浏览文件 @
84d5043c
...
...
@@ -17,14 +17,14 @@ class ActionUpdate extends BaseAction {
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
ActionResult
<
Wo
>
result
=
new
ActionResult
<>();
Wo
wo
=
new
Wo
();
Agent
agent
=
emc
.
flag
(
flag
,
Agent
.
class
);
Agent
agent
=
emc
.
flag
(
flag
,
Agent
.
class
);
if
(
null
==
agent
)
{
throw
new
ExceptionAgentNotExist
(
flag
);
}
String
text
=
new
String
(
bytes
,
DefaultCharset
.
name
);
emc
.
beginTransaction
(
Agent
.
class
);
agent
.
setText
(
text
);
this
.
addComment
(
agent
);
//
this.addComment(agent);
emc
.
commit
();
wo
.
setId
(
agent
.
getId
());
result
.
setData
(
wo
);
...
...
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/agent/BaseAction.java
浏览文件 @
84d5043c
...
...
@@ -9,31 +9,31 @@ import com.x.base.core.project.jaxrs.StandardJaxrsAction;
import
com.x.program.center.core.entity.Agent
;
abstract
class
BaseAction
extends
StandardJaxrsAction
{
private
static
String
COMMENT
=
""
;
private
static
final
Pattern
COMMENT_REGEX
=
Pattern
.
compile
(
"^\\/\\*(\\s|.)*?\\*\\/"
);
static
{
COMMENT
=
"/*"
+
StringUtils
.
LF
;
COMMENT
+=
"* resources.getEntityManagerContainer() // 实体管理容器."
+
StringUtils
.
LF
;
COMMENT
+=
"* resources.getContext() //上下文根."
+
StringUtils
.
LF
;
COMMENT
+=
"* resources.getOrganization() //组织访问接口."
+
StringUtils
.
LF
;
COMMENT
+=
"* requestText //请求内容."
+
StringUtils
.
LF
;
COMMENT
+=
"* request //请求对象."
+
StringUtils
.
LF
;
COMMENT
+=
"*/"
+
StringUtils
.
LF
;
}
protected
void
addComment
(
Agent
agent
)
{
if
(
StringUtils
.
isEmpty
(
agent
.
getText
()))
{
agent
.
setText
(
COMMENT
);
}
else
{
Matcher
m
=
COMMENT_REGEX
.
matcher
(
agent
.
getText
());
if
(
m
.
find
())
{
agent
.
setText
(
COMMENT
+
m
.
replaceFirst
(
""
));
}
else
{
agent
.
setText
(
COMMENT
+
agent
.
getText
());
}
}
}
//
private static String COMMENT = "";
//
//
private static final Pattern COMMENT_REGEX = Pattern.compile("^\\/\\*(\\s|.)*?\\*\\/");
//
//
static {
//
COMMENT = "/*" + StringUtils.LF;
//
COMMENT += "* resources.getEntityManagerContainer() // 实体管理容器." + StringUtils.LF;
//
COMMENT += "* resources.getContext() //上下文根." + StringUtils.LF;
//
COMMENT += "* resources.getOrganization() //组织访问接口." + StringUtils.LF;
//
COMMENT += "* requestText //请求内容." + StringUtils.LF;
//
COMMENT += "* request //请求对象." + StringUtils.LF;
//
COMMENT += "*/" + StringUtils.LF;
//
}
//
//
protected void addComment(Agent agent) {
//
if (StringUtils.isEmpty(agent.getText())) {
//
agent.setText(COMMENT);
//
} else {
//
Matcher m = COMMENT_REGEX.matcher(agent.getText());
//
if (m.find()) {
//
agent.setText(COMMENT + m.replaceFirst(""));
//
} else {
//
agent.setText(COMMENT + agent.getText());
//
}
//
}
//
}
}
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/invoke/ActionEdit.java
浏览文件 @
84d5043c
...
...
@@ -24,7 +24,7 @@ class ActionEdit extends BaseAction {
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
ActionResult
<
Wo
>
result
=
new
ActionResult
<>();
Wi
wi
=
this
.
convertToWrapIn
(
jsonElement
,
Wi
.
class
);
Invoke
invoke
=
emc
.
flag
(
flag
,
Invoke
.
class
);
Invoke
invoke
=
emc
.
flag
(
flag
,
Invoke
.
class
);
if
(
StringUtils
.
isEmpty
(
wi
.
getName
()))
{
throw
new
ExceptionEmptyName
();
}
...
...
@@ -38,7 +38,7 @@ class ActionEdit extends BaseAction {
}
emc
.
beginTransaction
(
Invoke
.
class
);
Wi
.
copier
.
copy
(
wi
,
invoke
);
this
.
addComment
(
invoke
);
//
this.addComment(invoke);
emc
.
check
(
invoke
,
CheckPersistType
.
all
);
emc
.
commit
();
CacheManager
.
notify
(
Invoke
.
class
);
...
...
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/invoke/ActionUpdate.java
浏览文件 @
84d5043c
...
...
@@ -17,14 +17,14 @@ class ActionUpdate extends BaseAction {
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
ActionResult
<
Wo
>
result
=
new
ActionResult
<>();
Wo
wo
=
new
Wo
();
Invoke
invoke
=
emc
.
flag
(
flag
,
Invoke
.
class
);
Invoke
invoke
=
emc
.
flag
(
flag
,
Invoke
.
class
);
if
(
null
==
invoke
)
{
throw
new
ExceptionInvokeNotExist
(
flag
);
}
String
text
=
new
String
(
bytes
,
DefaultCharset
.
name
);
emc
.
beginTransaction
(
Invoke
.
class
);
invoke
.
setText
(
text
);
this
.
addComment
(
invoke
);
//
this.addComment(invoke);
emc
.
commit
();
wo
.
setId
(
invoke
.
getId
());
result
.
setData
(
wo
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录