From e5c0e05f14c43575d6bf5be787a2b90e713ec280 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Sat, 20 Jun 2026 04:52:56 +0800 Subject: [PATCH] =?UTF-8?q?docs(database):=20=E6=9B=B4=E6=96=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=8D=87=E7=BA=A7=E8=84=9A=E6=9C=AC=E5=92=8C?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=AA=8C=E8=AF=81=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/XXL-JOB官方文档.md | 17 +++++++++++++++++ .../main/resources/i18n/message_en.properties | 2 +- .../resources/i18n/message_zh_CN.properties | 2 +- .../resources/i18n/message_zh_TC.properties | 2 +- .../resources/templates/business/group.list.ftl | 4 ++-- .../java/com/xxl/job/openapi/AdminBizTest.java | 4 ++-- .../com/xxl/job/openapi/ExecutorBizTest.java | 4 ++-- 7 files changed, 26 insertions(+), 9 deletions(-) diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index eb623340..54e708a6 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -2911,6 +2911,23 @@ alter table xxl_job_log - 6、【TODO】任务告警：拆分“告警类型、告警配置”属性，支持Webhook、邮箱多种方式； - 7、【TODO】任务说明：拆分“任务名称、任务备注”属性，前者用于任务检索，后者用于补充任务描述。 +**备注：** +数据库升级脚本： +``` +-- 1. 添加 access_token 列 +ALTER TABLE `xxl_job_group` +ADD COLUMN `access_token` varchar(255) DEFAULT NULL COMMENT '执行器AccessToken' AFTER `address_list`; + +-- 2. 创建 app_name 的唯一索引 +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>'; +``` + ### TODO LIST - 1、调度隔离：调度中心针对不同执行器，各自维护不同的调度和远程触发组件。 diff --git a/xxl-job-admin/src/main/resources/i18n/message_en.properties b/xxl-job-admin/src/main/resources/i18n/message_en.properties index 426490b2..1c4e9c62 100644 --- a/xxl-job-admin/src/main/resources/i18n/message_en.properties +++ b/xxl-job-admin/src/main/resources/i18n/message_en.properties @@ -211,7 +211,7 @@ jobgroup_field_registryList=machine address jobgroup_field_registryList_invalid=registry machine address is illegal jobgroup_field_registryList_placeholder=Please enter the machine address, if there are more than one comma separated jobgroup_field_appname_limit=Limit the beginning of a lowercase letter, consists of lowercase letters、number and hyphen. -jobgroup_field_accesstoken_limit=Limit the beginning of a lowercase letter, consists of lowercase letters and number. +jobgroup_field_accesstoken_limit=Limit the beginning of a lowercase letter, consists of lowercase letters、number and underline. jobgroup_field_order_digits=Please enter a positive integer jobgroup_field_orderrange=Order is limited to 1~1000 jobgroup_del_limit_0=Refuse to delete, the executor is being used diff --git a/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties b/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties index 5f89c7ff..29b3ec6f 100644 --- a/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties +++ b/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties @@ -211,7 +211,7 @@ jobgroup_field_registryList=机器地址 jobgroup_field_registryList_invalid=机器地址格式非法 jobgroup_field_registryList_placeholder=请输入执行器地址列表，多地址逗号分隔 jobgroup_field_appname_limit=限制以小写字母开头，由小写字母、数字和中划线组成 -jobgroup_field_accesstoken_limit=限制以小写字母开头，由小写字母、数字组成 +jobgroup_field_accesstoken_limit=限制以小写字母开头，由小写字母、数字和下划线组成 jobgroup_field_order_digits=请输入整数 jobgroup_field_orderrange=取值范围为1~1000 jobgroup_del_limit_0=拒绝删除，该执行器使用中 diff --git a/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties b/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties index d73e459f..f9f7dd8a 100755 --- a/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties +++ b/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties @@ -211,7 +211,7 @@ jobgroup_field_registryList=機器地址 jobgroup_field_registryList_invalid=機器地址格式非法 jobgroup_field_registryList_placeholder=請輸入執行器地址列表，多個地址請以逗號分隔 jobgroup_field_appname_limit=限制以小寫字母開頭，由小寫字母、數字和中划線組成 -jobgroup_field_accesstoken_limit=限制以小寫字母開頭，由小寫字母、數字組成 +jobgroup_field_accesstoken_limit=限制以小寫字母開頭，由小寫字母、數字和下划線組成 jobgroup_field_order_digits=請輸入整數 jobgroup_field_orderrange=取值範圍為1~1000 jobgroup_del_limit_0=拒絕刪除，該執行器使用中 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 adbd1539..3edd12ed 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 @@ -294,12 +294,12 @@ // add validator method jQuery.validator.addMethod("appnameValid", function(value, element) { var length = value.length; - var valid = /^[a-z][a-zA-Z0-9-]*$/; + var valid = /^[a-z][a-z0-9-]*$/; return this.optional(element) || valid.test(value); }, I18n.jobgroup_field_appname_limit ); // add validator method jQuery.validator.addMethod("accessTokenValid", function(value, element) { - var valid = /^[a-z][a-z0-9]*$/; + var valid = /^[a-z][a-z0-9_]*$/; return this.optional(element) || valid.test(value); }, I18n.jobgroup_field_accesstoken_limit ); $.adminTable.initAdd( { diff --git a/xxl-job-admin/src/test/java/com/xxl/job/openapi/AdminBizTest.java b/xxl-job-admin/src/test/java/com/xxl/job/openapi/AdminBizTest.java index 5ad9d3a4..a92f4f06 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/openapi/AdminBizTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/openapi/AdminBizTest.java @@ -63,7 +63,7 @@ public class AdminBizTest { public void registry() throws Exception { AdminBiz adminBiz = buildClient(); - RegistryRequest registryParam = new RegistryRequest(RegistTypeEnum.EXECUTOR.name(), "xxl-job-executor-example", "127.0.0.1:9999"); + RegistryRequest registryParam = new RegistryRequest(RegistTypeEnum.EXECUTOR.name(), "xxl-job-executor-sample", "127.0.0.1:9999"); Response returnT = adminBiz.registry(registryParam); assertTrue(returnT.isSuccess()); @@ -78,7 +78,7 @@ public class AdminBizTest { public void registryRemove() throws Exception { AdminBiz adminBiz = buildClient(); - RegistryRequest registryParam = new RegistryRequest(RegistTypeEnum.EXECUTOR.name(), "xxl-job-executor-example", "127.0.0.1:9999"); + RegistryRequest registryParam = new RegistryRequest(RegistTypeEnum.EXECUTOR.name(), "xxl-job-executor-sample", "127.0.0.1:9999"); Response returnT = adminBiz.registryRemove(registryParam); assertTrue(returnT.isSuccess()); diff --git a/xxl-job-admin/src/test/java/com/xxl/job/openapi/ExecutorBizTest.java b/xxl-job-admin/src/test/java/com/xxl/job/openapi/ExecutorBizTest.java index bf3926e5..82fe8217 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/openapi/ExecutorBizTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/openapi/ExecutorBizTest.java @@ -106,8 +106,8 @@ public class ExecutorBizTest { public void log(){ ExecutorBiz executorBiz = buildClient(); - final long logId = 0; - final long logDateTim = 0L; + final long logId = 2; + final long logDateTim = System.currentTimeMillis(); final int fromLineNum = 0; // Act