Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
7df45998
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,发现更多精彩内容 >>
提交
7df45998
编写于
11月 25, 2020
作者:
O
o2sword
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
平台配置文件保存修改
上级
40aaf44e
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
163 addition
and
255 deletion
+163
-255
o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_program_center.java
...c/main/java/com/x/base/core/project/x_program_center.java
+2
-2
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/ActionApplication.java
...in/java/com/x/program/center/jaxrs/ActionApplication.java
+0
-2
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/EditConfigJaxrsFilter.java
...ava/com/x/program/center/jaxrs/EditConfigJaxrsFilter.java
+0
-13
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/config/ActionList.java
...in/java/com/x/program/center/jaxrs/config/ActionList.java
+15
-17
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/config/ActionOpen.java
...in/java/com/x/program/center/jaxrs/config/ActionOpen.java
+7
-25
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/config/ActionSave.java
...in/java/com/x/program/center/jaxrs/config/ActionSave.java
+20
-46
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/config/BaseAction.java
...in/java/com/x/program/center/jaxrs/config/BaseAction.java
+35
-0
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/config/ConfigAction.java
.../java/com/x/program/center/jaxrs/config/ConfigAction.java
+52
-5
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/config/ExceptionNameEmpty.java
...com/x/program/center/jaxrs/config/ExceptionNameEmpty.java
+12
-0
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/edit/BaseAction.java
...main/java/com/x/program/center/jaxrs/edit/BaseAction.java
+0
-42
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/edit/EditConfigAction.java
...ava/com/x/program/center/jaxrs/edit/EditConfigAction.java
+0
-80
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/module/ActionCompareUpload.java
...om/x/program/center/jaxrs/module/ActionCompareUpload.java
+7
-11
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/module/ActionWrite.java
...n/java/com/x/program/center/jaxrs/module/ActionWrite.java
+10
-10
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/module/ModuleAction.java
.../java/com/x/program/center/jaxrs/module/ModuleAction.java
+2
-1
o2server/x_program_center_core_entity/src/main/java/com/x/program/center/core/entity/Structure.java
...main/java/com/x/program/center/core/entity/Structure.java
+1
-1
未找到文件。
o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_program_center.java
浏览文件 @
7df45998
...
...
@@ -12,14 +12,14 @@ import com.x.base.core.project.annotation.ModuleType;
"com.x.program.center.core.entity.Structure"
,
"com.x.program.center.core.entity.WarnLog"
,
"com.x.program.center.core.entity.validation.Meta"
,
"com.x.program.center.core.entity.InstallLog"
,
"com.x.program.center.core.entity.Application"
,
"com.x.program.center.core.entity.Attachment"
,
"com.x.portal.core.entity.Page"
,
"com.x.general.core.entity.GeneralFile"
,
"com.x.portal.core.entity.Page"
,
"com.x.portal.core.entity.Portal"
,
"com.x.organization.core.entity.Group"
,
"com.x.organization.core.entity.Custom"
,
"com.x.organization.core.entity.Role"
,
"com.x.organization.core.entity.Person"
,
"com.x.organization.core.entity.Identity"
,
"com.x.organization.core.entity.PersonAttribute"
,
"com.x.organization.core.entity.Unit"
,
"com.x.organization.core.entity.UnitAttribute"
,
"com.x.organization.core.entity.UnitDuty"
,
"com.x.general.core.entity.area.District"
,
"com.x.program.center.core.entity.ScheduleLog"
},
storageTypes
=
{
StorageType
.
structure
,
StorageType
.
general
},
storeJars
=
{
storageTypes
=
{
StorageType
.
structure
},
storeJars
=
{
"x_organization_core_express"
,
"x_program_center_core_entity"
,
"x_attendance_core_entity"
,
"x_cms_core_entity"
,
"x_message_core_entity"
,
"x_component_core_entity"
,
"x_file_core_entity"
,
"x_meeting_core_entity"
,
"x_okr_core_entity"
,
"x_organization_core_entity"
,
...
...
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/ActionApplication.java
浏览文件 @
7df45998
...
...
@@ -20,7 +20,6 @@ import com.x.program.center.jaxrs.config.ConfigAction;
import
com.x.program.center.jaxrs.datastructure.DataStructureAction
;
import
com.x.program.center.jaxrs.dingding.DingdingAction
;
import
com.x.program.center.jaxrs.distribute.DistributeAction
;
import
com.x.program.center.jaxrs.edit.EditConfigAction
;
import
com.x.program.center.jaxrs.input.InputAction
;
import
com.x.program.center.jaxrs.invoke.InvokeAction
;
import
com.x.program.center.jaxrs.jest.JestAction
;
...
...
@@ -73,7 +72,6 @@ public class ActionApplication extends AbstractActionApplication {
classes
.
add
(
OutputAction
.
class
);
classes
.
add
(
InputAction
.
class
);
classes
.
add
(
MarketAction
.
class
);
classes
.
add
(
EditConfigAction
.
class
);
return
classes
;
}
}
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/EditConfigJaxrsFilter.java
已删除
100644 → 0
浏览文件 @
40aaf44e
package
com.x.program.center.jaxrs
;
import
javax.servlet.annotation.WebFilter
;
import
com.x.base.core.project.jaxrs.CipherManagerJaxrsFilter
;
@WebFilter
(
urlPatterns
=
"/jaxrs/editconfig/*"
,
asyncSupported
=
true
)
public
class
EditConfigJaxrsFilter
extends
CipherManagerJaxrsFilter
{
}
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/
edit
/ActionList.java
→
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/
config
/ActionList.java
浏览文件 @
7df45998
package
com.x.program.center.jaxrs.edit
;
import
java.io.DataInputStream
;
import
java.io.DataOutputStream
;
import
java.io.File
;
import
java.io.FileFilter
;
import
java.net.Socket
;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.Map
;
import
javax.servlet.http.HttpServletRequest
;
import
org.apache.commons.io.FileUtils
;
import
org.apache.commons.io.filefilter.WildcardFileFilter
;
import
org.apache.commons.lang3.StringUtils
;
package
com.x.program.center.jaxrs.config
;
import
com.google.gson.JsonObject
;
import
com.google.gson.JsonParser
;
...
...
@@ -28,6 +12,20 @@ import com.x.base.core.project.logger.Logger;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.tools.Crypto
;
import
com.x.base.core.project.tools.DefaultCharset
;
import
org.apache.commons.io.FileUtils
;
import
org.apache.commons.io.filefilter.WildcardFileFilter
;
import
org.apache.commons.lang3.StringUtils
;
import
javax.servlet.http.HttpServletRequest
;
import
java.io.DataInputStream
;
import
java.io.DataOutputStream
;
import
java.io.File
;
import
java.io.FileFilter
;
import
java.net.Socket
;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.Map
;
public
class
ActionList
extends
BaseAction
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
ActionList
.
class
);
...
...
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/
edit
/ActionOpen.java
→
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/
config
/ActionOpen.java
浏览文件 @
7df45998
package
com.x.program.center.jaxrs.
edit
;
package
com.x.program.center.jaxrs.
config
;
import
java.io.ByteArrayInputStream
;
import
java.io.DataInputStream
;
import
java.io.DataOutputStream
;
import
java.io.File
;
import
java.io.FileInputStream
;
import
java.io.InputStream
;
import
java.net.Socket
;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.regex.Matcher
;
import
java.util.regex.Pattern
;
import
javax.servlet.http.HttpServletRequest
;
import
org.apache.commons.io.FileUtils
;
import
com.google.gson.Gson
;
import
com.google.gson.JsonElement
;
import
com.x.base.core.project.annotation.FieldDescribe
;
import
com.x.base.core.project.config.Config
;
import
com.x.base.core.project.config.Nodes
;
import
com.x.base.core.project.gson.GsonPropertyObject
;
import
com.x.base.core.project.gson.XGsonBuilder
;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.EffectivePerson
;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.tools.Crypto
;
import
com.x.base.core.project.tools.DefaultCharset
;
import
com.x.program.center.jaxrs.command.ActionCommand.Wi
;
import
com.x.program.center.jaxrs.command.ActionCommand.Wo
;
import
org.apache.commons.io.FileUtils
;
import
javax.servlet.http.HttpServletRequest
;
import
java.io.File
;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
public
class
ActionOpen
extends
BaseAction
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
ActionOpen
.
class
);
...
...
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/
edit
/ActionSave.java
→
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/
config
/ActionSave.java
浏览文件 @
7df45998
package
com.x.program.center.jaxrs.
edit
;
package
com.x.program.center.jaxrs.
config
;
import
java.io.ByteArrayInputStream
;
import
java.io.DataInputStream
;
import
java.io.DataOutputStream
;
import
java.io.File
;
import
java.io.FileInputStream
;
import
java.io.InputStream
;
import
java.net.Socket
;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.regex.Matcher
;
import
java.util.regex.Pattern
;
import
javax.servlet.http.HttpServletRequest
;
import
org.apache.commons.io.FileUtils
;
import
org.glassfish.jersey.media.multipart.FormDataContentDisposition
;
import
com.google.gson.Gson
;
import
com.google.gson.JsonElement
;
import
com.x.base.core.project.annotation.FieldDescribe
;
import
com.x.base.core.project.config.Config
;
...
...
@@ -32,8 +12,15 @@ import com.x.base.core.project.logger.Logger;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.tools.Crypto
;
import
com.x.base.core.project.tools.DefaultCharset
;
import
com.x.program.center.jaxrs.command.ActionCommand.Wi
;
import
com.x.program.center.jaxrs.command.ActionCommand.Wo
;
import
org.apache.commons.io.FileUtils
;
import
javax.servlet.http.HttpServletRequest
;
import
java.io.*
;
import
java.net.Socket
;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.Map
;
public
class
ActionSave
extends
BaseAction
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
ActionSave
.
class
);
...
...
@@ -41,30 +28,17 @@ public class ActionSave extends BaseAction {
ActionResult
<
Wo
>
result
=
new
ActionResult
<>();
Wi
wi
=
this
.
convertToWrapIn
(
jsonElement
,
Wi
.
class
);
Wo
wo
=
new
Wo
();
String
curServer
=
request
.
getLocalAddr
();
SimpleDateFormat
df
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
String
fileName
=
wi
.
getFileName
();
if
(
fileName
==
null
)
{
wo
.
setTime
(
df
.
format
(
new
Date
()));
wo
.
setStatus
(
"failure"
);
wo
.
setMessage
(
"文件名为null"
);
result
.
setData
(
wo
);
return
result
;
throw
new
ExceptionNameEmpty
();
}
String
data
=
wi
.
getFileContent
();
if
(
fileName
.
equalsIgnoreCase
(
"node_127.0.0.1.json"
))
{
fileName
=
"node_"
+
curServer
+
".json"
;
}
if
(!
Config
.
nodes
().
centerServers
().
first
().
getValue
().
getConfigApiEnable
())
{
wo
.
setTime
(
df
.
format
(
new
Date
()));
wo
.
setStatus
(
"failure"
);
wo
.
setMessage
(
"禁止编辑"
);
result
.
setData
(
wo
);
return
result
;
throw
new
ExceptionModifyConfig
();
}
File
configFold
=
new
File
(
Config
.
base
(),
Config
.
DIR_CONFIG
);
...
...
@@ -86,16 +60,16 @@ public class ActionSave extends BaseAction {
Nodes
nodes
=
Config
.
nodes
();
//同步config文件
for
(
String
node
:
nodes
.
keySet
()){
//其他服务器
if
(!
node
.
equalsIgnoreCase
(
curServer
))
{
if
(!
node
.
equalsIgnoreCase
(
"127.0.0.1"
))
{
if
(
nodes
.
get
(
node
).
getApplication
().
getEnable
()
||
nodes
.
get
(
node
).
getCenter
().
getEnable
()){
boolean
Syncflag
=
executeSyncFile
(
Config
.
DIR_CONFIG
+
"/"
+
fileName
,
node
,
nodes
.
get
(
node
).
nodeAgentPort
());
}
}
if
(
nodes
.
get
(
node
).
getApplication
().
getEnable
()
||
nodes
.
get
(
node
).
getCenter
().
getEnable
()){
boolean
Syncflag
=
executeSyncFile
(
Config
.
DIR_CONFIG
+
"/"
+
fileName
,
node
,
nodes
.
get
(
node
).
nodeAgentPort
());
}
}
try
{
Thread
.
sleep
(
1000
);
}
catch
(
InterruptedException
e
)
{
}
this
.
configFlush
(
effectivePerson
);
wo
.
setTime
(
df
.
format
(
new
Date
()));
wo
.
setStatus
(
"success"
);
...
...
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/config/BaseAction.java
浏览文件 @
7df45998
...
...
@@ -3,12 +3,14 @@ package com.x.program.center.jaxrs.config;
import
java.util.List
;
import
com.x.base.core.project.Applications
;
import
com.x.base.core.project.cache.ApplicationCache
;
import
com.x.base.core.project.config.Config
;
import
com.x.base.core.project.connection.CipherConnectionAction
;
import
com.x.base.core.project.gson.GsonPropertyObject
;
import
com.x.base.core.project.http.EffectivePerson
;
import
com.x.base.core.project.jaxrs.StandardJaxrsAction
;
import
com.x.program.center.ThisApplication
;
import
net.sf.ehcache.Ehcache
;
class
BaseAction
extends
StandardJaxrsAction
{
public
static
class
AbstractWoProxy
extends
GsonPropertyObject
{
...
...
@@ -150,4 +152,37 @@ class BaseAction extends StandardJaxrsAction {
});
}
public
static
Ehcache
cacheLog
=
ApplicationCache
.
instance
().
getCache
(
CacheLogObject
.
class
);
public
static
class
CacheLogObject
extends
GsonPropertyObject
{
private
String
userToken
;
private
String
node
;
private
long
lastPoint
;
public
long
getLastPoint
()
{
return
lastPoint
;
}
public
void
setLastPoint
(
long
lastPoint
)
{
this
.
lastPoint
=
lastPoint
;
}
public
String
getNode
()
{
return
node
;
}
public
void
setNode
(
String
node
)
{
this
.
node
=
node
;
}
public
String
getUserToken
()
{
return
userToken
;
}
public
void
setUserToken
(
String
userToken
)
{
this
.
userToken
=
userToken
;
}
}
}
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/config/ConfigAction.java
浏览文件 @
7df45998
package
com.x.program.center.jaxrs.config
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.ws.rs.Consumes
;
import
javax.ws.rs.GET
;
import
javax.ws.rs.PUT
;
import
javax.ws.rs.Path
;
import
javax.ws.rs.Produces
;
import
javax.ws.rs.*
;
import
javax.ws.rs.container.AsyncResponse
;
import
javax.ws.rs.container.Suspended
;
import
javax.ws.rs.core.Context
;
...
...
@@ -254,4 +250,55 @@ public class ConfigAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"获取所有配置文件信息"
,
action
=
ActionList
.
class
)
@GET
@Path
(
"list"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
getList
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
)
{
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
ActionResult
<
ActionList
.
Wo
>
result
=
new
ActionResult
<>();
try
{
result
=
new
ActionList
().
execute
(
request
,
effectivePerson
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"打开config文件"
,
action
=
ActionOpen
.
class
)
@POST
@Path
(
"open"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
open
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
JsonElement
jsonElement
)
{
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
ActionResult
<
ActionOpen
.
Wo
>
result
=
new
ActionResult
<>();
try
{
result
=
new
ActionOpen
().
execute
(
request
,
effectivePerson
,
jsonElement
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"保存config文件"
,
action
=
ActionSave
.
class
)
@POST
@Path
(
"save"
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
public
void
save
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionSave
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionSave
().
execute
(
request
,
effectivePerson
,
jsonElement
);
}
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_program_center/src/main/java/com/x/program/center/jaxrs/config/ExceptionNameEmpty.java
0 → 100644
浏览文件 @
7df45998
package
com.x.program.center.jaxrs.config
;
import
com.x.base.core.project.exception.PromptException
;
class
ExceptionNameEmpty
extends
PromptException
{
private
static
final
long
serialVersionUID
=
-
3287459468603291619L
;
ExceptionNameEmpty
()
{
super
(
"名称不能为空."
);
}
}
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/edit/BaseAction.java
已删除
100644 → 0
浏览文件 @
40aaf44e
package
com.x.program.center.jaxrs.edit
;
import
com.x.base.core.project.cache.ApplicationCache
;
import
com.x.base.core.project.gson.GsonPropertyObject
;
import
com.x.base.core.project.jaxrs.StandardJaxrsAction
;
import
net.sf.ehcache.Ehcache
;
abstract
class
BaseAction
extends
StandardJaxrsAction
{
public
static
Ehcache
cacheLog
=
ApplicationCache
.
instance
().
getCache
(
CacheLogObject
.
class
);
public
static
class
CacheLogObject
extends
GsonPropertyObject
{
private
String
userToken
;
private
String
node
;
private
long
lastPoint
;
public
long
getLastPoint
()
{
return
lastPoint
;
}
public
void
setLastPoint
(
long
lastPoint
)
{
this
.
lastPoint
=
lastPoint
;
}
public
String
getNode
()
{
return
node
;
}
public
void
setNode
(
String
node
)
{
this
.
node
=
node
;
}
public
String
getUserToken
()
{
return
userToken
;
}
public
void
setUserToken
(
String
userToken
)
{
this
.
userToken
=
userToken
;
}
}
}
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/edit/EditConfigAction.java
已删除
100644 → 0
浏览文件 @
40aaf44e
package
com.x.program.center.jaxrs.edit
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.ws.rs.Consumes
;
import
javax.ws.rs.GET
;
import
javax.ws.rs.POST
;
import
javax.ws.rs.Path
;
import
javax.ws.rs.Produces
;
import
javax.ws.rs.container.AsyncResponse
;
import
javax.ws.rs.container.Suspended
;
import
javax.ws.rs.core.Context
;
import
javax.ws.rs.core.MediaType
;
import
com.google.gson.JsonElement
;
import
com.x.base.core.project.annotation.JaxrsDescribe
;
import
com.x.base.core.project.annotation.JaxrsMethodDescribe
;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.EffectivePerson
;
import
com.x.base.core.project.http.HttpMediaType
;
import
com.x.base.core.project.jaxrs.ResponseFactory
;
import
com.x.base.core.project.jaxrs.StandardJaxrsAction
;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.LoggerFactory
;
@Path
(
"editconfig"
)
@JaxrsDescribe
(
"编辑配置文件"
)
public
class
EditConfigAction
<
Wo
>
extends
StandardJaxrsAction
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
EditConfigAction
.
class
);
@JaxrsMethodDescribe
(
value
=
"获取所有配置文件信息"
,
action
=
ActionList
.
class
)
@GET
@Path
(
"list"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
getList
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
)
{
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
ActionResult
<
ActionList
.
Wo
>
result
=
new
ActionResult
<>();
try
{
result
=
(
ActionResult
<
ActionList
.
Wo
>)
new
ActionList
().
execute
(
request
,
effectivePerson
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"打开config文件"
,
action
=
ActionOpen
.
class
)
@POST
@Path
(
"open"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
open
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
JsonElement
jsonElement
)
{
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
ActionResult
<
ActionOpen
.
Wo
>
result
=
new
ActionResult
<>();
try
{
result
=
new
ActionOpen
().
execute
(
request
,
effectivePerson
,
jsonElement
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"保存config文件"
,
action
=
ActionSave
.
class
)
@POST
@Path
(
"save"
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
public
void
save
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionSave
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionSave
().
execute
(
request
,
effectivePerson
,
jsonElement
);
}
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_program_center/src/main/java/com/x/program/center/jaxrs/module/ActionCompareUpload.java
浏览文件 @
7df45998
...
...
@@ -6,11 +6,10 @@ import java.util.List;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.entity.annotation.CheckPersistType
;
import
com.x.base.core.project.cache.CacheManager
;
import
com.x.base.core.project.config.Config
;
import
com.x.base.core.project.config.StorageMapping
;
import
com.x.base.core.project.connection.CipherConnectionAction
;
import
com.x.
general.core.entity.GeneralFil
e
;
import
com.x.
program.center.core.entity.Structur
e
;
import
com.x.program.center.core.entity.wrap.WrapServiceModule
;
import
org.apache.commons.lang3.StringUtils
;
import
org.glassfish.jersey.media.multipart.FormDataContentDisposition
;
...
...
@@ -22,8 +21,6 @@ import com.x.base.core.project.x_portal_assemble_designer;
import
com.x.base.core.project.x_processplatform_assemble_designer
;
import
com.x.base.core.project.x_query_assemble_designer
;
import
com.x.base.core.project.annotation.FieldDescribe
;
import
com.x.base.core.project.cache.Cache.CacheCategory
;
import
com.x.base.core.project.cache.Cache.CacheKey
;
import
com.x.base.core.project.connection.ActionResponse
;
import
com.x.base.core.project.gson.GsonPropertyObject
;
import
com.x.base.core.project.gson.XGsonBuilder
;
...
...
@@ -32,7 +29,6 @@ import com.x.base.core.project.http.EffectivePerson;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.tools.DefaultCharset
;
import
com.x.base.core.project.tools.StringTools
;
import
com.x.cms.core.entity.element.wrap.WrapCms
;
import
com.x.portal.core.entity.wrap.WrapPortal
;
import
com.x.processplatform.core.entity.element.wrap.WrapProcessPlatform
;
...
...
@@ -59,13 +55,13 @@ class ActionCompareUpload extends BaseAction {
fileName
=
fileName
+
".xapp"
;
}
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
StorageMapping
gfMapping
=
ThisApplication
.
context
().
storageMappings
().
random
(
GeneralFil
e
.
class
);
GeneralFile
generalFile
=
new
GeneralFile
(
gfMapping
.
getName
(),
fileName
,
effectivePerson
.
getDistinguishedName
()
);
generalFile
.
saveContent
(
gfM
apping
,
bytes
,
fileName
);
emc
.
beginTransaction
(
GeneralFil
e
.
class
);
emc
.
persist
(
generalFil
e
,
CheckPersistType
.
all
);
StorageMapping
mapping
=
ThisApplication
.
context
().
storageMappings
().
random
(
Structur
e
.
class
);
Structure
structure
=
new
Structure
(
mapping
.
getName
(),
fileName
);
structure
.
saveContent
(
m
apping
,
bytes
,
fileName
);
emc
.
beginTransaction
(
Structur
e
.
class
);
emc
.
persist
(
structur
e
,
CheckPersistType
.
all
);
emc
.
commit
();
wo
.
setFlag
(
generalFil
e
.
getId
());
wo
.
setFlag
(
structur
e
.
getId
());
}
for
(
WrapProcessPlatform
o
:
module
.
getProcessPlatformList
())
{
ActionResponse
r
=
ThisApplication
.
context
().
applications
().
putQuery
(
effectivePerson
.
getDebugger
(),
...
...
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/module/ActionWrite.java
浏览文件 @
7df45998
...
...
@@ -9,7 +9,7 @@ import com.x.base.core.project.config.StorageMapping;
import
com.x.base.core.project.connection.CipherConnectionAction
;
import
com.x.base.core.project.gson.XGsonBuilder
;
import
com.x.base.core.project.tools.DefaultCharset
;
import
com.x.
general.core.entity.GeneralFil
e
;
import
com.x.
program.center.core.entity.Structur
e
;
import
com.x.program.center.core.entity.wrap.WrapServiceModule
;
import
org.apache.commons.lang3.StringUtils
;
...
...
@@ -57,16 +57,16 @@ public class ActionWrite extends BaseAction {
module
=
cacheObject
.
getModule
();
}
else
{
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
GeneralFile
generalFile
=
emc
.
find
(
flag
,
GeneralFil
e
.
class
);
if
(
generalFil
e
!=
null
){
StorageMapping
gfMapping
=
ThisApplication
.
context
().
storageMappings
().
get
(
GeneralFil
e
.
class
,
generalFil
e
.
getStorage
());
String
json
=
new
String
(
generalFil
e
.
readContent
(
gfMapping
),
DefaultCharset
.
charset
);
Structure
structure
=
emc
.
find
(
flag
,
Structur
e
.
class
);
if
(
structur
e
!=
null
){
StorageMapping
gfMapping
=
ThisApplication
.
context
().
storageMappings
().
get
(
Structur
e
.
class
,
structur
e
.
getStorage
());
String
json
=
new
String
(
structur
e
.
readContent
(
gfMapping
),
DefaultCharset
.
charset
);
module
=
XGsonBuilder
.
instance
().
fromJson
(
json
,
WrapModule
.
class
);
name
=
generalFil
e
.
getName
();
generalFil
e
.
deleteContent
(
gfMapping
);
emc
.
beginTransaction
(
GeneralFil
e
.
class
);
emc
.
delete
(
GeneralFile
.
class
,
generalFil
e
.
getId
());
name
=
structur
e
.
getName
();
structur
e
.
deleteContent
(
gfMapping
);
emc
.
beginTransaction
(
Structur
e
.
class
);
emc
.
delete
(
Structure
.
class
,
structur
e
.
getId
());
emc
.
commit
();
}
else
{
throw
new
ExceptionFlagNotExist
(
flag
);
...
...
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/module/ModuleAction.java
浏览文件 @
7df45998
...
...
@@ -90,11 +90,12 @@ public class ModuleAction extends StandardJaxrsAction {
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
public
void
compareUpload
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@FormDataParam
(
FILE_FIELD
)
final
byte
[]
bytes
,
@JaxrsParameterDescribe
(
"附件名称"
)
@FormDataParam
(
FILENAME_FIELD
)
String
fileName
,
@JaxrsParameterDescribe
(
".xapp文件"
)
@FormDataParam
(
FILE_FIELD
)
final
FormDataContentDisposition
disposition
)
{
ActionResult
<
ActionCompareUpload
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionCompareUpload
().
execute
(
effectivePerson
,
bytes
,
disposition
);
result
=
new
ActionCompareUpload
().
execute
(
effectivePerson
,
bytes
,
fileName
,
disposition
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
...
...
o2server/x_program_center_core_entity/src/main/java/com/x/program/center/core/entity/Structure.java
浏览文件 @
7df45998
...
...
@@ -166,7 +166,7 @@ public class Structure extends StorageObject {
public
static
final
String
name_FIELDNAME
=
"name"
;
@FieldDescribe
(
"名称."
)
@Column
(
length
=
JpaObject
.
length_255B
,
name
=
ColumnNamePrefix
+
name_FIELDNAME
)
@CheckPersist
(
allowEmpty
=
false
,
simplyString
=
true
)
@CheckPersist
(
allowEmpty
=
false
)
@Index
(
name
=
TABLE
+
IndexNameMiddle
+
name_FIELDNAME
)
private
String
name
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录