From 9cf06dda3acf1d379afd749855268c0121c0b4d5 Mon Sep 17 00:00:00 2001
From: "xueli.xue" <xueli.xue@dianping.com>
Date: Fri, 10 Mar 2017 20:54:37 +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

---
 .../job/admin/core/jobbean/RemoteHttpJobBean.java | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/jobbean/RemoteHttpJobBean.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/jobbean/RemoteHttpJobBean.java
index ccde984c..e9a80c16 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/jobbean/RemoteHttpJobBean.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/jobbean/RemoteHttpJobBean.java
@@ -67,11 +67,22 @@ public class RemoteHttpJobBean extends QuartzJobBean {
 		triggerParam.setLogDateTim(jobLog.getTriggerTime().getTime());
 
 		// parse address
+		String groupAddressInfo = "注册方式：";
 		List<String> addressList = new ArrayList<String>();
 		XxlJobGroup group = XxlJobDynamicScheduler.xxlJobGroupDao.load(Integer.valueOf(jobInfo.getJobGroup()));
 		if (group!=null) {
-			addressList = JobRegistryHelper.discover(RegistHelper.RegistType.EXECUTOR.name(), group.getAppName());
+			if (group.getAddressType() == 0) {
+				groupAddressInfo += "自动注册";
+				addressList = JobRegistryHelper.discover(RegistHelper.RegistType.EXECUTOR.name(), group.getAppName());
+			} else {
+				groupAddressInfo += "手动录入";
+				if (StringUtils.isNotBlank(group.getAddressList())) {
+					addressList = Arrays.asList(group.getAddressList().split(","));
+				}
+			}
+			groupAddressInfo += "，地址列表：" + addressList.toString();
 		}
+        groupAddressInfo += "<br>";
 
 		// failover trigger
 		ReturnT<String> triggerResult = failoverTrigger(addressList, triggerParam, jobLog);
@@ -81,7 +92,7 @@ public class RemoteHttpJobBean extends QuartzJobBean {
 		
 		// update trigger info 2/2
 		jobLog.setTriggerCode(triggerResult.getCode());
-		jobLog.setTriggerMsg(triggerResult.getMsg());
+		jobLog.setTriggerMsg(groupAddressInfo + triggerResult.getMsg());
 		XxlJobDynamicScheduler.xxlJobLogDao.updateTriggerInfo(jobLog);
 
 		// monitor triger