From b972ca4efb3bb3ec9fb5139ed824631f5e0d787b Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Sun, 19 Aug 2018 01:01:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=B0=83=E5=BA=A6=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=E4=B8=AD=E6=A0=87=E6=B3=A8=E4=BB=BB=E5=8A=A1=E8=A7=A6?=
 =?UTF-8?q?=E5=8F=91=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=A6=82Cron=E8=A7=A6?=
 =?UTF-8?q?=E5=8F=91=E3=80=81=E7=88=B6=E4=BB=BB=E5=8A=A1=E8=A7=A6=E5=8F=91?=
 =?UTF-8?q?=E3=80=81API=E8=A7=A6=E5=8F=91=E7=AD=89=E7=AD=89=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B9=E4=BE=BF=E6=8E=92=E6=9F=A5=E8=B0=83=E5=BA=A6=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java  | 5 +++--
 xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js   | 6 ++++++
 2 files changed, 9 insertions(+), 2 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 6a2dcd2e..456baf46 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
@@ -76,7 +76,7 @@ public class XxlJobTrigger {
                 ReturnT<String> triggerResult = new ReturnT<String>(null);
                 StringBuffer triggerMsgSb = new StringBuffer();
                 triggerMsgSb.append(I18nUtil.getString("jobconf_trigger_type")).append("：").append(type);
-                triggerMsgSb.append(I18nUtil.getString("jobconf_trigger_admin_adress")).append("：").append(IpUtil.getIp());
+                triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_admin_adress")).append("：").append(IpUtil.getIp());
                 triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_exe_regtype")).append("：")
                         .append( (group.getAddressType() == 0)?I18nUtil.getString("jobgroup_field_addressType_0"):I18nUtil.getString("jobgroup_field_addressType_1") );
                 triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_exe_regaddress")).append("：").append(group.getRegistryList());
@@ -134,7 +134,8 @@ public class XxlJobTrigger {
 
             ReturnT<String> triggerResult = new ReturnT<String>(null);
             StringBuffer triggerMsgSb = new StringBuffer();
-            triggerMsgSb.append(I18nUtil.getString("jobconf_trigger_admin_adress")).append("：").append(IpUtil.getIp());
+            triggerMsgSb.append(I18nUtil.getString("jobconf_trigger_type")).append("：").append(type);
+            triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_admin_adress")).append("：").append(IpUtil.getIp());
             triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_exe_regtype")).append("：")
                     .append( (group.getAddressType() == 0)?I18nUtil.getString("jobgroup_field_addressType_0"):I18nUtil.getString("jobgroup_field_addressType_1") );
             triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_exe_regaddress")).append("：").append(group.getRegistryList());
diff --git a/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js b/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
index a39d7488..55913d15 100644
--- a/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
+++ b/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
@@ -98,8 +98,14 @@ $(function() {
                         "width":'10%',
 						"render": function ( data, type, row ) {
 
+							var jobhandler = '';
+                            if (row.executorHandler) {
+                                jobhandler = "<br>JobHandler：" + row.executorHandler;
+                            }
+
 							var temp = '';
 							temp += I18n.joblog_field_executorAddress + '：' + (row.executorAddress?row.executorAddress:'');
+							temp += jobhandler;
 							temp += '<br>'+ I18n.jobinfo_field_executorparam +'：' + row.executorParam;
 
 							return '<a class="logTips" href="javascript:;" >'+ row.jobId +'<span style="display:none;">'+ temp +'</span></a>';