Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
09d19ad0
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,发现更多精彩内容 >>
提交
09d19ad0
编写于
12月 09, 2020
作者:
Z
zhourui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
oauth增加info/jira
上级
eb6208ca
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
39 addition
and
3 deletion
+39
-3
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/oauth/OauthAction.java
...tion/assemble/authentication/jaxrs/oauth/OauthAction.java
+37
-1
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Task.java
.../java/com/x/processplatform/core/entity/content/Task.java
+1
-1
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/TaskCompleted.java
.../x/processplatform/core/entity/content/TaskCompleted.java
+1
-1
未找到文件。
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/oauth/OauthAction.java
浏览文件 @
09d19ad0
...
@@ -71,7 +71,7 @@ public class OauthAction extends StandardJaxrsAction {
...
@@ -71,7 +71,7 @@ public class OauthAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"POST方法实现oauth认证token方法,
是
配jira."
,
action
=
ActionToken
.
class
)
@JaxrsMethodDescribe
(
value
=
"POST方法实现oauth认证token方法,
适
配jira."
,
action
=
ActionToken
.
class
)
@POST
@POST
@Path
(
"token/jira"
)
@Path
(
"token/jira"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
...
@@ -126,6 +126,24 @@ public class OauthAction extends StandardJaxrsAction {
...
@@ -126,6 +126,24 @@ public class OauthAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"POST方法实现oauth认证info方法,适配jira."
,
action
=
ActionInfo
.
class
)
@POST
@Path
(
"info/jira"
)
@Consumes
({
MediaType
.
MULTIPART_FORM_DATA
,
MediaType
.
APPLICATION_FORM_URLENCODED
})
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
public
void
postInfoJira
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@Context
HttpServletResponse
response
,
@FormParam
(
"access_token"
)
String
access_token
)
{
ActionResult
<
ActionInfo
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionInfo
().
execute
(
request
,
effectivePerson
,
access_token
,
MediaType
.
APPLICATION_JSON
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"GET方法实现oauth认证info方法."
,
action
=
ActionInfo
.
class
)
@JaxrsMethodDescribe
(
value
=
"GET方法实现oauth认证info方法."
,
action
=
ActionInfo
.
class
)
@GET
@GET
@Path
(
"info"
)
@Path
(
"info"
)
...
@@ -144,4 +162,22 @@ public class OauthAction extends StandardJaxrsAction {
...
@@ -144,4 +162,22 @@ public class OauthAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"GET方法实现oauth认证info方法,适配jira."
,
action
=
ActionInfo
.
class
)
@GET
@Path
(
"info/jira"
)
@Consumes
({
MediaType
.
MULTIPART_FORM_DATA
,
MediaType
.
APPLICATION_FORM_URLENCODED
})
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
public
void
getInfoJira
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@Context
HttpServletResponse
response
,
@QueryParam
(
"access_token"
)
String
access_token
)
{
ActionResult
<
ActionInfo
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionInfo
().
execute
(
request
,
effectivePerson
,
access_token
,
MediaType
.
APPLICATION_JSON
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
}
\ No newline at end of file
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Task.java
浏览文件 @
09d19ad0
...
@@ -477,7 +477,7 @@ public class Task extends SliceJpaObject implements ProjectionInterface {
...
@@ -477,7 +477,7 @@ public class Task extends SliceJpaObject implements ProjectionInterface {
private
String
mediaOpinion
;
private
String
mediaOpinion
;
public
static
final
String
first_FIELDNAME
=
"first"
;
public
static
final
String
first_FIELDNAME
=
"first"
;
@FieldDescribe
(
"是否是第一条待办."
)
@FieldDescribe
(
"是否是第一条待办
,用于却别待办和草稿
."
)
@CheckPersist
(
allowEmpty
=
true
)
@CheckPersist
(
allowEmpty
=
true
)
@Column
(
name
=
ColumnNamePrefix
+
first_FIELDNAME
)
@Column
(
name
=
ColumnNamePrefix
+
first_FIELDNAME
)
private
Boolean
first
;
private
Boolean
first
;
...
...
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/TaskCompleted.java
浏览文件 @
09d19ad0
...
@@ -623,7 +623,7 @@ public class TaskCompleted extends SliceJpaObject implements ProjectionInterface
...
@@ -623,7 +623,7 @@ public class TaskCompleted extends SliceJpaObject implements ProjectionInterface
private
Date
retractTime
;
private
Date
retractTime
;
public
static
final
String
latest_FIELDNAME
=
"latest"
;
public
static
final
String
latest_FIELDNAME
=
"latest"
;
@FieldDescribe
(
"同一Job中同一用户是否是最新的."
)
@FieldDescribe
(
"同一Job中同一用户是否是最新的
,多人可以有多条已办,页面显示的时候可以通过此标记仅显示一条最新的
."
)
@Column
(
name
=
ColumnNamePrefix
+
latest_FIELDNAME
)
@Column
(
name
=
ColumnNamePrefix
+
latest_FIELDNAME
)
@Index
(
name
=
TABLE
+
IndexNameMiddle
+
latest_FIELDNAME
)
@Index
(
name
=
TABLE
+
IndexNameMiddle
+
latest_FIELDNAME
)
@CheckPersist
(
allowEmpty
=
true
)
@CheckPersist
(
allowEmpty
=
true
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录