|
|
@@ -11,6 +11,7 @@ import com.xxl.job.core.biz.ExecutorBiz;
|
|
11
|
11
|
import com.xxl.job.core.biz.model.ReturnT;
|
|
12
|
12
|
import com.xxl.job.core.biz.model.TriggerParam;
|
|
13
|
13
|
import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
|
|
|
14
|
+import com.xxl.job.core.util.IpUtil;
|
|
14
|
15
|
import org.apache.commons.collections.CollectionUtils;
|
|
15
|
16
|
import org.slf4j.Logger;
|
|
16
|
17
|
import org.slf4j.LoggerFactory;
|
|
|
@@ -66,11 +67,12 @@ public class XxlJobTrigger {
|
|
66
|
67
|
|
|
67
|
68
|
ReturnT<String> triggerResult = new ReturnT<String>(null);
|
|
68
|
69
|
StringBuffer triggerMsgSb = new StringBuffer();
|
|
69
|
|
- triggerMsgSb.append("注册方式：").append( (group.getAddressType() == 0)?"自动注册":"手动录入" );
|
|
|
70
|
+ triggerMsgSb.append("调度机器：").append(IpUtil.getIp());
|
|
|
71
|
+ triggerMsgSb.append("<br>执行器-注册方式：").append( (group.getAddressType() == 0)?"自动注册":"手动录入" );
|
|
|
72
|
+ triggerMsgSb.append("<br>执行器-地址列表：").append(group.getRegistryList());
|
|
|
73
|
+ triggerMsgSb.append("<br>路由策略：").append(executorRouteStrategyEnum.getTitle()).append("("+i+"/"+addressList.size()+")"); // update01
|
|
70
|
74
|
triggerMsgSb.append("<br>阻塞处理策略：").append(blockStrategy.getTitle());
|
|
71
|
75
|
triggerMsgSb.append("<br>失败处理策略：").append(failStrategy.getTitle());
|
|
72
|
|
- triggerMsgSb.append("<br>地址列表：").append(group.getRegistryList());
|
|
73
|
|
- triggerMsgSb.append("<br>路由策略：").append(executorRouteStrategyEnum.getTitle()).append("("+i+"/"+addressList.size()+")"); // update01
|
|
74
|
76
|
|
|
75
|
77
|
// 3、trigger-valid
|
|
76
|
78
|
if (triggerResult.getCode()==ReturnT.SUCCESS_CODE && CollectionUtils.isEmpty(addressList)) {
|
|
|
@@ -134,11 +136,12 @@ public class XxlJobTrigger {
|
|
134
|
136
|
|
|
135
|
137
|
ReturnT<String> triggerResult = new ReturnT<String>(null);
|
|
136
|
138
|
StringBuffer triggerMsgSb = new StringBuffer();
|
|
137
|
|
- triggerMsgSb.append("注册方式：").append( (group.getAddressType() == 0)?"自动注册":"手动录入" );
|
|
|
139
|
+ triggerMsgSb.append("调度机器：").append(IpUtil.getIp());
|
|
|
140
|
+ triggerMsgSb.append("<br>执行器-注册方式：").append( (group.getAddressType() == 0)?"自动注册":"手动录入" );
|
|
|
141
|
+ triggerMsgSb.append("<br>执行器-地址列表：").append(group.getRegistryList());
|
|
|
142
|
+ triggerMsgSb.append("<br>路由策略：").append(executorRouteStrategyEnum.getTitle());
|
|
138
|
143
|
triggerMsgSb.append("<br>阻塞处理策略：").append(blockStrategy.getTitle());
|
|
139
|
144
|
triggerMsgSb.append("<br>失败处理策略：").append(failStrategy.getTitle());
|
|
140
|
|
- triggerMsgSb.append("<br>地址列表：").append(group.getRegistryList());
|
|
141
|
|
- triggerMsgSb.append("<br>路由策略：").append(executorRouteStrategyEnum.getTitle());
|
|
142
|
145
|
|
|
143
|
146
|
// 3、trigger-valid
|
|
144
|
147
|
if (triggerResult.getCode()==ReturnT.SUCCESS_CODE && CollectionUtils.isEmpty(addressList)) {
|
xuxueli