Parcourir la source

执行器注册机器列表自然排序;

xuxueli il y a 7 ans
Parent
commit
80a55655bc

+ 0 - 1
doc/XXL-JOB官方文档.md

@@ -912,7 +912,6 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
 - 8、任务执行结果回调失败后重试:待定,防止回调死循环;
 - 9、springboot 和 docker镜像,并且推送docker镜像到中央仓库,更进一步实现产品开箱即用;
 - 10、安全校验:调度中心和执行器约定公共密匙,只有密匙一致才允许相互通讯;
-- 11、交互优化,默认左侧菜单折叠,新页面默认当前窗口打开;
 
 ## 七、其他
 

+ 6 - 2
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<String> 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);
 							}