master
xuxueli 7 years ago
parent 9992d94fa7
commit db703eb9d7
  1. 2
      doc/XXL-JOB-English-Documentation.md
  2. 3
      doc/XXL-JOB官方文档.md
  3. 2
      xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java
  4. 8
      xxl-job-core/src/main/java/com/xxl/job/core/biz/AdminBiz.java
  5. 10
      xxl-job-core/src/main/java/com/xxl/job/core/glue/GlueTypeEnum.java

@ -797,7 +797,7 @@ The scheduling center provides API services for executors and business parties t
The scheduling center API service location: com.xxl.job.core.biz.AdminBiz.java
The scheduling center API service requests reference code:com.xxl.job.dao.impl.AdminBizTest.java
The scheduling center API service requests reference code:com.xxl.job.adminbiz.AdminBizTest.java
## 6 Version update log

@ -1157,6 +1157,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
- 1、[迭代中]支持通过API服务操作任务信息;
- 2、[迭代中]任务告警逻辑调整:任务调度,以及任务回调失败时,均推送监控队列。后期考虑通过任务Log字段控制告警状态;
- 3、[迭代中]任务超时设置,超时任务主动终止;
- 4、[迭代中]依赖JAR中枚举国际化问题处理;
### TODO LIST
@ -1180,7 +1181,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
- 18、告警邮件中展示失败告警信息;
- 19、提供多版本执行器:不依赖容器版本、不内嵌Jetty版本(通过配置executoraddress替换jetty通讯)等;
- 20、注册中心支持扩展,除默认基于DB之外,支持扩展接入第三方注册中心如zk、eureka等;
- 21、依赖Core内部国际化处理;
## 七、其他

@ -30,7 +30,7 @@ public class I18nUtil {
return prop;
}
try {
// bild i18n prop
// build i18n prop
String i18n = XxlJobAdminConfig.getAdminConfig().getI18n();
i18n = StringUtils.isNotBlank(i18n)?("_"+i18n):i18n;
String i18nFile = MessageFormat.format("i18n/message{0}.properties", i18n);

@ -13,6 +13,9 @@ public interface AdminBiz {
public static final String MAPPING = "/api";
// ---------------------- callback ----------------------
/**
* callback
*
@ -21,6 +24,9 @@ public interface AdminBiz {
*/
public ReturnT<String> callback(List<HandleCallbackParam> callbackParamList);
// ---------------------- registry ----------------------
/**
* registry
*
@ -38,6 +44,8 @@ public interface AdminBiz {
public ReturnT<String> registryRemove(RegistryParam registryParam);
// ---------------------- job opt ----------------------
/**
* trigger job for once
*

@ -5,11 +5,11 @@ package com.xxl.job.core.glue;
*/
public enum GlueTypeEnum {
BEAN("BEAN模式", false, null, null),
GLUE_GROOVY("GLUE模式(Java)", false, null, null),
GLUE_SHELL("GLUE模式(Shell)", true, "bash", ".sh"),
GLUE_PYTHON("GLUE模式(Python)", true, "python", ".py"),
GLUE_NODEJS("GLUE模式(Nodejs)", true, "node", ".js");
BEAN("BEAN", false, null, null),
GLUE_GROOVY("GLUE(Java)", false, null, null),
GLUE_SHELL("GLUE(Shell)", true, "bash", ".sh"),
GLUE_PYTHON("GLUE(Python)", true, "python", ".py"),
GLUE_NODEJS("GLUE(Nodejs)", true, "node", ".js");
private String desc;
private boolean isScript;

Loading…
Cancel
Save