From f31f9f0c917796fc1b577565f660d9bf845f84d0 Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Tue, 19 Dec 2017 21:20:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=88=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xxl/job/admin/core/trigger/XxlJobTrigger.java | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java
index a2808b46..7caec5fa 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java
@@ -11,6 +11,7 @@ import com.xxl.job.core.biz.ExecutorBiz;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.biz.model.TriggerParam;
 import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
+import com.xxl.job.core.util.IpUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -66,11 +67,12 @@ public class XxlJobTrigger {
 
                 ReturnT<String> triggerResult = new ReturnT<String>(null);
                 StringBuffer triggerMsgSb = new StringBuffer();
-                triggerMsgSb.append("注册方式：").append( (group.getAddressType() == 0)?"自动注册":"手动录入" );
+                triggerMsgSb.append("调度机器：").append(IpUtil.getIp());
+                triggerMsgSb.append("<br>执行器-注册方式：").append( (group.getAddressType() == 0)?"自动注册":"手动录入" );
+                triggerMsgSb.append("<br>执行器-地址列表：").append(group.getRegistryList());
+                triggerMsgSb.append("<br>路由策略：").append(executorRouteStrategyEnum.getTitle()).append("("+i+"/"+addressList.size()+")"); // update01
                 triggerMsgSb.append("<br>阻塞处理策略：").append(blockStrategy.getTitle());
                 triggerMsgSb.append("<br>失败处理策略：").append(failStrategy.getTitle());
-                triggerMsgSb.append("<br>地址列表：").append(group.getRegistryList());
-                triggerMsgSb.append("<br>路由策略：").append(executorRouteStrategyEnum.getTitle()).append("("+i+"/"+addressList.size()+")"); // update01
 
                 // 3、trigger-valid
                 if (triggerResult.getCode()==ReturnT.SUCCESS_CODE && CollectionUtils.isEmpty(addressList)) {
@@ -134,11 +136,12 @@ public class XxlJobTrigger {
 
         ReturnT<String> triggerResult = new ReturnT<String>(null);
         StringBuffer triggerMsgSb = new StringBuffer();
-        triggerMsgSb.append("注册方式：").append( (group.getAddressType() == 0)?"自动注册":"手动录入" );
+        triggerMsgSb.append("调度机器：").append(IpUtil.getIp());
+        triggerMsgSb.append("<br>执行器-注册方式：").append( (group.getAddressType() == 0)?"自动注册":"手动录入" );
+        triggerMsgSb.append("<br>执行器-地址列表：").append(group.getRegistryList());
+        triggerMsgSb.append("<br>路由策略：").append(executorRouteStrategyEnum.getTitle());
         triggerMsgSb.append("<br>阻塞处理策略：").append(blockStrategy.getTitle());
         triggerMsgSb.append("<br>失败处理策略：").append(failStrategy.getTitle());
-        triggerMsgSb.append("<br>地址列表：").append(group.getRegistryList());
-        triggerMsgSb.append("<br>路由策略：").append(executorRouteStrategyEnum.getTitle());
 
         // 3、trigger-valid
         if (triggerResult.getCode()==ReturnT.SUCCESS_CODE && CollectionUtils.isEmpty(addressList)) {