From c0ce4233842e527bac95f4a103c339795f39c55c Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Sun, 21 Jun 2026 14:54:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9E=8B=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8C=96=EF=BC=8C=E9=80=9A=E7=94=A8=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E7=BB=9F=E4=B8=80=EF=BC=8C=E5=BB=BA=E8=A1=A8?= =?UTF-8?q?SQL=E8=A7=84=E8=8C=83=E6=80=A7=E5=AE=8C=E5=96=84=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/XXL-JOB官方文档.md | 25 +++++++++-------- doc/db/tables_xxl_job.sql | 22 +++++++-------- .../controller/JobGroupController.java | 14 +++++----- .../controller/JobInfoController.java | 4 +-- .../business/mapper/XxlJobGroupMapper.java | 4 +-- .../business/mapper/XxlJobInfoMapper.java | 4 +-- .../job/admin/business/model/XxlJobGroup.java | 12 ++++---- .../job/admin/business/model/XxlJobInfo.java | 10 +++---- .../scheduler/alarm/impl/EmailJobAlarm.java | 4 +-- .../openapi/impl/AdminJobBizImpl.java | 4 +-- .../admin/business/service/XxlJobService.java | 2 +- .../service/impl/XxlJobServiceImpl.java | 12 ++++---- .../mapper/business/XxlJobGroupMapper.xml | 24 ++++++++-------- .../mapper/business/XxlJobInfoMapper.xml | 18 ++++++------ .../templates/business/group.list.ftl | 20 ++++++------- .../resources/templates/business/job.code.ftl | 2 +- .../resources/templates/business/job.list.ftl | 28 +++++++++---------- .../templates/business/log.detail.ftl | 2 +- .../resources/templates/business/log.list.ftl | 10 +++---- .../templates/business/user.list.ftl | 4 +-- .../mapper/XxlJobGroupMapperTest.java | 4 +-- .../business/mapper/XxlJobInfoMapperTest.java | 4 +-- .../com/xxl/job/openapi/AdminJobBizTest.java | 4 +-- .../core/openapi/admin/dto/JobAddRequest.java | 10 +++---- .../openapi/admin/dto/JobUpdateRequest.java | 10 +++---- 25 files changed, 130 insertions(+), 127 deletions(-) diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index f5f60bfa..91b10f95 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -2173,7 +2173,7 @@ Header： 请求数据格式如下，放置在 RequestBody 中，JSON格式： { "jobGroup":1, // 执行器主键ID（必填） - "jobDesc":"测试任务", // 任务描述（必填） + "name":"测试任务", // 任务描述（必填） "author":"admin", // 负责人（必填） "alarmEmail":"", // 报警邮件（选填） "scheduleType":"CRON", // 调度类型：NONE、CRON、FIX_RATE（必填） @@ -2213,7 +2213,7 @@ Header： 请求数据格式如下，放置在 RequestBody 中，JSON格式： { "id":1, // 任务ID（必填） - "jobDesc":"测试任务", // 任务描述（必填） + "name":"测试任务", // 任务描述（必填） "author":"admin", // 负责人（必填） "alarmEmail":"", // 报警邮件（选填） "scheduleType":"CRON", // 调度类型：NONE、CRON、FIX_RATE（必填） @@ -3097,12 +3097,13 @@ alter table xxl_job_log - 1、【新增】GLUE模式开关：新增GLUE模式开关（xxl.job.executor.glueenabled），支持执行器维度设置是否启用GLUE模式； - 2、【新增】AccessToken升级：支持执行期维度隔离设置，废弃旧的全局AccessToken，提升系统安全性； （注意：因为AccessToken调整为执行器维度，OpenAPI通讯协议部分发生适配变化，调度中心与执行器需要一并升级至v3.5.0体验） -- 3、【新增】AccessToken管理：支持线上化动态管理，执行期管理UI界面可操作，提升操作效率及体验； -- 4、【新增】调度中心OpenAPI增强：提供任务管理能力，包括任务新建/更新/删除、启动/停止、任务触发等； +- 3、【新增】AccessToken在线管理：支持线上化动态管理，执行期管理UI界面可操作，提升操作效率及体验； +- 4、【新增】OpenAPI能力增强：提供任务管理能力，包括任务新建/更新/删除、启动/停止、任务触发等； （注意：任务管理OpenAPI及操作代码示例，详见官方文档） -- 5、【TODO】配置线上化：发送邮箱配置线上管理、线程池配置调整； -- 6、【TODO】任务告警：拆分“告警类型、告警配置”属性，支持Webhook、邮箱多种方式； -- 7、【TODO】任务说明：拆分“任务名称、任务备注”属性，前者用于任务检索，后者用于补充任务描述。 +- 5、【新增】数据模型标准化，通用字段命名统一，建表SQL规范性完善； +- 6、【TODO】配置线上化：发送邮箱配置线上管理、线程池配置调整； +- 7、【TODO】任务告警：拆分“告警类型、告警配置”属性，支持Webhook、邮箱多种方式； +- 8、【TODO】任务说明：拆分“任务名称、任务备注”属性，前者用于任务检索，后者用于补充任务描述。 **备注：** 数据库升级脚本： @@ -3115,10 +3116,12 @@ ADD COLUMN `access_token` varchar(255) DEFAULT NULL COMMENT '执行器AccessToke ALTER TABLE `xxl_job_group` ADD UNIQUE KEY `i_app_name` (`app_name`) USING BTREE; --- 3. 将指定 AppName 的 access_token 更新为目标值； -UPDATE `xxl_job_group` -SET `access_token` = '<新Token值>' -WHERE `app_name` = '<目标AppName>'; +-- 3. 将指定 AppName 的 access_token 更新为目标值；默认值为 'default_token'，可自行修改; +UPDATE `xxl_job_group` SET `access_token` = '<新Token值>' WHERE `app_name` = '<目标AppName>'; + +-- 4. 执行器与任务表 name 字段标准化调整； +ALTER TABLE `xxl_job_group` CHANGE `title` `name` VARCHAR(64) NOT NULL COMMENT '执行器名称'; +ALTER TABLE `xxl_job_info` CHANGE `job_desc` `name` VARCHAR(255) NOT NULL COMMENT '任务描述'; ``` diff --git a/doc/db/tables_xxl_job.sql b/doc/db/tables_xxl_job.sql index 7d7e71ef..9c639c76 100644 --- a/doc/db/tables_xxl_job.sql +++ b/doc/db/tables_xxl_job.sql @@ -12,7 +12,7 @@ CREATE TABLE `xxl_job_group` `id` INT NOT NULL AUTO_INCREMENT, `app_name` VARCHAR(64) NOT NULL COMMENT '执行器AppName', `name` VARCHAR(64) NOT NULL COMMENT '执行器名称', - `address_type` TINYINT NOT NULL DEFAULT '0' COMMENT '执行器地址类型：0=自动注册、1=手动录入', + `address_type` TINYINT NOT NULL DEFAULT 0 COMMENT '执行器地址类型：0=自动注册、1=手动录入', `address_list` TEXT DEFAULT NULL COMMENT '执行器地址列表，多地址逗号分隔', `access_token` VARCHAR(255) DEFAULT NULL COMMENT '执行器AccessToken', `update_time` DATETIME DEFAULT NULL, @@ -49,16 +49,16 @@ CREATE TABLE `xxl_job_info` `executor_handler` VARCHAR(255) DEFAULT NULL COMMENT '任务handler', `executor_param` TEXT DEFAULT NULL COMMENT '任务参数', `executor_block_strategy` VARCHAR(50) DEFAULT NULL COMMENT '阻塞处理策略', - `executor_timeout` INT NOT NULL DEFAULT '0' COMMENT '任务执行超时时间，单位秒', - `executor_fail_retry_count` INT NOT NULL DEFAULT '0' COMMENT '失败重试次数', + `executor_timeout` INT NOT NULL DEFAULT 0 COMMENT '任务执行超时时间，单位秒', + `executor_fail_retry_count` INT NOT NULL DEFAULT 0 COMMENT '失败重试次数', `glue_type` VARCHAR(50) NOT NULL COMMENT 'GLUE类型', `glue_source` MEDIUMTEXT DEFAULT NULL COMMENT 'GLUE源代码', `glue_remark` VARCHAR(128) DEFAULT NULL COMMENT 'GLUE备注', `glue_updatetime` DATETIME DEFAULT NULL COMMENT 'GLUE更新时间', `child_jobid` VARCHAR(255) DEFAULT NULL COMMENT '子任务ID，多个逗号分隔', - `trigger_status` TINYINT NOT NULL DEFAULT '0' COMMENT '调度状态：0-停止，1-运行', - `trigger_last_time` BIGINT NOT NULL DEFAULT '0' COMMENT '上次调度时间', - `trigger_next_time` BIGINT NOT NULL DEFAULT '0' COMMENT '下次调度时间', + `trigger_status` TINYINT NOT NULL DEFAULT 0 COMMENT '调度状态：0-停止，1-运行', + `trigger_last_time` BIGINT NOT NULL DEFAULT 0 COMMENT '上次调度时间', + `trigger_next_time` BIGINT NOT NULL DEFAULT 0 COMMENT '下次调度时间', `add_time` DATETIME DEFAULT NULL, `update_time` DATETIME DEFAULT NULL, PRIMARY KEY (`id`) @@ -89,14 +89,14 @@ CREATE TABLE `xxl_job_log` `executor_handler` VARCHAR(255) DEFAULT NULL COMMENT '任务handler', `executor_param` TEXT DEFAULT NULL COMMENT '任务参数', `executor_sharding_param` VARCHAR(20) DEFAULT NULL COMMENT '任务分片参数，格式如 1/2', - `executor_fail_retry_count` INT NOT NULL DEFAULT '0' COMMENT '失败重试次数', + `executor_fail_retry_count` INT NOT NULL DEFAULT 0 COMMENT '失败重试次数', `trigger_time` DATETIME DEFAULT NULL COMMENT '调度-时间', `trigger_code` INT NOT NULL COMMENT '调度-结果', `trigger_msg` TEXT DEFAULT NULL COMMENT '调度-日志', `handle_time` DATETIME DEFAULT NULL COMMENT '执行-时间', `handle_code` INT NOT NULL COMMENT '执行-状态', `handle_msg` TEXT DEFAULT NULL COMMENT '执行-日志', - `alarm_status` TINYINT NOT NULL DEFAULT '0' COMMENT '告警状态：0-默认、1-无需告警、2-告警成功、3-告警失败', + `alarm_status` TINYINT NOT NULL DEFAULT 0 COMMENT '告警状态：0-默认、1-无需告警、2-告警成功、3-告警失败', PRIMARY KEY (`id`), KEY `i_trigger_time` (`trigger_time`), KEY `i_handle_code` (`handle_code`), @@ -109,9 +109,9 @@ CREATE TABLE `xxl_job_log_report` ( `id` INT NOT NULL AUTO_INCREMENT, `trigger_day` DATETIME DEFAULT NULL COMMENT '调度-时间', - `running_count` INT NOT NULL DEFAULT '0' COMMENT '运行中-日志数量', - `suc_count` INT NOT NULL DEFAULT '0' COMMENT '执行成功-日志数量', - `fail_count` INT NOT NULL DEFAULT '0' COMMENT '执行失败-日志数量', + `running_count` INT NOT NULL DEFAULT 0 COMMENT '运行中-日志数量', + `suc_count` INT NOT NULL DEFAULT 0 COMMENT '执行成功-日志数量', + `fail_count` INT NOT NULL DEFAULT 0 COMMENT '执行失败-日志数量', `update_time` DATETIME DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `i_trigger_day` (`trigger_day`) USING BTREE diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobGroupController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobGroupController.java index f530fd95..14feda02 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobGroupController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobGroupController.java @@ -53,11 +53,11 @@ public class JobGroupController { public Response> pageList(@RequestParam(required = false, defaultValue = "0") int offset, @RequestParam(required = false, defaultValue = "10") int pagesize, String appname, - String title) { + String name) { // page query - List list = xxlJobGroupMapper.pageList(offset, pagesize, appname, title); - int list_count = xxlJobGroupMapper.pageListCount(offset, pagesize, appname, title); + List list = xxlJobGroupMapper.pageList(offset, pagesize, appname, name); + int list_count = xxlJobGroupMapper.pageListCount(offset, pagesize, appname, name); // package result PageModel pageModel = new PageModel<>(); @@ -84,10 +84,10 @@ public class JobGroupController { } // valid title - if (StringTool.isBlank(xxlJobGroup.getTitle())) { + if (StringTool.isBlank(xxlJobGroup.getName())) { return Response.ofFail((I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) ); } - if (XssUtil.hasXss(xxlJobGroup.getTitle())) { + if (XssUtil.hasXss(xxlJobGroup.getName())) { return Response.ofFail(I18nUtil.getString("jobgroup_field_title") + I18nUtil.getString("system_invalid")); } if (xxlJobGroup.getAddressType() != 0) { @@ -135,10 +135,10 @@ public class JobGroupController { } // valid title - if (StringTool.isBlank(xxlJobGroup.getTitle())) { + if (StringTool.isBlank(xxlJobGroup.getName())) { return Response.ofFail((I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) ); } - if (XssUtil.hasXss(xxlJobGroup.getTitle())) { + if (XssUtil.hasXss(xxlJobGroup.getName())) { return Response.ofFail(I18nUtil.getString("jobgroup_field_title") + I18nUtil.getString("system_invalid")); } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobInfoController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobInfoController.java index dddb79d7..f08df997 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobInfoController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobInfoController.java @@ -85,7 +85,7 @@ public class JobInfoController { @RequestParam(required = false, defaultValue = "10") int pagesize, @RequestParam int jobGroup, @RequestParam int triggerStatus, - @RequestParam String jobDesc, + @RequestParam String name, @RequestParam String executorHandler, @RequestParam String author) { @@ -93,7 +93,7 @@ public class JobInfoController { JobGroupPermissionUtil.validJobGroupPermission(request, jobGroup); // page - return xxlJobService.pageList(offset, pagesize, jobGroup, triggerStatus, jobDesc, executorHandler, author); + return xxlJobService.pageList(offset, pagesize, jobGroup, triggerStatus, name, executorHandler, author); } @RequestMapping("/insert") diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobGroupMapper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobGroupMapper.java index e7c875ad..b388b1aa 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobGroupMapper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobGroupMapper.java @@ -29,11 +29,11 @@ public interface XxlJobGroupMapper { public List pageList(@Param("offset") int offset, @Param("pagesize") int pagesize, @Param("appname") String appname, - @Param("title") String title); + @Param("name") String name); public int pageListCount(@Param("offset") int offset, @Param("pagesize") int pagesize, @Param("appname") String appname, - @Param("title") String title); + @Param("name") String name); } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobInfoMapper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobInfoMapper.java index 43e08738..5498a9b9 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobInfoMapper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/mapper/XxlJobInfoMapper.java @@ -18,14 +18,14 @@ public interface XxlJobInfoMapper { @Param("pagesize") int pagesize, @Param("jobGroup") int jobGroup, @Param("triggerStatus") int triggerStatus, - @Param("jobDesc") String jobDesc, + @Param("name") String name, @Param("executorHandler") String executorHandler, @Param("author") String author); public int pageListCount(@Param("offset") int offset, @Param("pagesize") int pagesize, @Param("jobGroup") int jobGroup, @Param("triggerStatus") int triggerStatus, - @Param("jobDesc") String jobDesc, + @Param("name") String name, @Param("executorHandler") String executorHandler, @Param("author") String author); diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobGroup.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobGroup.java index fdec671f..6d7f36f8 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobGroup.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobGroup.java @@ -14,7 +14,7 @@ public class XxlJobGroup { private int id; private String appname; - private String title; + private String name; private int addressType; // 执行器地址类型：0=自动注册、1=手动录入 private String addressList; // 执行器地址列表，多地址逗号分隔(手动录入) @@ -48,12 +48,12 @@ public class XxlJobGroup { this.appname = appname; } - public String getTitle() { - return title; + public String getName() { + return name; } - public void setTitle(String title) { - this.title = title; + public void setName(String name) { + this.name = name; } public int getAddressType() { @@ -93,7 +93,7 @@ public class XxlJobGroup { return "XxlJobGroup{" + "id=" + id + ", appname='" + appname + '\'' + - ", title='" + title + '\'' + + ", name='" + name + '\'' + ", addressType=" + addressType + ", addressList='" + addressList + '\'' + ", accessToken='" + accessToken + '\'' + diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobInfo.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobInfo.java index 5368aca4..8732cfa6 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobInfo.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobInfo.java @@ -12,7 +12,7 @@ public class XxlJobInfo { private int id; // 主键ID private int jobGroup; // 执行器主键ID - private String jobDesc; + private String name; private String author; // 负责人 private String alarmEmail; // 报警邮件 @@ -59,12 +59,12 @@ public class XxlJobInfo { this.jobGroup = jobGroup; } - public String getJobDesc() { - return jobDesc; + public String getName() { + return name; } - public void setJobDesc(String jobDesc) { - this.jobDesc = jobDesc; + public void setName(String name) { + this.name = name; } public String getAuthor() { diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/alarm/impl/EmailJobAlarm.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/alarm/impl/EmailJobAlarm.java index 5540acd2..4cb6aabd 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/alarm/impl/EmailJobAlarm.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/alarm/impl/EmailJobAlarm.java @@ -53,9 +53,9 @@ public class EmailJobAlarm implements JobAlarm { String personal = I18nUtil.getString("admin_name_full"); String title = I18nUtil.getString("jobconf_monitor"); String content = MessageFormat.format(loadEmailJobAlarmTemplate(), - group!=null?group.getTitle():"null", + group!=null?group.getName():"null", info.getId(), - info.getJobDesc(), + info.getName(), alarmContent); Set emailSet = new HashSet(Arrays.asList(info.getAlarmEmail().split(","))); diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/openapi/impl/AdminJobBizImpl.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/openapi/impl/AdminJobBizImpl.java index a177a7d7..051d43bd 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/openapi/impl/AdminJobBizImpl.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/openapi/impl/AdminJobBizImpl.java @@ -56,7 +56,7 @@ public class AdminJobBizImpl implements AdminJobBiz { // convert JobAddRequest to XxlJobInfo XxlJobInfo jobInfo = new XxlJobInfo(); jobInfo.setJobGroup(request.getJobGroup()); - jobInfo.setJobDesc(request.getJobDesc()); + jobInfo.setName(request.getName()); jobInfo.setAuthor(request.getAuthor()); jobInfo.setAlarmEmail(request.getAlarmEmail()); jobInfo.setScheduleType(request.getScheduleType()); @@ -89,7 +89,7 @@ public class AdminJobBizImpl implements AdminJobBiz { XxlJobInfo jobInfo = new XxlJobInfo(); jobInfo.setId(request.getId()); jobInfo.setJobGroup(0); - jobInfo.setJobDesc(request.getJobDesc()); + jobInfo.setName(request.getName()); jobInfo.setAuthor(request.getAuthor()); jobInfo.setAlarmEmail(request.getAlarmEmail()); jobInfo.setScheduleType(request.getScheduleType()); diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/XxlJobService.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/XxlJobService.java index 11b88f6d..0ae5ad7c 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/XxlJobService.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/XxlJobService.java @@ -18,7 +18,7 @@ public interface XxlJobService { /** * page list */ - public Response> pageList(int offset, int pagesize, int jobGroup, int triggerStatus, String jobDesc, String executorHandler, String author); + public Response> pageList(int offset, int pagesize, int jobGroup, int triggerStatus, String name, String executorHandler, String author); /** * add job diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/impl/XxlJobServiceImpl.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/impl/XxlJobServiceImpl.java index 3cc4f3b3..8c8c3519 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/impl/XxlJobServiceImpl.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/impl/XxlJobServiceImpl.java @@ -51,11 +51,11 @@ public class XxlJobServiceImpl implements XxlJobService { private XxlJobLogReportMapper xxlJobLogReportMapper; @Override - public Response> pageList(int offset, int pagesize, int jobGroup, int triggerStatus, String jobDesc, String executorHandler, String author) { + public Response> pageList(int offset, int pagesize, int jobGroup, int triggerStatus, String name, String executorHandler, String author) { // page list - List list = xxlJobInfoMapper.pageList(offset, pagesize, jobGroup, triggerStatus, jobDesc, executorHandler, author); - int list_count = xxlJobInfoMapper.pageListCount(offset, pagesize, jobGroup, triggerStatus, jobDesc, executorHandler, author); + List list = xxlJobInfoMapper.pageList(offset, pagesize, jobGroup, triggerStatus, name, executorHandler, author); + int list_count = xxlJobInfoMapper.pageListCount(offset, pagesize, jobGroup, triggerStatus, name, executorHandler, author); // package result PageModel pageModel = new PageModel<>(); @@ -69,7 +69,7 @@ public class XxlJobServiceImpl implements XxlJobService { public Response add(XxlJobInfo jobInfo, LoginInfo loginInfo) { // valid base - if (StringTool.isBlank(jobInfo.getJobDesc())) { + if (StringTool.isBlank(jobInfo.getName())) { return Response.ofFail ( (I18nUtil.getString("system_please_input")+I18nUtil.getString("jobinfo_field_jobdesc")) ); } if (StringTool.isBlank(jobInfo.getAuthor())) { @@ -182,7 +182,7 @@ public class XxlJobServiceImpl implements XxlJobService { public Response update(XxlJobInfo jobInfo, LoginInfo loginInfo) { // valid base - if (StringTool.isBlank(jobInfo.getJobDesc())) { + if (StringTool.isBlank(jobInfo.getName())) { return Response.ofFail ( (I18nUtil.getString("system_please_input")+I18nUtil.getString("jobinfo_field_jobdesc")) ); } if (StringTool.isBlank(jobInfo.getAuthor())) { @@ -296,7 +296,7 @@ public class XxlJobServiceImpl implements XxlJobService { if (jobInfo.getJobGroup() > 0) { exists_jobInfo.setJobGroup(jobInfo.getJobGroup()); } - exists_jobInfo.setJobDesc(jobInfo.getJobDesc()); + exists_jobInfo.setName(jobInfo.getName()); exists_jobInfo.setAuthor(jobInfo.getAuthor()); exists_jobInfo.setAlarmEmail(jobInfo.getAlarmEmail()); exists_jobInfo.setScheduleType(jobInfo.getScheduleType()); diff --git a/xxl-job-admin/src/main/resources/mapper/business/XxlJobGroupMapper.xml b/xxl-job-admin/src/main/resources/mapper/business/XxlJobGroupMapper.xml index 73039104..03aa20d4 100644 --- a/xxl-job-admin/src/main/resources/mapper/business/XxlJobGroupMapper.xml +++ b/xxl-job-admin/src/main/resources/mapper/business/XxlJobGroupMapper.xml @@ -6,7 +6,7 @@ - + @@ -16,7 +16,7 @@ t.id, t.app_name, - t.title, + t.name, t.address_type, t.address_list, t.access_token, @@ -26,24 +26,24 @@ - INSERT INTO xxl_job_group ( `app_name`, `title`, `address_type`, `address_list`, `access_token`, `update_time`) - values ( #{appname}, #{title}, #{addressType}, #{addressList}, #{accessToken}, #{updateTime} ); + INSERT INTO xxl_job_group ( `app_name`, `name`, `address_type`, `address_list`, `access_token`, `update_time`) + values ( #{appname}, #{name}, #{addressType}, #{addressList}, #{accessToken}, #{updateTime} ); UPDATE xxl_job_group - SET `title` = #{title}, + SET `name` = #{name}, `address_type` = #{addressType}, `address_list` = #{addressList}, `access_token` = #{accessToken}, @@ -75,11 +75,11 @@ AND t.app_name like CONCAT(CONCAT('%', #{appname}), '%') - - AND t.title like CONCAT(CONCAT('%', #{title}), '%') + + AND t.name like CONCAT(CONCAT('%', #{name}), '%') - ORDER BY t.app_name, t.title, t.id ASC + ORDER BY t.app_name, t.name, t.id ASC LIMIT #{offset}, #{pagesize} @@ -90,8 +90,8 @@ AND t.app_name like CONCAT(CONCAT('%', #{appname}), '%') - - AND t.title like CONCAT(CONCAT('%', #{title}), '%') + + AND t.name like CONCAT(CONCAT('%', #{name}), '%') diff --git a/xxl-job-admin/src/main/resources/mapper/business/XxlJobInfoMapper.xml b/xxl-job-admin/src/main/resources/mapper/business/XxlJobInfoMapper.xml index de28e5e2..78cbb8ba 100644 --- a/xxl-job-admin/src/main/resources/mapper/business/XxlJobInfoMapper.xml +++ b/xxl-job-admin/src/main/resources/mapper/business/XxlJobInfoMapper.xml @@ -7,7 +7,7 @@ - + @@ -41,7 +41,7 @@ t.id, t.job_group, - t.job_desc, + t.name, t.add_time, t.update_time, t.author, @@ -75,8 +75,8 @@ AND t.trigger_status = #{triggerStatus} - - AND t.job_desc like CONCAT(CONCAT('%', #{jobDesc}), '%') + + AND t.name like CONCAT(CONCAT('%', #{name}), '%') AND t.executor_handler like CONCAT(CONCAT('%', #{executorHandler}), '%') @@ -99,8 +99,8 @@ AND t.trigger_status = #{triggerStatus} - - AND t.job_desc like CONCAT(CONCAT('%', #{jobDesc}), '%') + + AND t.name like CONCAT(CONCAT('%', #{name}), '%') AND t.executor_handler like CONCAT(CONCAT('%', #{executorHandler}), '%') @@ -114,7 +114,7 @@ INSERT INTO xxl_job_info ( job_group, - job_desc, + name, add_time, update_time, author, @@ -138,7 +138,7 @@ trigger_next_time ) VALUES ( #{jobGroup}, - #{jobDesc}, + #{name}, #{addTime}, #{updateTime}, #{author}, @@ -177,7 +177,7 @@ UPDATE xxl_job_info SET job_group = #{jobGroup}, - job_desc = #{jobDesc}, + name = #{name}, update_time = #{updateTime}, author = #{author}, alarm_email = #{alarmEmail}, diff --git a/xxl-job-admin/src/main/resources/templates/business/group.list.ftl b/xxl-job-admin/src/main/resources/templates/business/group.list.ftl index 3edd12ed..94001c7c 100644 --- a/xxl-job-admin/src/main/resources/templates/business/group.list.ftl +++ b/xxl-job-admin/src/main/resources/templates/business/group.list.ftl @@ -31,7 +31,7 @@
${I18n.jobgroup_field_title} - +
@@ -99,7 +99,7 @@
-
+
@@ -147,7 +147,7 @@
-
+
@@ -205,7 +205,7 @@ queryParams: function (params) { var obj = {}; obj.appname = $('#appname').val(); - obj.title = $('#title').val(); + obj.name = $('#name').val(); obj.offset = params.offset; obj.pagesize = params.limit; return obj; @@ -226,7 +226,7 @@ align: 'left' },{ title: I18n.jobgroup_field_title, - field: 'title', + field: 'name', width: '25', widthUnit: '%' },{ @@ -310,7 +310,7 @@ rangelength:[4,64], appnameValid : true }, - title : { + name : { required : true, rangelength:[4, 64] }, @@ -325,7 +325,7 @@ required : I18n.system_please_input+"AppName", rangelength: I18n.system_length_limit + ' [4~64]' }, - title : { + name : { required : I18n.system_please_input + I18n.jobgroup_field_title , rangelength: I18n.system_length_limit + ' [4~12]' , }, @@ -366,7 +366,7 @@ $("#updateModal .form input[name='id']").val( row.id ); $("#updateModal .form input[name='appname']").val( row.appname ); - $("#updateModal .form input[name='title']").val( row.title ); + $("#updateModal .form input[name='name']").val( row.name ); // 注册方式 $("#updateModal .form input[name='addressType']").removeAttr('checked'); @@ -378,7 +378,7 @@ }, rules : { - title : { + name : { required : true, rangelength:[4, 64] }, @@ -389,7 +389,7 @@ } }, messages : { - title : { + name : { required : I18n.system_please_input + I18n.jobgroup_field_title , rangelength: I18n.system_length_limit + ' [4~12]' }, diff --git a/xxl-job-admin/src/main/resources/templates/business/job.code.ftl b/xxl-job-admin/src/main/resources/templates/business/job.code.ftl index 2699c1bf..7d112cb3 100644 --- a/xxl-job-admin/src/main/resources/templates/business/job.code.ftl +++ b/xxl-job-admin/src/main/resources/templates/business/job.code.ftl @@ -42,7 +42,7 @@ diff --git a/xxl-job-admin/src/main/resources/templates/business/job.list.ftl b/xxl-job-admin/src/main/resources/templates/business/job.list.ftl index fb648f44..c406776b 100644 --- a/xxl-job-admin/src/main/resources/templates/business/job.list.ftl +++ b/xxl-job-admin/src/main/resources/templates/business/job.list.ftl @@ -28,7 +28,7 @@ ${I18n.jobinfo_field_jobgroup}
@@ -44,7 +44,7 @@
- +
@@ -114,13 +114,13 @@
-
+
@@ -374,13 +374,13 @@ exit 0
-
+
@@ -592,7 +592,7 @@ exit 0 var obj = {}; obj.jobGroup = $('#jobGroup').val(); obj.triggerStatus = $('#triggerStatus').val(); - obj.jobDesc = $('#jobDesc').val(); + obj.name = $('#name').val(); obj.executorHandler = $('#executorHandler').val(); obj.author = $('#author').val(); obj.offset = params.offset; @@ -625,7 +625,7 @@ exit 0 } ,{ title: I18n.jobinfo_field_jobdesc, - field: 'jobDesc', + field: 'name', width: '25', widthUnit: '%', align: 'left', @@ -1054,7 +1054,7 @@ exit 0 $.adminTable.initAdd( { url: base_url + "/jobinfo/insert", rules : { - jobDesc : { + name : { required : true, maxlength: 50 }, @@ -1063,7 +1063,7 @@ exit 0 } }, messages : { - jobDesc : { + name : { required : I18n.system_please_input + I18n.jobinfo_field_jobdesc }, author : { @@ -1163,7 +1163,7 @@ exit 0 $.adminTable.initUpdate( { url: base_url + "/jobinfo/update", rules : { - jobDesc : { + name : { required : true, maxlength: 50 }, @@ -1172,7 +1172,7 @@ exit 0 } }, messages : { - jobDesc : { + name : { required : I18n.system_please_input + I18n.jobinfo_field_jobdesc }, author : { @@ -1184,7 +1184,7 @@ exit 0 // fill base $("#updateModal .form input[name='id']").val( row.id ); $('#updateModal .form select[name=jobGroup] option[value='+ row.jobGroup +']').prop('selected', true); - $("#updateModal .form input[name='jobDesc']").val( row.jobDesc ); + $("#updateModal .form input[name='name']").val( row.name ); $("#updateModal .form input[name='author']").val( row.author ); $("#updateModal .form input[name='alarmEmail']").val( row.alarmEmail ); @@ -1275,7 +1275,7 @@ exit 0 // fill base $('#addModal .form select[name=jobGroup] option[value='+ row.jobGroup +']').prop('selected', true); - $("#addModal .form input[name='jobDesc']").val( row.jobDesc ); + $("#addModal .form input[name='name']").val( row.name ); $("#addModal .form input[name='author']").val( row.author ); $("#addModal .form input[name='alarmEmail']").val( row.alarmEmail ); diff --git a/xxl-job-admin/src/main/resources/templates/business/log.detail.ftl b/xxl-job-admin/src/main/resources/templates/business/log.detail.ftl index 4ec92ee3..45a856f9 100644 --- a/xxl-job-admin/src/main/resources/templates/business/log.detail.ftl +++ b/xxl-job-admin/src/main/resources/templates/business/log.detail.ftl @@ -28,7 +28,7 @@ diff --git a/xxl-job-admin/src/main/resources/templates/business/log.list.ftl b/xxl-job-admin/src/main/resources/templates/business/log.list.ftl index 433034e3..6be08d14 100644 --- a/xxl-job-admin/src/main/resources/templates/business/log.list.ftl +++ b/xxl-job-admin/src/main/resources/templates/business/log.list.ftl @@ -30,7 +30,7 @@ ${I18n.jobinfo_field_jobgroup}
@@ -42,7 +42,7 @@ <#if jobInfoList?size gt 0> <#list jobInfoList as jobItem> - + @@ -284,9 +284,9 @@ formatter: function(value, row, index) { // build let jobShow = '【'+ row.jobId +'】'; - let jobDesc = $("#jobId").find("option[value='"+ row.jobId +"']").text(); - if (jobDesc) { - jobShow += jobDesc; + let name = $("#jobId").find("option[value='"+ row.jobId +"']").text(); + if (name) { + jobShow += name; } if (jobShow.length > 10) { jobShow = jobShow.substr(0, 10) + '...'; diff --git a/xxl-job-admin/src/main/resources/templates/business/user.list.ftl b/xxl-job-admin/src/main/resources/templates/business/user.list.ftl index dde819ce..4d92bbba 100644 --- a/xxl-job-admin/src/main/resources/templates/business/user.list.ftl +++ b/xxl-job-admin/src/main/resources/templates/business/user.list.ftl @@ -99,7 +99,7 @@
<#if groupList?exists && groupList?size gt 0> <#list groupList as item> -   ${item.title}：${item.appname} +   ${item.name}：${item.appname}
@@ -150,7 +150,7 @@
<#if groupList?exists && groupList?size gt 0> <#list groupList as item> - ${item.title}(${item.appname})
+ ${item.name}(${item.appname})
diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobGroupMapperTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobGroupMapperTest.java index e5cc6ba1..29137100 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobGroupMapperTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobGroupMapperTest.java @@ -22,7 +22,7 @@ public class XxlJobGroupMapperTest { XxlJobGroup group = new XxlJobGroup(); group.setAppname("setAppName"); - group.setTitle("setTitle"); + group.setName("setTitle"); group.setAddressType(0); group.setAddressList("setAddressList"); group.setUpdateTime(new Date()); @@ -31,7 +31,7 @@ public class XxlJobGroupMapperTest { XxlJobGroup group2 = xxlJobGroupMapper.load(group.getId()); group2.setAppname("setAppName2"); - group2.setTitle("setTitle2"); + group2.setName("setTitle2"); group2.setAddressType(2); group2.setAddressList("setAddressList2"); group2.setUpdateTime(new Date()); diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobInfoMapperTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobInfoMapperTest.java index 6b0b71b0..08ceba49 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobInfoMapperTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/business/mapper/XxlJobInfoMapperTest.java @@ -38,7 +38,7 @@ public class XxlJobInfoMapperTest { public void save_load(){ XxlJobInfo info = new XxlJobInfo(); info.setJobGroup(1); - info.setJobDesc("desc"); + info.setName("desc"); info.setAuthor("setAuthor"); info.setAlarmEmail("setAlarmEmail"); info.setScheduleType(ScheduleTypeEnum.FIX_RATE.name()); @@ -63,7 +63,7 @@ public class XxlJobInfoMapperTest { info.setScheduleType(ScheduleTypeEnum.FIX_RATE.name()); info.setScheduleConf(String.valueOf(44)); info.setMisfireStrategy(MisfireStrategyEnum.FIRE_ONCE_NOW.name()); - info2.setJobDesc("desc2"); + info2.setName("desc2"); info2.setAuthor("setAuthor2"); info2.setAlarmEmail("setAlarmEmail2"); info2.setExecutorRouteStrategy("setExecutorRouteStrategy2"); diff --git a/xxl-job-admin/src/test/java/com/xxl/job/openapi/AdminJobBizTest.java b/xxl-job-admin/src/test/java/com/xxl/job/openapi/AdminJobBizTest.java index c5bbb52c..0be0be9c 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/openapi/AdminJobBizTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/openapi/AdminJobBizTest.java @@ -46,7 +46,7 @@ public class AdminJobBizTest { JobAddRequest request = new JobAddRequest(); request.setJobGroup(1); - request.setJobDesc("openapi test job"); + request.setName("openapi test job"); request.setAuthor("openapi"); request.setScheduleType("CRON"); request.setScheduleConf("0/20 * * * * ?"); @@ -72,7 +72,7 @@ public class AdminJobBizTest { // update the job created by jobAdd (id should exist in test env) JobUpdateRequest request = new JobUpdateRequest(); request.setId(jobId); - request.setJobDesc("openapi test job update"); + request.setName("openapi test job update"); request.setAuthor("openapi"); request.setScheduleType("CRON"); request.setScheduleConf("0/10 * * * * ?"); diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/dto/JobAddRequest.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/dto/JobAddRequest.java index d73ef18e..b70861f4 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/dto/JobAddRequest.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/dto/JobAddRequest.java @@ -9,7 +9,7 @@ public class JobAddRequest implements Serializable { private static final long serialVersionUID = 42L; private int jobGroup; - private String jobDesc; + private String name; private String author; private String alarmEmail; @@ -40,12 +40,12 @@ public class JobAddRequest implements Serializable { this.jobGroup = jobGroup; } - public String getJobDesc() { - return jobDesc; + public String getName() { + return name; } - public void setJobDesc(String jobDesc) { - this.jobDesc = jobDesc; + public void setName(String name) { + this.name = name; } public String getAuthor() { diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/dto/JobUpdateRequest.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/dto/JobUpdateRequest.java index 0174de6a..e5d88c73 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/dto/JobUpdateRequest.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/dto/JobUpdateRequest.java @@ -9,7 +9,7 @@ public class JobUpdateRequest implements Serializable { private static final long serialVersionUID = 42L; private int id; - private String jobDesc; + private String name; private String author; private String alarmEmail; @@ -40,12 +40,12 @@ public class JobUpdateRequest implements Serializable { this.id = id; } - public String getJobDesc() { - return jobDesc; + public String getName() { + return name; } - public void setJobDesc(String jobDesc) { - this.jobDesc = jobDesc; + public void setName(String name) { + this.name = name; } public String getAuthor() {