Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
1b917ff6
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,发现更多精彩内容 >>
提交
1b917ff6
编写于
9月 25, 2020
作者:
Z
zhourui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix jest
上级
738b6bc4
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
73 addition
and
57 deletion
+73
-57
o2server/x_base_core_project/src/main/java/com/x/base/core/project/Context.java
...roject/src/main/java/com/x/base/core/project/Context.java
+1
-3
o2server/x_base_core_project/src/main/java/com/x/base/core/project/organization/OrganizationDefinition.java
...ase/core/project/organization/OrganizationDefinition.java
+21
-21
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/log/SignalStackLog.java
...com/x/processplatform/core/entity/log/SignalStackLog.java
+2
-2
o2server/x_program_center/src/main/java/com/x/program/center/Context.java
...am_center/src/main/java/com/x/program/center/Context.java
+20
-20
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/jest/ActionList.java
...main/java/com/x/program/center/jaxrs/jest/ActionList.java
+29
-11
未找到文件。
o2server/x_base_core_project/src/main/java/com/x/base/core/project/Context.java
浏览文件 @
1b917ff6
...
...
@@ -320,9 +320,7 @@ public class Context extends AbstractContext {
public
void
destrory
(
ServletContextEvent
servletContextEvent
)
{
try
{
queues
.
stream
().
forEach
(
p
->
{
p
.
stop
();
});
queues
.
stream
().
forEach
(
AbstractQueue:
:
stop
);
this
.
scheduler
.
shutdown
();
EntityManagerContainerFactory
.
close
();
PCRegistry
.
deRegister
(
JpaObject
.
class
.
getClassLoader
());
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/organization/OrganizationDefinition.java
浏览文件 @
1b917ff6
...
...
@@ -12,67 +12,67 @@ import com.x.base.core.project.tools.ListTools;
public
class
OrganizationDefinition
{
public
final
static
String
Manager
=
"Manager"
;
public
final
static
String
Manager_d
i
scription
=
"系统管理员(系统角色),拥有所有角色的权限,可以管理所有内容。"
;
public
final
static
String
Manager_d
e
scription
=
"系统管理员(系统角色),拥有所有角色的权限,可以管理所有内容。"
;
public
final
static
String
AttendanceManager
=
"AttendanceManager"
;
public
final
static
String
AttendanceManager_d
i
scription
=
"考勤管理员(系统角色),可以管理考勤管理相关的配置,使用数据管理功能。"
;
public
final
static
String
AttendanceManager_d
e
scription
=
"考勤管理员(系统角色),可以管理考勤管理相关的配置,使用数据管理功能。"
;
public
final
static
String
OrganizationManager
=
"OrganizationManager"
;
public
final
static
String
OrganizationManager_d
i
scription
=
"组织信息管理员(系统角色),可以使用组织架构、人员、群组以及角色相关的配置和管理功能。"
;
public
final
static
String
OrganizationManager_d
e
scription
=
"组织信息管理员(系统角色),可以使用组织架构、人员、群组以及角色相关的配置和管理功能。"
;
public
final
static
String
PersonManager
=
"PersonManager"
;
public
final
static
String
PersonManager_d
i
scription
=
"人员信息管理员(系统角色),可以使用组织管理中的人员管理相关功能。"
;
public
final
static
String
PersonManager_d
e
scription
=
"人员信息管理员(系统角色),可以使用组织管理中的人员管理相关功能。"
;
public
final
static
String
GroupManager
=
"GroupManager"
;
public
final
static
String
GroupManager_d
i
scription
=
"群组信息管理员(系统角色),可以使用组织管理中的群组管理相关功能。"
;
public
final
static
String
GroupManager_d
e
scription
=
"群组信息管理员(系统角色),可以使用组织管理中的群组管理相关功能。"
;
public
final
static
String
UnitManager
=
"UnitManager"
;
public
final
static
String
UnitManager_d
i
scription
=
"组织信息管理员(系统角色),可以使用组织管理中的组织架构管理相关功能。"
;
public
final
static
String
UnitManager_d
e
scription
=
"组织信息管理员(系统角色),可以使用组织管理中的组织架构管理相关功能。"
;
public
final
static
String
RoleManager
=
"RoleManager"
;
public
final
static
String
RoleManager_d
i
scription
=
"角色信息管理员(系统角色),可以使用组织管理中的角色管理相关功能。"
;
public
final
static
String
RoleManager_d
e
scription
=
"角色信息管理员(系统角色),可以使用组织管理中的角色管理相关功能。"
;
public
final
static
String
ProcessPlatformManager
=
"ProcessPlatformManager"
;
public
final
static
String
ProcessPlatformManager_d
i
scription
=
"流程平台管理员(系统角色),可以对流程平台进行管理,可以进行流程设计管理,可以查询、调度和删除流程实例等。"
;
public
final
static
String
ProcessPlatformManager_d
e
scription
=
"流程平台管理员(系统角色),可以对流程平台进行管理,可以进行流程设计管理,可以查询、调度和删除流程实例等。"
;
public
final
static
String
ProcessPlatformCreator
=
"ProcessPlatformCreator"
;
public
final
static
String
ProcessPlatformCreator_d
i
scription
=
"流程设计创建者(系统角色),可以进行流程设计,新增和设计流程应用。"
;
public
final
static
String
ProcessPlatformCreator_d
e
scription
=
"流程设计创建者(系统角色),可以进行流程设计,新增和设计流程应用。"
;
public
final
static
String
MeetingManager
=
"MeetingManager"
;
public
final
static
String
MeetingManager_d
i
scription
=
"会议管理员(系统角色),可以对会议地址,会议室,会议等信息进行管理,对会议管理系统所有配置进行管理。"
;
public
final
static
String
MeetingManager_d
e
scription
=
"会议管理员(系统角色),可以对会议地址,会议室,会议等信息进行管理,对会议管理系统所有配置进行管理。"
;
public
final
static
String
MeetingViewer
=
"MeetingViewer"
;
public
final
static
String
MeetingViewer_d
i
scription
=
"会议观察员(系统角色),可以对所有的会议信息进行查看。"
;
public
final
static
String
MeetingViewer_d
e
scription
=
"会议观察员(系统角色),可以对所有的会议信息进行查看。"
;
public
final
static
String
PortalManager
=
"PortalManager"
;
public
final
static
String
PortalManager_d
i
scription
=
"门户管理员(系统角色),可以进行门户应用设计,对门户应用进行管理操作。"
;
public
final
static
String
PortalManager_d
e
scription
=
"门户管理员(系统角色),可以进行门户应用设计,对门户应用进行管理操作。"
;
public
final
static
String
BBSManager
=
"BSSManager"
;
public
final
static
String
BBSManager_d
i
scription
=
"社区管理员(系统角色),可以对社区进行论坛分区,版块的创建,权限的设定,贴子的管理等操作。"
;
public
final
static
String
BBSManager_d
e
scription
=
"社区管理员(系统角色),可以对社区进行论坛分区,版块的创建,权限的设定,贴子的管理等操作。"
;
public
final
static
String
CMSManager
=
"CMSManager"
;
public
final
static
String
CMSManager_d
i
scription
=
"内容管理系统管理员(系统角色),可以设计内容管理栏目,分类,对表单,列表进行设计,对文档进行管理等操作。"
;
public
final
static
String
CMSManager_d
e
scription
=
"内容管理系统管理员(系统角色),可以设计内容管理栏目,分类,对表单,列表进行设计,对文档进行管理等操作。"
;
public
final
static
String
OKRManager
=
"OKRManager"
;
public
final
static
String
OKRManager_d
i
scription
=
"执行力管理员(系统角色),可以进行执行力管理系统配置,对工作内容进行管理操作。"
;
public
final
static
String
OKRManager_d
e
scription
=
"执行力管理员(系统角色),可以进行执行力管理系统配置,对工作内容进行管理操作。"
;
public
final
static
String
CRMManager
=
"CRMManager"
;
public
final
static
String
CRMManager_d
i
scription
=
"CRM管理员(系统角色),可以进行CRM系统相关配置,对客户信息,商机等信息进行管理操作。"
;
public
final
static
String
CRMManager_d
e
scription
=
"CRM管理员(系统角色),可以进行CRM系统相关配置,对客户信息,商机等信息进行管理操作。"
;
public
final
static
String
TeamWorkManager
=
"TeamWorkManager"
;
public
final
static
String
TeamWorkManager_d
i
scription
=
"TeamWork管理员(系统角色),可以进行TeamWork系统相关配置,对项目,任务等信息进行管理操作。"
;
public
final
static
String
TeamWorkManager_d
e
scription
=
"TeamWork管理员(系统角色),可以进行TeamWork系统相关配置,对项目,任务等信息进行管理操作。"
;
public
final
static
String
QueryManager
=
"QueryManager"
;
public
final
static
String
QueryManager_d
i
scription
=
"数据中心管理员(系统角色),可以在数据中心进行视图管理,统计管理等操作。"
;
public
final
static
String
QueryManager_d
e
scription
=
"数据中心管理员(系统角色),可以在数据中心进行视图管理,统计管理等操作。"
;
public
final
static
String
MessageManager
=
"MessageManager"
;
public
final
static
String
MessageManager_d
i
scription
=
"消息管理员(系统角色),可以对系统中产生的消息进行管理。"
;
public
final
static
String
MessageManager_d
e
scription
=
"消息管理员(系统角色),可以对系统中产生的消息进行管理。"
;
public
final
static
String
HotPictureManager
=
"HotPictureManager"
;
public
final
static
String
HotPictureManager_d
i
scription
=
"热点图片控制权限(系统角色),可以对系统中产生的系统图片进行管理。"
;
public
final
static
String
HotPictureManager_d
e
scription
=
"热点图片控制权限(系统角色),可以对系统中产生的系统图片进行管理。"
;
public
final
static
String
SearchPrivilege
=
"SearchPrivilege"
;
public
final
static
String
SearchPrivilege_d
i
scription
=
"搜索管理员(系统角色),可以跨权限对系统内容进行搜索。"
;
public
final
static
String
SearchPrivilege_d
e
scription
=
"搜索管理员(系统角色),可以跨权限对系统内容进行搜索。"
;
public
final
static
String
RoleDefinitionSuffix
=
"SystemRole"
;
...
...
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/log/SignalStackLog.java
浏览文件 @
1b917ff6
...
...
@@ -55,9 +55,9 @@ public class SignalStackLog extends SliceJpaObject {
this
.
properties
=
new
SignalStackLogProperties
();
}
public
SignalStackLog
(
String
id
,
String
job
,
SignalStack
signalStack
)
{
public
SignalStackLog
(
String
work
,
String
job
,
SignalStack
signalStack
)
{
this
();
this
.
id
=
id
;
this
.
work
=
work
;
this
.
job
=
job
;
this
.
getProperties
().
setSignalStack
(
signalStack
);
}
...
...
o2server/x_program_center/src/main/java/com/x/program/center/Context.java
浏览文件 @
1b917ff6
...
...
@@ -268,45 +268,45 @@ public class Context extends AbstractContext {
*/
private
String
getDescriptionWithName
(
String
str
)
{
if
(
OrganizationDefinition
.
Manager
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
Manager_d
i
scription
;
return
OrganizationDefinition
.
Manager_d
e
scription
;
}
else
if
(
OrganizationDefinition
.
AttendanceManager
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
AttendanceManager_d
i
scription
;
return
OrganizationDefinition
.
AttendanceManager_d
e
scription
;
}
else
if
(
OrganizationDefinition
.
OrganizationManager
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
OrganizationManager_d
i
scription
;
return
OrganizationDefinition
.
OrganizationManager_d
e
scription
;
}
else
if
(
OrganizationDefinition
.
PersonManager
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
PersonManager_d
i
scription
;
return
OrganizationDefinition
.
PersonManager_d
e
scription
;
}
else
if
(
OrganizationDefinition
.
GroupManager
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
GroupManager_d
i
scription
;
return
OrganizationDefinition
.
GroupManager_d
e
scription
;
}
else
if
(
OrganizationDefinition
.
UnitManager
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
UnitManager_d
i
scription
;
return
OrganizationDefinition
.
UnitManager_d
e
scription
;
}
else
if
(
OrganizationDefinition
.
RoleManager
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
RoleManager_d
i
scription
;
return
OrganizationDefinition
.
RoleManager_d
e
scription
;
}
else
if
(
OrganizationDefinition
.
ProcessPlatformManager
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
ProcessPlatformManager_d
i
scription
;
return
OrganizationDefinition
.
ProcessPlatformManager_d
e
scription
;
}
else
if
(
OrganizationDefinition
.
ProcessPlatformCreator
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
ProcessPlatformCreator_d
i
scription
;
return
OrganizationDefinition
.
ProcessPlatformCreator_d
e
scription
;
}
else
if
(
OrganizationDefinition
.
MeetingManager
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
MeetingManager_d
i
scription
;
return
OrganizationDefinition
.
MeetingManager_d
e
scription
;
}
else
if
(
OrganizationDefinition
.
MeetingViewer
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
MeetingViewer_d
i
scription
;
return
OrganizationDefinition
.
MeetingViewer_d
e
scription
;
}
else
if
(
OrganizationDefinition
.
PortalManager
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
PortalManager_d
i
scription
;
return
OrganizationDefinition
.
PortalManager_d
e
scription
;
}
else
if
(
OrganizationDefinition
.
BBSManager
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
BBSManager_d
i
scription
;
return
OrganizationDefinition
.
BBSManager_d
e
scription
;
}
else
if
(
OrganizationDefinition
.
CMSManager
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
CMSManager_d
i
scription
;
return
OrganizationDefinition
.
CMSManager_d
e
scription
;
}
else
if
(
OrganizationDefinition
.
OKRManager
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
OKRManager_d
i
scription
;
return
OrganizationDefinition
.
OKRManager_d
e
scription
;
}
else
if
(
OrganizationDefinition
.
CRMManager
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
CRMManager_d
i
scription
;
return
OrganizationDefinition
.
CRMManager_d
e
scription
;
}
else
if
(
OrganizationDefinition
.
TeamWorkManager
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
TeamWorkManager_d
i
scription
;
return
OrganizationDefinition
.
TeamWorkManager_d
e
scription
;
}
else
if
(
OrganizationDefinition
.
QueryManager
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
QueryManager_d
i
scription
;
return
OrganizationDefinition
.
QueryManager_d
e
scription
;
}
else
if
(
OrganizationDefinition
.
MessageManager
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
MessageManager_d
i
scription
;
return
OrganizationDefinition
.
MessageManager_d
e
scription
;
}
else
if
(
OrganizationDefinition
.
SearchPrivilege
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
SearchPrivilege_d
i
scription
;
return
OrganizationDefinition
.
SearchPrivilege_d
e
scription
;
}
return
""
;
}
...
...
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/jest/ActionList.java
浏览文件 @
1b917ff6
...
...
@@ -9,6 +9,8 @@ import java.util.stream.Collectors;
import
javax.servlet.http.HttpServletRequest
;
import
org.apache.commons.lang3.BooleanUtils
;
import
com.x.base.core.project.Application
;
import
com.x.base.core.project.gson.GsonPropertyObject
;
import
com.x.base.core.project.http.ActionResult
;
...
...
@@ -16,40 +18,56 @@ import com.x.program.center.ThisApplication;
class
ActionList
extends
BaseAction
{
private
static
final
String
JEST_INDEX_HTML
=
"/jest/index.html"
;
ActionResult
<
List
<
Wo
>>
execute
(
HttpServletRequest
request
,
String
source
)
throws
Exception
{
ActionResult
<
List
<
Wo
>>
result
=
new
ActionResult
<>();
List
<
Wo
>
wos
=
new
ArrayList
<>();
B
oolean
fromProxy
=
this
.
formProxy
(
request
,
this
.
getHost
(
request
));
String
httpProtocol
=
"http://"
;
//O2LEE,修正如果开启SSL,x_program_center/jest/list.html 给出的URL都是HTTP协议的,无法访问的问题
b
oolean
fromProxy
=
this
.
formProxy
(
request
,
this
.
getHost
(
request
));
String
httpProtocol
=
"http://"
;
//
O2LEE,修正如果开启SSL,x_program_center/jest/list.html 给出的URL都是HTTP协议的,无法访问的问题
for
(
Entry
<
String
,
CopyOnWriteArrayList
<
Application
>>
en
:
ThisApplication
.
context
().
applications
()
.
entrySet
())
{
Wo
wo
=
new
Wo
();
wo
.
setName
(
en
.
getKey
());
wo
.
setUrlList
(
new
ArrayList
<
String
>());
wo
.
set
Class
Name
(
en
.
getKey
());
wo
.
setUrlList
(
new
ArrayList
<>());
for
(
Application
o
:
en
.
getValue
())
{
if
(
o
.
getSslEnable
()
)
{
wo
.
setName
(
o
.
getName
());
if
(
BooleanUtils
.
isTrue
(
o
.
getSslEnable
())
)
{
httpProtocol
=
"https://"
;
}
if
(
fromProxy
)
{
if
(
this
.
isUndefindHost
(
o
.
getProxyHost
()))
{
wo
.
getUrlList
().
add
(
httpProtocol
+
this
.
getHost
(
request
)
+
":"
+
o
.
getProxyPort
()
+
o
.
getContextPath
()
+
"/jest/index.html"
);
wo
.
getUrlList
().
add
(
httpProtocol
+
this
.
getHost
(
request
)
+
":"
+
o
.
getProxyPort
()
+
o
.
getContextPath
()
+
JEST_INDEX_HTML
);
}
else
{
wo
.
getUrlList
().
add
(
httpProtocol
+
o
.
getProxyHost
()
+
":"
+
o
.
getProxyPort
()
+
o
.
getContextPath
()
+
"/jest/index.html"
);
wo
.
getUrlList
().
add
(
httpProtocol
+
o
.
getProxyHost
()
+
":"
+
o
.
getProxyPort
()
+
o
.
getContextPath
()
+
JEST_INDEX_HTML
);
}
}
else
{
wo
.
getUrlList
().
add
(
httpProtocol
+
o
.
getNode
()
+
":"
+
o
.
getPort
()
+
o
.
getContextPath
()
+
"/jest/index.html"
);
wo
.
getUrlList
().
add
(
httpProtocol
+
o
.
getNode
()
+
":"
+
o
.
getPort
()
+
o
.
getContextPath
()
+
JEST_INDEX_HTML
);
}
}
wos
.
add
(
wo
);
wos
=
wos
.
stream
().
sorted
(
Comparator
.
comparing
(
Wo:
:
getName
,
Comparator
.
nullsLast
(
String:
:
compareTo
)))
.
collect
(
Collectors
.
toList
());
wos
=
wos
.
stream
().
sorted
(
Comparator
.
comparing
(
Wo:
:
getName
,
Comparator
.
nullsLast
(
String:
:
compareTo
)))
.
collect
(
Collectors
.
toList
());
}
result
.
setData
(
wos
);
return
result
;
}
public
static
class
Wo
extends
GsonPropertyObject
{
private
String
className
;
public
String
getClassName
()
{
return
className
;
}
public
void
setClassName
(
String
className
)
{
this
.
className
=
className
;
}
private
String
name
;
private
List
<
String
>
urlList
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录