xuxueli 8 лет назад
Родитель
Сommit
231f4b869e

+ 2 - 2
xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java Просмотреть файл

104
                     // 4.3、trigger (fail retry)
104
                     // 4.3、trigger (fail retry)
105
                     if (triggerResult.getCode()!=ReturnT.SUCCESS_CODE && failStrategy == ExecutorFailStrategyEnum.FAIL_RETRY) {
105
                     if (triggerResult.getCode()!=ReturnT.SUCCESS_CODE && failStrategy == ExecutorFailStrategyEnum.FAIL_RETRY) {
106
                         triggerResult = runExecutor(triggerParam, address);  // update04
106
                         triggerResult = runExecutor(triggerParam, address);  // update04
107
-                        triggerMsgSb.append("<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>"+ I18nUtil.getString("jobconf_fail_retry") +"<<<<<<<<<<< </span><br>").append(triggerResult.getMsg());
107
+                        triggerMsgSb.append("<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>"+ I18nUtil.getString("jobconf_trigger_fail_retry") +"<<<<<<<<<<< </span><br>").append(triggerResult.getMsg());
108
                     }
108
                     }
109
                 }
109
                 }
110
 
110
 
172
                 // 4.3、trigger (fail retry)
172
                 // 4.3、trigger (fail retry)
173
                 if (triggerResult.getCode()!=ReturnT.SUCCESS_CODE && failStrategy == ExecutorFailStrategyEnum.FAIL_RETRY) {
173
                 if (triggerResult.getCode()!=ReturnT.SUCCESS_CODE && failStrategy == ExecutorFailStrategyEnum.FAIL_RETRY) {
174
                     triggerResult = executorRouteStrategyEnum.getRouter().routeRun(triggerParam, addressList);
174
                     triggerResult = executorRouteStrategyEnum.getRouter().routeRun(triggerParam, addressList);
175
-                    triggerMsgSb.append("<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>"+ I18nUtil.getString("jobconf_fail_retry") +"<<<<<<<<<<< </span><br>").append(triggerResult.getMsg());
175
+                    triggerMsgSb.append("<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>"+ I18nUtil.getString("jobconf_trigger_fail_retry") +"<<<<<<<<<<< </span><br>").append(triggerResult.getMsg());
176
                 }
176
                 }
177
             }
177
             }
178
 
178
 

+ 15 - 8
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java Просмотреть файл

2
 
2
 
3
 import com.xxl.job.admin.core.model.XxlJobInfo;
3
 import com.xxl.job.admin.core.model.XxlJobInfo;
4
 import com.xxl.job.admin.core.model.XxlJobLog;
4
 import com.xxl.job.admin.core.model.XxlJobLog;
5
+import com.xxl.job.admin.core.util.I18nUtil;
5
 import com.xxl.job.admin.dao.XxlJobInfoDao;
6
 import com.xxl.job.admin.dao.XxlJobInfoDao;
6
 import com.xxl.job.admin.dao.XxlJobLogDao;
7
 import com.xxl.job.admin.dao.XxlJobLogDao;
7
 import com.xxl.job.admin.dao.XxlJobRegistryDao;
8
 import com.xxl.job.admin.dao.XxlJobRegistryDao;
