Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
37bd7f05
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,发现更多精彩内容 >>
提交
37bd7f05
编写于
11月 20, 2020
作者:
L
luojing
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
添加匿名下载附件方法
上级
bbd47afc
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
19 addition
and
19 deletion
+19
-19
o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/ActionApplication.java
...m/x/general/assemble/control/jaxrs/ActionApplication.java
+2
-2
o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/FileJaxrsFilter.java
...com/x/general/assemble/control/jaxrs/FileJaxrsFilter.java
+2
-2
o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/file/ActionGeneralFile.java
...eneral/assemble/control/jaxrs/file/ActionGeneralFile.java
+4
-4
o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/file/BaseAction.java
...com/x/general/assemble/control/jaxrs/file/BaseAction.java
+1
-1
o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/file/ExceptionInputFileObject.java
...assemble/control/jaxrs/file/ExceptionInputFileObject.java
+3
-3
o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/file/GeneralFileAction.java
...eneral/assemble/control/jaxrs/file/GeneralFileAction.java
+7
-7
未找到文件。
o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/ActionApplication.java
浏览文件 @
37bd7f05
...
@@ -8,7 +8,7 @@ import com.x.base.core.project.jaxrs.AbstractActionApplication;
...
@@ -8,7 +8,7 @@ import com.x.base.core.project.jaxrs.AbstractActionApplication;
import
com.x.general.assemble.control.jaxrs.area.AreaAction
;
import
com.x.general.assemble.control.jaxrs.area.AreaAction
;
import
com.x.general.assemble.control.jaxrs.ecnet.EcnetAction
;
import
com.x.general.assemble.control.jaxrs.ecnet.EcnetAction
;
import
com.x.general.assemble.control.jaxrs.office.OfficeAction
;
import
com.x.general.assemble.control.jaxrs.office.OfficeAction
;
import
com.x.general.assemble.control.jaxrs.
result.GeneralResult
Action
;
import
com.x.general.assemble.control.jaxrs.
file.GeneralFile
Action
;
import
com.x.general.assemble.control.jaxrs.worktime.WorkTimeAction
;
import
com.x.general.assemble.control.jaxrs.worktime.WorkTimeAction
;
@ApplicationPath
(
"jaxrs"
)
@ApplicationPath
(
"jaxrs"
)
...
@@ -19,7 +19,7 @@ public class ActionApplication extends AbstractActionApplication {
...
@@ -19,7 +19,7 @@ public class ActionApplication extends AbstractActionApplication {
classes
.
add
(
EcnetAction
.
class
);
classes
.
add
(
EcnetAction
.
class
);
classes
.
add
(
OfficeAction
.
class
);
classes
.
add
(
OfficeAction
.
class
);
classes
.
add
(
WorkTimeAction
.
class
);
classes
.
add
(
WorkTimeAction
.
class
);
classes
.
add
(
General
Result
Action
.
class
);
classes
.
add
(
General
File
Action
.
class
);
return
classes
;
return
classes
;
}
}
...
...
o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/
Result
JaxrsFilter.java
→
o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/
File
JaxrsFilter.java
浏览文件 @
37bd7f05
...
@@ -4,7 +4,7 @@ import com.x.base.core.project.jaxrs.AnonymousCipherManagerUserJaxrsFilter;
...
@@ -4,7 +4,7 @@ import com.x.base.core.project.jaxrs.AnonymousCipherManagerUserJaxrsFilter;
import
javax.servlet.annotation.WebFilter
;
import
javax.servlet.annotation.WebFilter
;
@WebFilter
(
urlPatterns
=
"/jaxrs/
result
/*"
,
asyncSupported
=
true
)
@WebFilter
(
urlPatterns
=
"/jaxrs/
file
/*"
,
asyncSupported
=
true
)
public
class
Result
JaxrsFilter
extends
AnonymousCipherManagerUserJaxrsFilter
{
public
class
File
JaxrsFilter
extends
AnonymousCipherManagerUserJaxrsFilter
{
}
}
o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/
result/ActionGeneralResult
.java
→
o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/
file/ActionGeneralFile
.java
浏览文件 @
37bd7f05
package
com.x.general.assemble.control.jaxrs.
result
;
package
com.x.general.assemble.control.jaxrs.
file
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
...
@@ -12,9 +12,9 @@ import com.x.general.assemble.control.ThisApplication;
...
@@ -12,9 +12,9 @@ import com.x.general.assemble.control.ThisApplication;
import
com.x.general.core.entity.file.GeneralFile
;
import
com.x.general.core.entity.file.GeneralFile
;
public
class
ActionGeneral
Result
extends
BaseAction
{
public
class
ActionGeneral
File
extends
BaseAction
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
ActionGeneral
Result
.
class
);
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
ActionGeneral
File
.
class
);
protected
ActionResult
<
Wo
>
execute
(
EffectivePerson
effectivePerson
,
String
flag
)
throws
Exception
{
protected
ActionResult
<
Wo
>
execute
(
EffectivePerson
effectivePerson
,
String
flag
)
throws
Exception
{
logger
.
debug
(
effectivePerson
,
"flag:{}."
,
flag
);
logger
.
debug
(
effectivePerson
,
"flag:{}."
,
flag
);
...
@@ -34,7 +34,7 @@ public class ActionGeneralResult extends BaseAction {
...
@@ -34,7 +34,7 @@ public class ActionGeneralResult extends BaseAction {
emc
.
delete
(
GeneralFile
.
class
,
generalFile
.
getId
());
emc
.
delete
(
GeneralFile
.
class
,
generalFile
.
getId
());
emc
.
commit
();
emc
.
commit
();
}
else
{
}
else
{
throw
new
ExceptionInput
Result
Object
(
flag
);
throw
new
ExceptionInput
File
Object
(
flag
);
}
}
}
}
...
...
o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/
result
/BaseAction.java
→
o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/
file
/BaseAction.java
浏览文件 @
37bd7f05
package
com.x.general.assemble.control.jaxrs.
result
;
package
com.x.general.assemble.control.jaxrs.
file
;
import
com.x.base.core.project.jaxrs.StandardJaxrsAction
;
import
com.x.base.core.project.jaxrs.StandardJaxrsAction
;
...
...
o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/
result/ExceptionInputResult
Object.java
→
o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/
file/ExceptionInputFile
Object.java
浏览文件 @
37bd7f05
package
com.x.general.assemble.control.jaxrs.
result
;
package
com.x.general.assemble.control.jaxrs.
file
;
import
com.x.base.core.project.exception.PromptException
;
import
com.x.base.core.project.exception.PromptException
;
public
class
ExceptionInput
Result
Object
extends
PromptException
{
public
class
ExceptionInput
File
Object
extends
PromptException
{
private
static
final
long
serialVersionUID
=
9085364457175859374L
;
private
static
final
long
serialVersionUID
=
9085364457175859374L
;
ExceptionInput
Result
Object
(
String
flag
)
{
ExceptionInput
File
Object
(
String
flag
)
{
super
(
"对象不存在:{}."
,
flag
);
super
(
"对象不存在:{}."
,
flag
);
}
}
...
...
o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/
result/GeneralResult
Action.java
→
o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/
file/GeneralFile
Action.java
浏览文件 @
37bd7f05
package
com.x.general.assemble.control.jaxrs.
result
;
package
com.x.general.assemble.control.jaxrs.
file
;
import
com.x.base.core.project.annotation.JaxrsDescribe
;
import
com.x.base.core.project.annotation.JaxrsDescribe
;
import
com.x.base.core.project.annotation.JaxrsMethodDescribe
;
import
com.x.base.core.project.annotation.JaxrsMethodDescribe
;
...
@@ -17,22 +17,22 @@ import javax.ws.rs.container.Suspended;
...
@@ -17,22 +17,22 @@ import javax.ws.rs.container.Suspended;
import
javax.ws.rs.core.Context
;
import
javax.ws.rs.core.Context
;
import
javax.ws.rs.core.MediaType
;
import
javax.ws.rs.core.MediaType
;
@Path
(
"
result
"
)
@Path
(
"
file
"
)
@JaxrsDescribe
(
"获取附件"
)
@JaxrsDescribe
(
"获取附件"
)
public
class
General
Result
Action
extends
StandardJaxrsAction
{
public
class
General
File
Action
extends
StandardJaxrsAction
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
General
Result
Action
.
class
);
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
General
File
Action
.
class
);
@JaxrsMethodDescribe
(
value
=
"获取附件."
,
action
=
ActionGeneral
Result
.
class
)
@JaxrsMethodDescribe
(
value
=
"获取附件."
,
action
=
ActionGeneral
File
.
class
)
@GET
@GET
@Path
(
"flag/{flag}"
)
@Path
(
"flag/{flag}"
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
getResult
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
public
void
getResult
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"附件标记"
)
@PathParam
(
"flag"
)
String
flag
)
{
@JaxrsParameterDescribe
(
"附件标记"
)
@PathParam
(
"flag"
)
String
flag
)
{
ActionResult
<
ActionGeneral
Result
.
Wo
>
result
=
new
ActionResult
<>();
ActionResult
<
ActionGeneral
File
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
try
{
result
=
new
ActionGeneral
Result
().
execute
(
effectivePerson
,
flag
);
result
=
new
ActionGeneral
File
().
execute
(
effectivePerson
,
flag
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
result
.
error
(
e
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录