diff --git a/o2server/configSample/organization.json b/o2server/configSample/organization.json index caac3b86449ed6ada00c55781b7e630e5813d2af..1be2b192f0cc700eb0e0e614f7ed7f929ead8eed 100644 --- a/o2server/configSample/organization.json +++ b/o2server/configSample/organization.json @@ -1,7 +1,7 @@ { "unitLevelOrderNumberDigits": 10.0, "pickPersonWithName": true, - "pickIdentityWithName": false, + "pickIdentityWithName": true, "###unitLevelOrderNumberDigits": "unit中unitLevelOrderNumber扩充位数,\u003c\u003d0不扩充.###", "###pickPersonWithName": "zhangsan@123@P人员识别过程中过程为先查找 distinguishedName 再查找中间的 unique 如果还是没有查找到是否要通过名称进行查找.###", "###pickIdentityWithName": "zhangsan@456@I身份识别过程中过程为先查找 distinguishedName 再查找中间的 unique 如果还是没有查找到是否要通过名称进行查找.###" diff --git a/o2server/x_console/src/main/java/com/x/server/console/RegistApplicationsAndVoteCenterTask.java b/o2server/x_console/src/main/java/com/x/server/console/RegistApplicationsAndVoteCenterTask.java index 15ec3017aabbf85fd80d57ecc172acd0dd84f948..1b838b8936c02905098dca03db89bfd8b2a7f5d1 100644 --- a/o2server/x_console/src/main/java/com/x/server/console/RegistApplicationsAndVoteCenterTask.java +++ b/o2server/x_console/src/main/java/com/x/server/console/RegistApplicationsAndVoteCenterTask.java @@ -29,10 +29,15 @@ public class RegistApplicationsAndVoteCenterTask implements Job { // 先选举center Config.resource_node_eventQueue().put(XGsonBuilder.instance().toJsonTree(new VoteCenterEvent())); } - // 从主center更新本地数据 - Config.resource_node_eventQueue().put(XGsonBuilder.instance().toJsonTree(new UpdateApplicationsEvent())); - // 刷新本地application - Config.resource_node_eventQueue().put(XGsonBuilder.instance().toJsonTree(new RefreshApplicationsEvent())); + if (BooleanUtils.isTrue(Servers.centerServerIsStarted())) { + // 刷新本地application + Config.resource_node_eventQueue() + .put(XGsonBuilder.instance().toJsonTree(new RefreshApplicationsEvent())); + } else { + // 从主center更新本地数据 + Config.resource_node_eventQueue() + .put(XGsonBuilder.instance().toJsonTree(new UpdateApplicationsEvent())); + } } catch (Exception e) { logger.error(e); Thread.currentThread().interrupt(); diff --git a/o2server/x_console/src/main/java/com/x/server/console/node/RegistApplicationsEvent.java b/o2server/x_console/src/main/java/com/x/server/console/node/RegistApplicationsEvent.java index de8645d3e6d3d0a4c58ed11a059066488304040a..a8b7a3dbc0496ad8bb4d19c22aba23420b51f27c 100644 --- a/o2server/x_console/src/main/java/com/x/server/console/node/RegistApplicationsEvent.java +++ b/o2server/x_console/src/main/java/com/x/server/console/node/RegistApplicationsEvent.java @@ -29,6 +29,7 @@ import com.x.base.core.project.gson.XGsonBuilder; import com.x.base.core.project.jaxrs.WrapString; import com.x.base.core.project.logger.Logger; import com.x.base.core.project.logger.LoggerFactory; +import com.x.base.core.project.tools.ListTools; import com.x.server.console.server.Servers; public class RegistApplicationsEvent implements Event { @@ -49,6 +50,9 @@ public class RegistApplicationsEvent implements Event { if (BooleanUtils.isTrue(Servers.applicationServerIsStarted()) && (null != Config.resource_node_applications())) { List list = listApplication(applicationServer); + if (ListTools.isEmpty(list)) { + logger.warn("applications on node:{} is empty.", Config.node()); + } if (BooleanUtils.isTrue(Config.currentNode().getSelfHealthCheckEnable()) && (!this.healthCheck(list))) { logger.warn("health check result is false."); list.clear(); diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/schedule/RefreshApplications.java b/o2server/x_program_center/src/main/java/com/x/program/center/schedule/RefreshApplications.java index a9a10a9eb460ee3f276884e8b07d29597b7fd861..f49eb4c0851df360b2b7da867922096889f300e9 100644 --- a/o2server/x_program_center/src/main/java/com/x/program/center/schedule/RefreshApplications.java +++ b/o2server/x_program_center/src/main/java/com/x/program/center/schedule/RefreshApplications.java @@ -1,26 +1,26 @@ -package com.x.program.center.schedule; - -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; - -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.program.center.CenterQueueRefreshBody; -import com.x.program.center.ThisApplication; - -public class RefreshApplications extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(RefreshApplications.class); - - @Override - public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { - try { - CenterQueueRefreshBody body = new CenterQueueRefreshBody(); - ThisApplication.centerQueue.send(body); - } catch (Exception e) { - logger.error(e); - throw new JobExecutionException(e); - } - } - -} \ No newline at end of file +//package com.x.program.center.schedule; +// +//import org.quartz.JobExecutionContext; +//import org.quartz.JobExecutionException; +// +//import com.x.base.core.project.logger.Logger; +//import com.x.base.core.project.logger.LoggerFactory; +//import com.x.program.center.CenterQueueRefreshBody; +//import com.x.program.center.ThisApplication; +// +//public class RefreshApplications extends BaseAction { +// +// private static Logger logger = LoggerFactory.getLogger(RefreshApplications.class); +// +// @Override +// public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { +// try { +// CenterQueueRefreshBody body = new CenterQueueRefreshBody(); +// ThisApplication.centerQueue.send(body); +// } catch (Exception e) { +// logger.error(e); +// throw new JobExecutionException(e); +// } +// } +// +//} \ No newline at end of file