64
         if (IJobHandler.SUCCESS.getCode() == handleCallbackParam.getExecuteResult().getCode()) {
65
         if (IJobHandler.SUCCESS.getCode() == handleCallbackParam.getExecuteResult().getCode()) {
65
             XxlJobInfo xxlJobInfo = xxlJobInfoDao.loadById(log.getJobId());
66
             XxlJobInfo xxlJobInfo = xxlJobInfoDao.loadById(log.getJobId());
66
             if (xxlJobInfo!=null && StringUtils.isNotBlank(xxlJobInfo.getChildJobId())) {
67
             if (xxlJobInfo!=null && StringUtils.isNotBlank(xxlJobInfo.getChildJobId())) {
67
-                callbackMsg = "<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发子任务<<<<<<<<<<< </span><br>";
68
+                callbackMsg = "<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>"+ I18nUtil.getString("jobconf_trigger_child_run") +"<<<<<<<<<<< </span><br>";
68
 
69
 
69
                 String[] childJobIds = xxlJobInfo.getChildJobId().split(",");
70
                 String[] childJobIds = xxlJobInfo.getChildJobId().split(",");
70
                 for (int i = 0; i < childJobIds.length; i++) {
71
                 for (int i = 0; i < childJobIds.length; i++) {
73
                         ReturnT<String> triggerChildResult = xxlJobService.triggerJob(childJobId);
74
                         ReturnT<String> triggerChildResult = xxlJobService.triggerJob(childJobId);
74
 
75
 
75
                         // add msg
76
                         // add msg
76
-                        callbackMsg += MessageFormat.format("{0}/{1} [任务ID={2}], 触发{3}, 触发备注: {4} <br>",
77
-                                (i+1), childJobIds.length, childJobIds[i], (triggerChildResult.getCode()==ReturnT.SUCCESS_CODE?"成功":"失败"), triggerChildResult.getMsg());
77
+                        callbackMsg += MessageFormat.format(I18nUtil.getString("jobconf_callback_child_msg1"),
78
+                                (i+1),
79
+                                childJobIds.length,
80
+                                childJobIds[i],
81
+                                (triggerChildResult.getCode()==ReturnT.SUCCESS_CODE?I18nUtil.getString("system_success"):I18nUtil.getString("system_fail")),
82
+                                triggerChildResult.getMsg());
78
                     } else {
83
                     } else {
79
-                        callbackMsg += MessageFormat.format(" {0}/{1} [任务ID={2}], 触发失败, 触发备注: 任务ID格式错误 <br>",
80
-                                (i+1), childJobIds.length, childJobIds[i]);
84
+                        callbackMsg += MessageFormat.format(I18nUtil.getString("jobconf_callback_child_msg2"),
85
+                                (i+1),
86
+                                childJobIds.length,
87
+                                childJobIds[i]);
81
                     }
88
                     }
82
                 }
89
                 }
83
 
90
 
84
             }
91
             }
85
         } else if (IJobHandler.FAIL_RETRY.getCode() == handleCallbackParam.getExecuteResult().getCode()){
92
         } else if (IJobHandler.FAIL_RETRY.getCode() == handleCallbackParam.getExecuteResult().getCode()){
86
             ReturnT<String> retryTriggerResult = xxlJobService.triggerJob(log.getJobId());
93
             ReturnT<String> retryTriggerResult = xxlJobService.triggerJob(log.getJobId());
87
-            callbackMsg = "<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>执行失败重试<<<<<<<<<<< </span><br>";
94
+            callbackMsg = "<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>"+ I18nUtil.getString("jobconf_exe_fail_retry") +"<<<<<<<<<<< </span><br>";
88
 
95
 
89
-            callbackMsg += MessageFormat.format("触发{0}, 触发备注: {1}",
90
-                   (retryTriggerResult.getCode()==ReturnT.SUCCESS_CODE?"成功":"失败"), retryTriggerResult.getMsg());
96
+            callbackMsg += MessageFormat.format(I18nUtil.getString("jobconf_callback_msg1"),
97
+                   (retryTriggerResult.getCode()==ReturnT.SUCCESS_CODE?I18nUtil.getString("system_success"):I18nUtil.getString("system_fail")), retryTriggerResult.getMsg());
91
         }
98
         }
92
 
99
 
93
         // handle msg
100
         // handle msg

+ 6 - 0
xxl-job-admin/src/main/resources/i18n/message.properties Просмотреть файл

217
 jobconf_trigger_exe_regaddress=执行器-地址列表
217
 jobconf_trigger_exe_regaddress=执行器-地址列表
218
 jobconf_trigger_address_empty=调度失败:执行器地址为空
218
 jobconf_trigger_address_empty=调度失败:执行器地址为空
219
 jobconf_trigger_run=触发调度
219
 jobconf_trigger_run=触发调度
220
+jobconf_trigger_child_run=触发子任务
221
+jobconf_trigger_fail_retry=调度失败重试
222
+jobconf_exe_fail_retry=执行失败重试
223
+jobconf_callback_child_msg1={0}/{1} [任务ID={2}], 触发{3}, 触发备注: {4} <br>
224
+jobconf_callback_child_msg2={0}/{1} [任务ID={2}], 触发失败, 触发备注: 任务ID格式错误 <br>
225
+jobconf_callback_msg1=触发{0}, 触发备注: {1} <br>
220
 
226
 
221
 ## help
227
 ## help
222
 job_help=使用教程
228
 job_help=使用教程