From 80a55655bcd3c079173c0f8707fc34481c9c8013 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Wed, 26 Jul 2017 21:57:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=99=A8=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E6=9C=BA=E5=99=A8=E5=88=97=E8=A1=A8=E8=87=AA=E7=84=B6=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/XXL-JOB官方文档.md | 1 - .../job/admin/core/thread/JobRegistryMonitorHelper.java | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index 2d7d69a4..2ef10f0c 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -912,7 +912,6 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段 - 8、任务执行结果回调失败后重试：待定，防止回调死循环； - 9、springboot 和 docker镜像，并且推送docker镜像到中央仓库，更进一步实现产品开箱即用； - 10、安全校验：调度中心和执行器约定公共密匙，只有密匙一致才允许相互通讯； -- 11、交互优化，默认左侧菜单折叠，新页面默认当前窗口打开； ## 七、其他 diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java index bb092291..e43ec7a0 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java @@ -10,6 +10,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.concurrent.TimeUnit; @@ -64,8 +65,11 @@ public class JobRegistryMonitorHelper { // fresh group address for (XxlJobGroup group: groupList) { List registryList = appAddressMap.get(group.getAppName()); - String addressListStr = StringUtils.join(registryList, ","); - + String addressListStr = null; + if (CollectionUtils.isNotEmpty(registryList)) { + Collections.sort(registryList); + addressListStr = StringUtils.join(registryList, ","); + } group.setAddressList(addressListStr); XxlJobDynamicScheduler.xxlJobGroupDao.update(group); }