Ver código fonte

文案调整

xueli.xue 8 anos atrás
pai
commit
9cf06dda3a

+ 13 - 2
xxl-job-admin/src/main/java/com/xxl/job/admin/core/jobbean/RemoteHttpJobBean.java Ver arquivo

67
 		triggerParam.setLogDateTim(jobLog.getTriggerTime().getTime());
67
 		triggerParam.setLogDateTim(jobLog.getTriggerTime().getTime());
68
 
68
 
69
 		// parse address
69
 		// parse address
70
+		String groupAddressInfo = "注册方式:";
70
 		List<String> addressList = new ArrayList<String>();
71
 		List<String> addressList = new ArrayList<String>();
71
 		XxlJobGroup group = XxlJobDynamicScheduler.xxlJobGroupDao.load(Integer.valueOf(jobInfo.getJobGroup()));
72
 		XxlJobGroup group = XxlJobDynamicScheduler.xxlJobGroupDao.load(Integer.valueOf(jobInfo.getJobGroup()));
72
 		if (group!=null) {
73
 		if (group!=null) {
73
-			addressList = JobRegistryHelper.discover(RegistHelper.RegistType.EXECUTOR.name(), group.getAppName());
74
+			if (group.getAddressType() == 0) {
75
+				groupAddressInfo += "自动注册";
76
+				addressList = JobRegistryHelper.discover(RegistHelper.RegistType.EXECUTOR.name(), group.getAppName());
77
+			} else {
78
+				groupAddressInfo += "手动录入";
79
+				if (StringUtils.isNotBlank(group.getAddressList())) {
80
+					addressList = Arrays.asList(group.getAddressList().split(","));
81
+				}
82
+			}
83
+			groupAddressInfo += ",地址列表:" + addressList.toString();
74
 		}
84
 		}
85
+        groupAddressInfo += "<br>";
75
 
86
 
76
 		// failover trigger
87
 		// failover trigger
77
 		ReturnT<String> triggerResult = failoverTrigger(addressList, triggerParam, jobLog);
88
 		ReturnT<String> triggerResult = failoverTrigger(addressList, triggerParam, jobLog);
81
 		
92
 		
82
 		// update trigger info 2/2
93
 		// update trigger info 2/2
83
 		jobLog.setTriggerCode(triggerResult.getCode());
94
 		jobLog.setTriggerCode(triggerResult.getCode());
84
-		jobLog.setTriggerMsg(triggerResult.getMsg());
95
+		jobLog.setTriggerMsg(groupAddressInfo + triggerResult.getMsg());
85
 		XxlJobDynamicScheduler.xxlJobLogDao.updateTriggerInfo(jobLog);
96
 		XxlJobDynamicScheduler.xxlJobLogDao.updateTriggerInfo(jobLog);
86
 
97
 
87
 		// monitor triger
98
 		// monitor triger