diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/Context.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/Context.java index 4eb43656ee9136cee80a28f2e37827a1505c8ba2..fbc37e13a977a0c41b3faae0a78919c92a09ecd2 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/Context.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/Context.java @@ -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()); diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/organization/OrganizationDefinition.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/organization/OrganizationDefinition.java index 5a58de1dfc64e8a1f9bdaa5154118021953a6481..08f2e0a17bb6e2b937393b6f14fd61eb18655507 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/organization/OrganizationDefinition.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/organization/OrganizationDefinition.java @@ -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_discription = "系统管理员(系统角色)，拥有所有角色的权限，可以管理所有内容。"; + public final static String Manager_description = "系统管理员(系统角色)，拥有所有角色的权限，可以管理所有内容。"; public final static String AttendanceManager = "AttendanceManager"; - public final static String AttendanceManager_discription = "考勤管理员(系统角色)，可以管理考勤管理相关的配置，使用数据管理功能。"; + public final static String AttendanceManager_description = "考勤管理员(系统角色)，可以管理考勤管理相关的配置，使用数据管理功能。"; public final static String OrganizationManager = "OrganizationManager"; - public final static String OrganizationManager_discription = "组织信息管理员(系统角色)，可以使用组织架构、人员、群组以及角色相关的配置和管理功能。"; + public final static String OrganizationManager_description = "组织信息管理员(系统角色)，可以使用组织架构、人员、群组以及角色相关的配置和管理功能。"; public final static String PersonManager = "PersonManager"; - public final static String PersonManager_discription = "人员信息管理员(系统角色)，可以使用组织管理中的人员管理相关功能。"; + public final static String PersonManager_description = "人员信息管理员(系统角色)，可以使用组织管理中的人员管理相关功能。"; public final static String GroupManager = "GroupManager"; - public final static String GroupManager_discription = "群组信息管理员(系统角色)，可以使用组织管理中的群组管理相关功能。"; + public final static String GroupManager_description = "群组信息管理员(系统角色)，可以使用组织管理中的群组管理相关功能。"; public final static String UnitManager = "UnitManager"; - public final static String UnitManager_discription = "组织信息管理员(系统角色)，可以使用组织管理中的组织架构管理相关功能。"; + public final static String UnitManager_description = "组织信息管理员(系统角色)，可以使用组织管理中的组织架构管理相关功能。"; public final static String RoleManager = "RoleManager"; - public final static String RoleManager_discription = "角色信息管理员(系统角色)，可以使用组织管理中的角色管理相关功能。"; + public final static String RoleManager_description = "角色信息管理员(系统角色)，可以使用组织管理中的角色管理相关功能。"; public final static String ProcessPlatformManager = "ProcessPlatformManager"; - public final static String ProcessPlatformManager_discription = "流程平台管理员(系统角色)，可以对流程平台进行管理，可以进行流程设计管理，可以查询、调度和删除流程实例等。"; + public final static String ProcessPlatformManager_description = "流程平台管理员(系统角色)，可以对流程平台进行管理，可以进行流程设计管理，可以查询、调度和删除流程实例等。"; public final static String ProcessPlatformCreator = "ProcessPlatformCreator"; - public final static String ProcessPlatformCreator_discription = "流程设计创建者(系统角色)，可以进行流程设计，新增和设计流程应用。"; + public final static String ProcessPlatformCreator_description = "流程设计创建者(系统角色)，可以进行流程设计，新增和设计流程应用。"; public final static String MeetingManager = "MeetingManager"; - public final static String MeetingManager_discription = "会议管理员(系统角色)，可以对会议地址，会议室，会议等信息进行管理，对会议管理系统所有配置进行管理。"; + public final static String MeetingManager_description = "会议管理员(系统角色)，可以对会议地址，会议室，会议等信息进行管理，对会议管理系统所有配置进行管理。"; public final static String MeetingViewer = "MeetingViewer"; - public final static String MeetingViewer_discription = "会议观察员(系统角色)，可以对所有的会议信息进行查看。"; + public final static String MeetingViewer_description = "会议观察员(系统角色)，可以对所有的会议信息进行查看。"; public final static String PortalManager = "PortalManager"; - public final static String PortalManager_discription = "门户管理员(系统角色)，可以进行门户应用设计，对门户应用进行管理操作。"; + public final static String PortalManager_description = "门户管理员(系统角色)，可以进行门户应用设计，对门户应用进行管理操作。"; public final static String BBSManager = "BSSManager"; - public final static String BBSManager_discription = "社区管理员(系统角色)，可以对社区进行论坛分区，版块的创建，权限的设定，贴子的管理等操作。"; + public final static String BBSManager_description = "社区管理员(系统角色)，可以对社区进行论坛分区，版块的创建，权限的设定，贴子的管理等操作。"; public final static String CMSManager = "CMSManager"; - public final static String CMSManager_discription = "内容管理系统管理员(系统角色)，可以设计内容管理栏目，分类，对表单，列表进行设计，对文档进行管理等操作。"; + public final static String CMSManager_description = "内容管理系统管理员(系统角色)，可以设计内容管理栏目，分类，对表单，列表进行设计，对文档进行管理等操作。"; public final static String OKRManager = "OKRManager"; - public final static String OKRManager_discription = "执行力管理员(系统角色)，可以进行执行力管理系统配置，对工作内容进行管理操作。"; + public final static String OKRManager_description = "执行力管理员(系统角色)，可以进行执行力管理系统配置，对工作内容进行管理操作。"; public final static String CRMManager = "CRMManager"; - public final static String CRMManager_discription = "CRM管理员(系统角色)，可以进行CRM系统相关配置，对客户信息，商机等信息进行管理操作。"; + public final static String CRMManager_description = "CRM管理员(系统角色)，可以进行CRM系统相关配置，对客户信息，商机等信息进行管理操作。"; public final static String TeamWorkManager = "TeamWorkManager"; - public final static String TeamWorkManager_discription = "TeamWork管理员(系统角色)，可以进行TeamWork系统相关配置，对项目，任务等信息进行管理操作。"; + public final static String TeamWorkManager_description = "TeamWork管理员(系统角色)，可以进行TeamWork系统相关配置，对项目，任务等信息进行管理操作。"; public final static String QueryManager = "QueryManager"; - public final static String QueryManager_discription = "数据中心管理员(系统角色)，可以在数据中心进行视图管理，统计管理等操作。"; + public final static String QueryManager_description = "数据中心管理员(系统角色)，可以在数据中心进行视图管理，统计管理等操作。"; public final static String MessageManager = "MessageManager"; - public final static String MessageManager_discription = "消息管理员(系统角色)，可以对系统中产生的消息进行管理。"; + public final static String MessageManager_description = "消息管理员(系统角色)，可以对系统中产生的消息进行管理。"; public final static String HotPictureManager = "HotPictureManager"; - public final static String HotPictureManager_discription = "热点图片控制权限(系统角色)，可以对系统中产生的系统图片进行管理。"; + public final static String HotPictureManager_description = "热点图片控制权限(系统角色)，可以对系统中产生的系统图片进行管理。"; public final static String SearchPrivilege = "SearchPrivilege"; - public final static String SearchPrivilege_discription = "搜索管理员(系统角色)，可以跨权限对系统内容进行搜索。"; + public final static String SearchPrivilege_description = "搜索管理员(系统角色)，可以跨权限对系统内容进行搜索。"; public final static String RoleDefinitionSuffix = "SystemRole"; diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/log/SignalStackLog.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/log/SignalStackLog.java index f0914f74cf5bfebfaa52b9d7faeda88c7d59da4e..90f5e91e874ed51821ee6b623b108f039f2c35da 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/log/SignalStackLog.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/log/SignalStackLog.java @@ -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); } diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/Context.java b/o2server/x_program_center/src/main/java/com/x/program/center/Context.java index ae8ef5afb512296f53c8cd6875b185f44258f3b4..c44a9de05209785377577dab894f7d14d115ee49 100644 --- a/o2server/x_program_center/src/main/java/com/x/program/center/Context.java +++ b/o2server/x_program_center/src/main/java/com/x/program/center/Context.java @@ -268,45 +268,45 @@ public class Context extends AbstractContext { */ private String getDescriptionWithName(String str) { if (OrganizationDefinition.Manager.equalsIgnoreCase(str)) { - return OrganizationDefinition.Manager_discription; + return OrganizationDefinition.Manager_description; } else if (OrganizationDefinition.AttendanceManager.equalsIgnoreCase(str)) { - return OrganizationDefinition.AttendanceManager_discription; + return OrganizationDefinition.AttendanceManager_description; } else if (OrganizationDefinition.OrganizationManager.equalsIgnoreCase(str)) { - return OrganizationDefinition.OrganizationManager_discription; + return OrganizationDefinition.OrganizationManager_description; } else if (OrganizationDefinition.PersonManager.equalsIgnoreCase(str)) { - return OrganizationDefinition.PersonManager_discription; + return OrganizationDefinition.PersonManager_description; } else if (OrganizationDefinition.GroupManager.equalsIgnoreCase(str)) { - return OrganizationDefinition.GroupManager_discription; + return OrganizationDefinition.GroupManager_description; } else if (OrganizationDefinition.UnitManager.equalsIgnoreCase(str)) { - return OrganizationDefinition.UnitManager_discription; + return OrganizationDefinition.UnitManager_description; } else if (OrganizationDefinition.RoleManager.equalsIgnoreCase(str)) { - return OrganizationDefinition.RoleManager_discription; + return OrganizationDefinition.RoleManager_description; } else if (OrganizationDefinition.ProcessPlatformManager.equalsIgnoreCase(str)) { - return OrganizationDefinition.ProcessPlatformManager_discription; + return OrganizationDefinition.ProcessPlatformManager_description; } else if (OrganizationDefinition.ProcessPlatformCreator.equalsIgnoreCase(str)) { - return OrganizationDefinition.ProcessPlatformCreator_discription; + return OrganizationDefinition.ProcessPlatformCreator_description; } else if (OrganizationDefinition.MeetingManager.equalsIgnoreCase(str)) { - return OrganizationDefinition.MeetingManager_discription; + return OrganizationDefinition.MeetingManager_description; } else if (OrganizationDefinition.MeetingViewer.equalsIgnoreCase(str)) { - return OrganizationDefinition.MeetingViewer_discription; + return OrganizationDefinition.MeetingViewer_description; } else if (OrganizationDefinition.PortalManager.equalsIgnoreCase(str)) { - return OrganizationDefinition.PortalManager_discription; + return OrganizationDefinition.PortalManager_description; } else if (OrganizationDefinition.BBSManager.equalsIgnoreCase(str)) { - return OrganizationDefinition.BBSManager_discription; + return OrganizationDefinition.BBSManager_description; } else if (OrganizationDefinition.CMSManager.equalsIgnoreCase(str)) { - return OrganizationDefinition.CMSManager_discription; + return OrganizationDefinition.CMSManager_description; } else if (OrganizationDefinition.OKRManager.equalsIgnoreCase(str)) { - return OrganizationDefinition.OKRManager_discription; + return OrganizationDefinition.OKRManager_description; } else if (OrganizationDefinition.CRMManager.equalsIgnoreCase(str)) { - return OrganizationDefinition.CRMManager_discription; + return OrganizationDefinition.CRMManager_description; } else if (OrganizationDefinition.TeamWorkManager.equalsIgnoreCase(str)) { - return OrganizationDefinition.TeamWorkManager_discription; + return OrganizationDefinition.TeamWorkManager_description; } else if (OrganizationDefinition.QueryManager.equalsIgnoreCase(str)) { - return OrganizationDefinition.QueryManager_discription; + return OrganizationDefinition.QueryManager_description; } else if (OrganizationDefinition.MessageManager.equalsIgnoreCase(str)) { - return OrganizationDefinition.MessageManager_discription; + return OrganizationDefinition.MessageManager_description; } else if (OrganizationDefinition.SearchPrivilege.equalsIgnoreCase(str)) { - return OrganizationDefinition.SearchPrivilege_discription; + return OrganizationDefinition.SearchPrivilege_description; } return ""; } diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/jest/ActionList.java b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/jest/ActionList.java index 564dad72d666fe68cb441184c5f8bf1debcefbb6..6fd82674fc0eaee03c338da401d9466456a38b4f 100644 --- a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/jest/ActionList.java +++ b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/jest/ActionList.java @@ -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> execute(HttpServletRequest request, String source) throws Exception { ActionResult> result = new ActionResult<>(); List wos = new ArrayList<>(); - Boolean fromProxy = this.formProxy(request, this.getHost(request)); - String httpProtocol = "http://"; //O2LEE，修正如果开启SSL，x_program_center/jest/list.html 给出的URL都是HTTP协议的，无法访问的问题 + boolean fromProxy = this.formProxy(request, this.getHost(request)); + String httpProtocol = "http://"; // O2LEE，修正如果开启SSL，x_program_center/jest/list.html 给出的URL都是HTTP协议的，无法访问的问题 for (Entry> en : ThisApplication.context().applications() .entrySet()) { Wo wo = new Wo(); - wo.setName(en.getKey()); - wo.setUrlList(new ArrayList()); + wo.setClassName(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 urlList;