Browse Source

文案调整

xuxueli 8 years ago
parent
commit
4b450008c3

+ 9 - 6
xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java View File

11
 import com.xxl.job.core.biz.model.ReturnT;
11
 import com.xxl.job.core.biz.model.ReturnT;
12
 import com.xxl.job.core.biz.model.TriggerParam;
12
 import com.xxl.job.core.biz.model.TriggerParam;
13
 import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
13
 import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
14
+import com.xxl.job.core.util.IpUtil;
14
 import org.apache.commons.collections.CollectionUtils;
15
 import org.apache.commons.collections.CollectionUtils;
15
 import org.slf4j.Logger;
16
 import org.slf4j.Logger;
16
 import org.slf4j.LoggerFactory;
17
 import org.slf4j.LoggerFactory;
66
 
67
 
67
                 ReturnT<String> triggerResult = new ReturnT<String>(null);
68
                 ReturnT<String> triggerResult = new ReturnT<String>(null);
68
                 StringBuffer triggerMsgSb = new StringBuffer();
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
                 triggerMsgSb.append("<br>阻塞处理策略:").append(blockStrategy.getTitle());
74
                 triggerMsgSb.append("<br>阻塞处理策略:").append(blockStrategy.getTitle());
71
                 triggerMsgSb.append("<br>失败处理策略:").append(failStrategy.getTitle());
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
                 // 3、trigger-valid
77
                 // 3、trigger-valid
76
                 if (triggerResult.getCode()==ReturnT.SUCCESS_CODE && CollectionUtils.isEmpty(addressList)) {
78
                 if (triggerResult.getCode()==ReturnT.SUCCESS_CODE && CollectionUtils.isEmpty(addressList)) {
134
 
136
 
135
         ReturnT<String> triggerResult = new ReturnT<String>(null);
137
         ReturnT<String> triggerResult = new ReturnT<String>(null);
136
         StringBuffer triggerMsgSb = new StringBuffer();
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
         triggerMsgSb.append("<br>阻塞处理策略:").append(blockStrategy.getTitle());
143
         triggerMsgSb.append("<br>阻塞处理策略:").append(blockStrategy.getTitle());
139
         triggerMsgSb.append("<br>失败处理策略:").append(failStrategy.getTitle());
144
         triggerMsgSb.append("<br>失败处理策略:").append(failStrategy.getTitle());
140
-        triggerMsgSb.append("<br>地址列表:").append(group.getRegistryList());
141
-        triggerMsgSb.append("<br>路由策略:").append(executorRouteStrategyEnum.getTitle());
142
 
145
 
143
         // 3、trigger-valid
146
         // 3、trigger-valid
144
         if (triggerResult.getCode()==ReturnT.SUCCESS_CODE && CollectionUtils.isEmpty(addressList)) {
147
         if (triggerResult.getCode()==ReturnT.SUCCESS_CODE && CollectionUtils.isEmpty(addressList)) {