docs(database): 更新数据库升级脚本和字段验证规则

master
xuxueli 3 months ago
parent 954e467e84
commit e5c0e05f14

@ -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、调度隔离调度中心针对不同执行器各自维护不同的调度和远程触发组件。

@ -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

@ -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=拒绝删除,该执行器使用中

@ -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=拒絕刪除,該執行器使用中

@ -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( {

@ -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<String> 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<String> returnT = adminBiz.registryRemove(registryParam);
assertTrue(returnT.isSuccess());

@ -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

Loading…
Cancel
Save