Parcourir la source

任务属性枚举 "任务模式、阻塞策略" 国际化优化

xuxueli il y a 7 ans
Parent
révision
1aeaded9a2

+ 1 - 1
doc/XXL-JOB官方文档.md Voir le fichier

1157
 - 1、[迭代中]支持通过API服务操作任务信息;
1157
 - 1、[迭代中]支持通过API服务操作任务信息;
1158
 - 2、[迭代中]任务告警逻辑调整:任务调度,以及任务回调失败时,均推送监控队列。后期考虑通过任务Log字段控制告警状态;
1158
 - 2、[迭代中]任务告警逻辑调整:任务调度,以及任务回调失败时,均推送监控队列。后期考虑通过任务Log字段控制告警状态;
1159
 - 3、[迭代中]任务超时设置,超时任务主动终止;
1159
 - 3、[迭代中]任务超时设置,超时任务主动终止;
1160
-- 4、[迭代中]依赖JAR中枚举国际化问题处理
1160
+- 4、任务属性枚举 "任务模式、阻塞策略" 国际化优化
1161
 
1161
 
1162
 
1162
 
1163
 ### TODO LIST
1163
 ### TODO LIST

+ 11 - 0
xxl-job-admin/src/main/java/com/xxl/job/admin/core/schedule/XxlJobDynamicScheduler.java Voir le fichier

4
 import com.xxl.job.admin.core.model.XxlJobInfo;
4
 import com.xxl.job.admin.core.model.XxlJobInfo;
5
 import com.xxl.job.admin.core.thread.JobFailMonitorHelper;
5
 import com.xxl.job.admin.core.thread.JobFailMonitorHelper;
6
 import com.xxl.job.admin.core.thread.JobRegistryMonitorHelper;
6
 import com.xxl.job.admin.core.thread.JobRegistryMonitorHelper;
7
+import com.xxl.job.admin.core.util.I18nUtil;
7
 import com.xxl.job.admin.dao.XxlJobGroupDao;
8
 import com.xxl.job.admin.dao.XxlJobGroupDao;
8
 import com.xxl.job.admin.dao.XxlJobInfoDao;
9
 import com.xxl.job.admin.dao.XxlJobInfoDao;
9
 import com.xxl.job.admin.dao.XxlJobLogDao;
10
 import com.xxl.job.admin.dao.XxlJobLogDao;
10
 import com.xxl.job.admin.dao.XxlJobRegistryDao;
11
 import com.xxl.job.admin.dao.XxlJobRegistryDao;
11
 import com.xxl.job.core.biz.AdminBiz;
12
 import com.xxl.job.core.biz.AdminBiz;
12
 import com.xxl.job.core.biz.ExecutorBiz;
13
 import com.xxl.job.core.biz.ExecutorBiz;
14
+import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
13
 import com.xxl.job.core.rpc.netcom.NetComClientProxy;
15
 import com.xxl.job.core.rpc.netcom.NetComClientProxy;
14
 import com.xxl.job.core.rpc.netcom.NetComServerFactory;
16
 import com.xxl.job.core.rpc.netcom.NetComServerFactory;
15
 import org.quartz.*;
17
 import org.quartz.*;
76
         NetComServerFactory.putService(AdminBiz.class, XxlJobDynamicScheduler.adminBiz);
78
         NetComServerFactory.putService(AdminBiz.class, XxlJobDynamicScheduler.adminBiz);
77
         NetComServerFactory.setAccessToken(accessToken);
79
         NetComServerFactory.setAccessToken(accessToken);
78
 
80
 
81
+        // init i18n
82
+        initI18n();
83
+
79
         // valid
84
         // valid
80
         Assert.notNull(scheduler, "quartz scheduler is null");
85
         Assert.notNull(scheduler, "quartz scheduler is null");
81
         logger.info(">>>>>>>>> init xxl-job admin success.");
86
         logger.info(">>>>>>>>> init xxl-job admin success.");
82
     }
87
     }
83
 
88
 
89
+    private void initI18n(){
90
+        for (ExecutorBlockStrategyEnum item:ExecutorBlockStrategyEnum.values()) {
91
+            item.setTitle(I18nUtil.getString("jobconf_block_".concat(item.name())));
92
+        }
93
+    }
94
+
84
     public void destroy(){
95
     public void destroy(){
85
         // admin registry stop
96
         // admin registry stop
86
         JobRegistryMonitorHelper.getInstance().toStop();
97
         JobRegistryMonitorHelper.getInstance().toStop();

+ 3 - 0
xxl-job-admin/src/main/resources/i18n/message.properties Voir le fichier

191
 jobgroup_del_limit_1=拒绝删除, 系统至少保留一个执行器
191
 jobgroup_del_limit_1=拒绝删除, 系统至少保留一个执行器
192
 
192
 
193
 ## job conf
193
 ## job conf
194
+jobconf_block_SERIAL_EXECUTION=单机串行
195
+jobconf_block_DISCARD_LATER=丢弃后续调度
196
+jobconf_block_COVER_EARLY=覆盖之前调度
194
 jobconf_fail_alarm=失败告警
197
 jobconf_fail_alarm=失败告警
195
 jobconf_fail_retry=失败重试
198
 jobconf_fail_retry=失败重试
196
 jobconf_route_first=第一个
199
 jobconf_route_first=第一个

+ 3 - 0
xxl-job-admin/src/main/resources/i18n/message_en.properties Voir le fichier

191
 jobgroup_del_limit_1=Refuses to delete, the system retains at least one executor
191
 jobgroup_del_limit_1=Refuses to delete, the system retains at least one executor
192
 
192
 
193
 ## job conf
193
 ## job conf
194
+jobconf_block_SERIAL_EXECUTION=Serial execution
195
+jobconf_block_DISCARD_LATER=Discard Later
196
+jobconf_block_COVER_EARLY=Cover Early
194
 jobconf_fail_alarm=Fail Alarm
197
 jobconf_fail_alarm=Fail Alarm
195
 jobconf_fail_retry=Fail Retry
198
 jobconf_fail_retry=Fail Retry
196
 jobconf_route_first=First
199
 jobconf_route_first=First

+ 8 - 4
xxl-job-core/src/main/java/com/xxl/job/core/enums/ExecutorBlockStrategyEnum.java Voir le fichier

5
  */
5
  */
6
 public enum ExecutorBlockStrategyEnum {
6
 public enum ExecutorBlockStrategyEnum {
7
 
7
 
8
-    SERIAL_EXECUTION("单机串行"),
8
+    SERIAL_EXECUTION("Serial execution"),
9
     /*CONCURRENT_EXECUTION("并行"),*/
9
     /*CONCURRENT_EXECUTION("并行"),*/
10
-    DISCARD_LATER("丢弃后续调度"),
11
-    COVER_EARLY("覆盖之前调度");
10
+    DISCARD_LATER("Discard Later"),
11
+    COVER_EARLY("Cover Early");
12
 
12
 
13
-    private final String title;
13
+    private String title;
14
     private ExecutorBlockStrategyEnum (String title) {
14
     private ExecutorBlockStrategyEnum (String title) {
15
         this.title = title;
15
         this.title = title;
16
     }
16
     }
17
+
18
+    public void setTitle(String title) {
19
+        this.title = title;
20
+    }
17
     public String getTitle() {
21
     public String getTitle() {
18
         return title;
22
         return title;
19
     }
23
     }