diff --git a/docs/apidoc/bk-api-gateway/v3/zh/get_public_script_version_detail.md b/docs/apidoc/bk-api-gateway/v3/zh/get_public_script_version_detail.md index 28fe76a354..80eba2e5ab 100644 --- a/docs/apidoc/bk-api-gateway/v3/zh/get_public_script_version_detail.md +++ b/docs/apidoc/bk-api-gateway/v3/zh/get_public_script_version_detail.md @@ -42,11 +42,14 @@ "version": "V1.0", "content": "#!/bin/bash***", "status": 1, - "version_desc": "版本描述" + "version_desc": "版本描述", "creator": "admin", "create_time": 1600746078520, "last_modify_user": "admin", - "last_modify_time": 1600746078520 + "last_modify_time": 1600746078520, + "script_language": 1, + "public_script": true, + "description": "脚本描述" } } ``` @@ -75,3 +78,6 @@ | create_time | long | 创建时间Unix时间戳(ms) | | last_modify_user | string | 最近一次修改人 | | last_modify_time | long | 最近一次修改时间Unix时间戳(ms) | +| script_language | int | 脚本语言:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell | +| public_script | bool | 是否公共脚本 | +| description | string | 脚本描述 | diff --git a/docs/apidoc/bk-api-gateway/v3/zh/get_public_script_version_list.md b/docs/apidoc/bk-api-gateway/v3/zh/get_public_script_version_list.md index 489fba3cb4..5175916c24 100644 --- a/docs/apidoc/bk-api-gateway/v3/zh/get_public_script_version_list.md +++ b/docs/apidoc/bk-api-gateway/v3/zh/get_public_script_version_list.md @@ -49,7 +49,10 @@ "creator": "admin", "create_time": 1600746078520, "last_modify_user": "admin", - "last_modify_time": 1600746078520 + "last_modify_time": 1600746078520, + "script_language": 1, + "public_script": true, + "description": "脚本描述" } ], "start": 0, @@ -83,3 +86,6 @@ | create_time | long | 创建时间Unix时间戳(ms) | | last_modify_user | string | 最近一次修改人 | | last_modify_time | long | 最近一次修改时间Unix时间戳(ms) | +| script_language | int | 脚本语言:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell | +| public_script | bool | 是否公共脚本 | +| description | string | 脚本描述 | diff --git a/docs/apidoc/bk-api-gateway/v3/zh/get_script_version_detail.md b/docs/apidoc/bk-api-gateway/v3/zh/get_script_version_detail.md index f936675499..7b850c8b81 100644 --- a/docs/apidoc/bk-api-gateway/v3/zh/get_script_version_detail.md +++ b/docs/apidoc/bk-api-gateway/v3/zh/get_script_version_detail.md @@ -47,11 +47,14 @@ "version": "V1.0", "content": "#!/bin/bash***", "status": 1, - "version_desc": "版本描述" + "version_desc": "版本描述", "creator": "admin", "create_time": 1600746078520, "last_modify_user": "admin", - "last_modify_time": 1600746078520 + "last_modify_time": 1600746078520, + "script_language": 1, + "public_script": false, + "description": "脚本描述" } } ``` @@ -82,3 +85,6 @@ | create_time | long | 创建时间Unix时间戳(ms) | | last_modify_user | string | 最近一次修改人 | | last_modify_time | long | 最近一次修改时间Unix时间戳(ms) | +| script_language | int | 脚本语言:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell | +| public_script | bool | 是否公共脚本 | +| description | string | 脚本描述 | diff --git a/docs/apidoc/bk-api-gateway/v3/zh/get_script_version_list.md b/docs/apidoc/bk-api-gateway/v3/zh/get_script_version_list.md index 95d4d0c42e..2fb742357a 100644 --- a/docs/apidoc/bk-api-gateway/v3/zh/get_script_version_list.md +++ b/docs/apidoc/bk-api-gateway/v3/zh/get_script_version_list.md @@ -54,7 +54,10 @@ "creator": "admin", "create_time": 1600746078520, "last_modify_user": "admin", - "last_modify_time": 1600746078520 + "last_modify_time": 1600746078520, + "script_language": 1, + "public_script": false, + "description": "脚本描述" } ], "start": 0, @@ -90,3 +93,6 @@ | create_time | long | 创建时间Unix时间戳(ms) | | last_modify_user | string | 最近一次修改人 | | last_modify_time | long | 最近一次修改时间Unix时间戳(ms) | +| script_language | int | 脚本语言:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell | +| public_script | bool | 是否公共脚本 | +| description | string | 脚本描述 | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/en/create_public_script.md b/docs/apidoc/esb/jobv3-confapis/apidocs/en/create_public_script.md index 49d90b522f..d9e455804b 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/en/create_public_script.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/en/create_public_script.md @@ -40,7 +40,7 @@ Create public script "code": 0, "result": true, "data": { - "script_version_id": 1000018, + "id": 1000018, "script_id": "4537fb49ec0840a1b91cef4179c99f9c", "name": "public script test", "script_language": 1, @@ -73,7 +73,7 @@ Create public script | Fields | Type | Description | | ----------------- | ------ | ------------------------------------------------------------ | -| script_version_id | long | Script version id | +| id | long | Script version id | | script_id | string | Script id | | name | string | Script name | | script_language | int | Script language:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell, 6 - sql | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/en/create_public_script_version.md b/docs/apidoc/esb/jobv3-confapis/apidocs/en/create_public_script_version.md index 0092543d19..d3ae1a6c0e 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/en/create_public_script_version.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/en/create_public_script_version.md @@ -37,7 +37,7 @@ Create Public Script Version "code": 0, "result": true, "data": { - "script_version_id": 1000020, + "id": 1000020, "script_id": "4537fb49ec0840a1b91cef4179c99f9c", "name": "public script test", "script_language": 1, @@ -71,7 +71,7 @@ Create Public Script Version | Fields | Type | Description | | ----------------- | ------ | ------------------------------------------------------------ | -| script_version_id | long | Script version id | +| id | long | Script version id | | script_id | string | Script id | | name | string | Script name | | script_language | int | Script language:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell, 6 - sql | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/en/create_script.md b/docs/apidoc/esb/jobv3-confapis/apidocs/en/create_script.md index 4039eed751..dc7e9d6d49 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/en/create_script.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/en/create_script.md @@ -44,7 +44,7 @@ Create Script "code": 0, "result": true, "data": { - "script_version_id": 1000019, + "id": 1000019, "script_id": "4a350b0e0707450e93326f6ace921072", "name": "script test", "script_language": 1, @@ -79,7 +79,7 @@ Create Script | Fields | Type | Description | | ----------------- | ------ | ------------------------------------------------------------ | -| script_version_id | long | Script version id | +| id | long | Script version id | | script_id | string | Script id | | name | string | Script name | | script_language | int | Script language:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell, 6 - sql | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/en/create_script_version.md b/docs/apidoc/esb/jobv3-confapis/apidocs/en/create_script_version.md index b113f3ab62..eb79e04f96 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/en/create_script_version.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/en/create_script_version.md @@ -41,7 +41,7 @@ Create Script Version "code": 0, "result": true, "data": { - "script_version_id": 1000021, + "id": 1000021, "script_id": "4a350b0e0707450e93326f6ace921072", "name": "script test", "script_language": 1, @@ -77,7 +77,7 @@ Create Script Version | Fields | Type | Description | | ----------------- | ------ | ------------------------------------------------------------ | -| script_version_id | long | Script version id | +| id | long | Script version id | | script_id | string | Script id | | name | string | Script name | | script_language | int | Script language:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell, 6 - sql | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/en/disable_public_script_version.md b/docs/apidoc/esb/jobv3-confapis/apidocs/en/disable_public_script_version.md index 8c5511fa32..3e8e594929 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/en/disable_public_script_version.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/en/disable_public_script_version.md @@ -33,8 +33,8 @@ Disable the public script version. Once disabled successfully, it cannot be rest "code": 0, "result": true, "data": { - "script_version_id": 1000018, - "id": "4537fb49ec0840a1b91cef4179c99f9c", + "id": 1000018, + "script_id": "4537fb49ec0840a1b91cef4179c99f9c", "status": 3 } } @@ -56,6 +56,6 @@ Disable the public script version. Once disabled successfully, it cannot be rest | Fields | Type | Description | | ----------------- | ------ | ------------------------------------------------------------ | -| id | string | Script id | -| script_version_id | long | Script version id | +| script_id | string | Script id | +| id | long | Script version id | | status | int | Script version status (0: Not online, 1: Online, 2: Offline, 3: Disabled) | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/en/disable_script_version.md b/docs/apidoc/esb/jobv3-confapis/apidocs/en/disable_script_version.md index f66b76fc4e..32b620f446 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/en/disable_script_version.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/en/disable_script_version.md @@ -37,8 +37,8 @@ Disable script version, once successfully disabled, cannot be restored! And any "code": 0, "result": true, "data": { - "script_version_id": 1000019, - "id": "4a350b0e0707450e93326f6ace921072", + "id": 1000019, + "script_id": "4a350b0e0707450e93326f6ace921072", "status": 3 } } @@ -60,6 +60,6 @@ Disable script version, once successfully disabled, cannot be restored! And any | Fields | Type | Description | | ----------------- | ------ | ------------------------------------------------------------ | -| id | string | Script id | -| script_version_id | long | Script version id | +| script_id | string | Script id | +| id | long | Script version id | | status | int | Script version status (0: Not online, 1: Online, 2: Offline, 3: Disabled) | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/en/get_public_script_version_detail.md b/docs/apidoc/esb/jobv3-confapis/apidocs/en/get_public_script_version_detail.md index 20d14aa7cf..d7024de3f5 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/en/get_public_script_version_detail.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/en/get_public_script_version_detail.md @@ -42,7 +42,10 @@ Query public script version details "creator": "admin", "create_time": 1600746078520, "last_modify_user": "admin", - "last_modify_time": 1600746078520 + "last_modify_time": 1600746078520, + "script_language": 1, + "public_script": true, + "description": "script description" } } ``` @@ -73,3 +76,6 @@ Query public script version details | create_time | long | Creation time Unix timestamp (ms)| | last_modify_user | string | Last modify user| | last_modify_time | long | Last modified time Unix timestamp (ms)| +| script_language | int | Script language:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell, 6 - sql | +| public_script | bool | Public script or not | +| description | string | Description | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/en/get_public_script_version_list.md b/docs/apidoc/esb/jobv3-confapis/apidocs/en/get_public_script_version_list.md index 26b5691bc2..316bd433da 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/en/get_public_script_version_list.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/en/get_public_script_version_list.md @@ -48,7 +48,10 @@ Query public script version list "creator": "admin", "create_time": 1600746078520, "last_modify_user": "admin", - "last_modify_time": 1600746078520 + "last_modify_time": 1600746078520, + "script_language": 1, + "public_script": true, + "description": "script description" } ], "start": 0, @@ -84,3 +87,6 @@ Query public script version list | create_time | long | Creation time Unix timestamp (ms)| | last_modify_user | string | Last modify user| | last_modify_time | long | Last modified time Unix timestamp (ms)| +| script_language | int | Script language:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell, 6 - sql | +| public_script | bool | Public script or not | +| description | string | Description | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/en/get_script_version_detail.md b/docs/apidoc/esb/jobv3-confapis/apidocs/en/get_script_version_detail.md index 754c4c8efb..63d16a97b0 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/en/get_script_version_detail.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/en/get_script_version_detail.md @@ -48,7 +48,10 @@ Query business script version details "creator": "admin", "create_time": 1600746078520, "last_modify_user": "admin", - "last_modify_time": 1600746078520 + "last_modify_time": 1600746078520, + "script_language": 1, + "public_script": false, + "description": "script description" } } ``` @@ -81,3 +84,6 @@ Query business script version details | create_time | long | Creation time Unix timestamp (ms)| | last_modify_user | string | Last modify user| | last_modify_time | long | Last modified time Unix timestamp (ms)| +| script_language | int | Script language:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell, 6 - sql | +| public_script | bool | Public script or not | +| description | string | Description | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/en/get_script_version_list.md b/docs/apidoc/esb/jobv3-confapis/apidocs/en/get_script_version_list.md index 06683d3415..74c6d46bd9 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/en/get_script_version_list.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/en/get_script_version_list.md @@ -54,7 +54,10 @@ Query business script version list "creator": "admin", "create_time": 1600746078520, "last_modify_user": "admin", - "last_modify_time": 1600746078520 + "last_modify_time": 1600746078520, + "script_language": 1, + "public_script": false, + "description": "script description" } ], "start": 0, @@ -92,3 +95,6 @@ Query business script version list | create_time | long | Creation time Unix timestamp (ms)| | last_modify_user | string | Last modify user| | last_modify_time | long | Last modified time Unix timestamp (ms)| +| script_language | int | Script language:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell, 6 - sql | +| public_script | bool | Public script or not | +| description | string | Description | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/en/publish_public_script_version.md b/docs/apidoc/esb/jobv3-confapis/apidocs/en/publish_public_script_version.md index 81f2caf0df..a8143b5472 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/en/publish_public_script_version.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/en/publish_public_script_version.md @@ -33,8 +33,8 @@ After the public script version is launched, the previous online script will be "code": 0, "result": true, "data": { - "script_version_id": 1000018, - "id": "4537fb49ec0840a1b91cef4179c99f9c", + "id": 1000018, + "script_id": "4537fb49ec0840a1b91cef4179c99f9c", "status": 2 } } @@ -56,6 +56,6 @@ After the public script version is launched, the previous online script will be | Fields | Type | Description | | ----------------- | ------ | ------------------------------------------------------------ | -| id | string | Script id | -| script_version_id | long | Script version id | +| script_id | string | Script id | +| id | long | Script version id | | status | int | Script version status (0: Not online, 1: Online, 2: Offline, 3: Disabled) | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/en/publish_script_version.md b/docs/apidoc/esb/jobv3-confapis/apidocs/en/publish_script_version.md index a0fa176a95..1777dbd2f9 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/en/publish_script_version.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/en/publish_script_version.md @@ -37,8 +37,8 @@ After the online script version is launched, the previous online script will be "code": 0, "result": true, "data": { - "script_version_id": 1000019, - "id": "4a350b0e0707450e93326f6ace921072", + "id": 1000019, + "script_id": "4a350b0e0707450e93326f6ace921072", "status": 1 } } @@ -60,6 +60,6 @@ After the online script version is launched, the previous online script will be | Fields | Type | Description | | ----------------- | ------ | ------------------------------------------------------------ | -| id | string | Script id | -| script_version_id | long | Script version id | +| script_id | string | Script id | +| id | long | Script version id | | status | int | Script version status (0: Not online, 1: Online, 2: Offline, 3: Disabled) | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/en/update_public_script_version.md b/docs/apidoc/esb/jobv3-confapis/apidocs/en/update_public_script_version.md index 7b0150e3dc..a9f3187150 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/en/update_public_script_version.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/en/update_public_script_version.md @@ -37,7 +37,7 @@ Update public script version "code": 0, "result": true, "data": { - "script_version_id": 1000020, + "id": 1000020, "script_id": "4537fb49ec0840a1b91cef4179c99f9c", "name": "public script test", "script_language": 1, @@ -71,7 +71,7 @@ Update public script version | Fields | Type | Description | | ----------------- | ------ | ------------------------------------------------------------ | -| script_version_id | long | Script version id | +| id | long | Script version id | | script_id | string | Script id | | name | string | Script name | | script_language | int | Script language:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell, 6 - sql | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/en/update_script_version.md b/docs/apidoc/esb/jobv3-confapis/apidocs/en/update_script_version.md index 5b82256e0c..2b92930d1c 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/en/update_script_version.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/en/update_script_version.md @@ -41,7 +41,7 @@ Update Script Version Information "code": 0, "result": true, "data": { - "script_version_id": 1000019, + "id": 1000019, "script_id": "4a350b0e0707450e93326f6ace921072", "name": "script test", "script_language": 1, @@ -77,7 +77,7 @@ Update Script Version Information | Fields | Type | Description | | ----------------- | ------ | ------------------------------------------------------------ | -| script_version_id | long | Script version id | +| id | long | Script version id | | script_id | string | Script id | | name | string | Script name | | script_language | int | Script language:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell, 6 - sql | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/create_public_script.md b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/create_public_script.md index d79dd57334..5c0b693e49 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/create_public_script.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/create_public_script.md @@ -40,7 +40,7 @@ "code": 0, "result": true, "data": { - "script_version_id": 1000018, + "id": 1000018, "script_id": "4537fb49ec0840a1b91cef4179c99f9c", "name": "public script test", "script_language": 1, @@ -73,7 +73,7 @@ | 字段 | 类型 | 描述 | | ----------------- | ------ | ------------------------------------------------------------ | -| script_version_id | long | 公共脚本版本ID | +| id | long | 公共脚本版本ID | | script_id | string | 公共脚本ID | | name | string | 公共脚本名称 | | script_language | int | 脚本语言:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell, 6 - sql | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/create_public_script_version.md b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/create_public_script_version.md index 5513ee391a..06d988bc9b 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/create_public_script_version.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/create_public_script_version.md @@ -37,7 +37,7 @@ "code": 0, "result": true, "data": { - "script_version_id": 1000020, + "id": 1000020, "script_id": "4537fb49ec0840a1b91cef4179c99f9c", "name": "public script test", "script_language": 1, @@ -71,7 +71,7 @@ | 字段 | 类型 | 描述 | | ----------------- | ------ | ------------------------------------------------------------ | -| script_version_id | long | 公共脚本版本ID | +| id | long | 公共脚本版本ID | | script_id | string | 公共脚本ID | | name | string | 公共脚本名称 | | script_language | int | 脚本语言:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell, 6 - sql | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/create_script.md b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/create_script.md index 6020e643a3..1bd37861be 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/create_script.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/create_script.md @@ -44,7 +44,7 @@ "code": 0, "result": true, "data": { - "script_version_id": 1000019, + "id": 1000019, "script_id": "4a350b0e0707450e93326f6ace921072", "name": "script test", "script_language": 1, @@ -79,7 +79,7 @@ | 字段 | 类型 | 描述 | | ----------------- | ------ | ------------------------------------------------------------ | -| script_version_id | long | 脚本版本ID | +| id | long | 脚本版本ID | | script_id | string | 脚本ID | | name | string | 脚本名称 | | script_language | int | 脚本语言:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/create_script_version.md b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/create_script_version.md index 368e0bd8ab..2f221f36cf 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/create_script_version.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/create_script_version.md @@ -41,7 +41,7 @@ "code": 0, "result": true, "data": { - "script_version_id": 1000021, + "id": 1000021, "script_id": "4a350b0e0707450e93326f6ace921072", "name": "script test", "script_language": 1, @@ -77,7 +77,7 @@ | 字段 | 类型 | 描述 | | ----------------- | ------ | ------------------------------------------------------------ | -| script_version_id | long | 脚本版本ID | +| id | long | 脚本版本ID | | script_id | string | 脚本ID | | name | string | 脚本名称 | | script_language | int | 脚本语言:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell, 6 - sql | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/disable_public_script_version.md b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/disable_public_script_version.md index 8313d717d6..9015340d83 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/disable_public_script_version.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/disable_public_script_version.md @@ -33,8 +33,8 @@ "code": 0, "result": true, "data": { - "script_version_id": 1000018, - "id": "4537fb49ec0840a1b91cef4179c99f9c", + "id": 1000018, + "script_id": "4537fb49ec0840a1b91cef4179c99f9c", "status": 3 } } @@ -56,6 +56,6 @@ | 字段 | 类型 | 描述 | | ----------------- | ------ | ------------------------------------------------------------ | -| id | string | 脚本ID | -| script_version_id | long | 脚本版本ID | +| script_id | string | 脚本ID | +| id | long | 脚本版本ID | | status | int | 脚本版本当前状态(0:未上线,1:已上线,2:已下线,3:已禁用) | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/disable_script_version.md b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/disable_script_version.md index 0f05ea4287..ab649bfe29 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/disable_script_version.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/disable_script_version.md @@ -37,8 +37,8 @@ "code": 0, "result": true, "data": { - "script_version_id": 1000019, - "id": "4a350b0e0707450e93326f6ace921072", + "id": 1000019, + "script_id": "4a350b0e0707450e93326f6ace921072", "status": 3 } } @@ -60,6 +60,6 @@ | 字段 | 类型 | 描述 | | ----------------- | ------ | ------------------------------------------------------------ | -| id | string | 脚本ID | -| script_version_id | long | 脚本版本ID | +| script_id | string | 脚本版本ID | +| id | long | 脚本版本ID | | status | int | 脚本版本当前状态(0:未上线,1:已上线,2:已下线,3:已禁用) | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/get_public_script_version_detail.md b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/get_public_script_version_detail.md index 3d7ff55431..03b3581bfe 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/get_public_script_version_detail.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/get_public_script_version_detail.md @@ -42,7 +42,10 @@ "creator": "admin", "create_time": 1600746078520, "last_modify_user": "admin", - "last_modify_time": 1600746078520 + "last_modify_time": 1600746078520, + "script_language": 1, + "public_script": true, + "description": "脚本描述" } } ``` @@ -73,3 +76,6 @@ | create_time | long | 创建时间Unix时间戳(ms) | | last_modify_user | string | 最近一次修改人 | | last_modify_time | long | 最近一次修改时间Unix时间戳(ms) | +| script_language | int | 脚本语言:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell | +| public_script | bool | 是否公共脚本 | +| description | string | 脚本描述 | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/get_public_script_version_list.md b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/get_public_script_version_list.md index d94e992c02..aa9bdcc765 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/get_public_script_version_list.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/get_public_script_version_list.md @@ -48,7 +48,10 @@ "creator": "admin", "create_time": 1600746078520, "last_modify_user": "admin", - "last_modify_time": 1600746078520 + "last_modify_time": 1600746078520, + "script_language": 1, + "public_script": true, + "description": "脚本描述" } ], "start": 0, @@ -84,3 +87,6 @@ | create_time | long | 创建时间Unix时间戳(ms) | | last_modify_user | string | 最近一次修改人 | | last_modify_time | long | 最近一次修改时间Unix时间戳(ms) | +| script_language | int | 脚本语言:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell | +| public_script | bool | 是否公共脚本 | +| description | string | 脚本描述 | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/get_script_version_detail.md b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/get_script_version_detail.md index ca831aba6d..1d99e698b5 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/get_script_version_detail.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/get_script_version_detail.md @@ -48,7 +48,10 @@ "creator": "admin", "create_time": 1600746078520, "last_modify_user": "admin", - "last_modify_time": 1600746078520 + "last_modify_time": 1600746078520, + "script_language": 1, + "public_script": false, + "description": "脚本描述" } } ``` @@ -81,3 +84,6 @@ | create_time | long | 创建时间Unix时间戳(ms) | | last_modify_user | string | 最近一次修改人 | | last_modify_time | long | 最近一次修改时间Unix时间戳(ms) | +| script_language | int | 脚本语言:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell | +| public_script | bool | 是否公共脚本 | +| description | string | 脚本描述 | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/get_script_version_list.md b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/get_script_version_list.md index 01f07044ae..56bb2969d1 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/get_script_version_list.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/get_script_version_list.md @@ -54,7 +54,10 @@ "creator": "admin", "create_time": 1600746078520, "last_modify_user": "admin", - "last_modify_time": 1600746078520 + "last_modify_time": 1600746078520, + "script_language": 1, + "public_script": false, + "description": "脚本描述" } ], "start": 0, @@ -92,3 +95,6 @@ | create_time | long | 创建时间Unix时间戳(ms) | | last_modify_user | string | 最近一次修改人 | | last_modify_time | long | 最近一次修改时间Unix时间戳(ms) | +| script_language | int | 脚本语言:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell | +| public_script | bool | 是否公共脚本 | +| description | string | 脚本描述 | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/publish_public_script_version.md b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/publish_public_script_version.md index eaf5dc0d6d..363aa1a437 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/publish_public_script_version.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/publish_public_script_version.md @@ -33,8 +33,8 @@ "code": 0, "result": true, "data": { - "script_version_id": 1000018, - "id": "4537fb49ec0840a1b91cef4179c99f9c", + "id": 1000018, + "script_id": "4537fb49ec0840a1b91cef4179c99f9c", "status": 2 } } @@ -56,6 +56,6 @@ | 字段 | 类型 | 描述 | | ----------------- | ------ | ------------------------------------------------------------ | -| id | string | 脚本ID | -| script_version_id | long | 脚本版本ID | +| script_id | string | 脚本ID | +| id | long | 脚本版本ID | | status | int | 脚本版本当前状态(0:未上线,1:已上线,2:已下线,3:已禁用) | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/publish_script_version.md b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/publish_script_version.md index 968f13d05a..5a274793b3 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/publish_script_version.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/publish_script_version.md @@ -37,8 +37,8 @@ "code": 0, "result": true, "data": { - "script_version_id": 1000019, - "id": "4a350b0e0707450e93326f6ace921072", + "id": 1000019, + "script_id": "4a350b0e0707450e93326f6ace921072", "status": 1 } } @@ -60,6 +60,6 @@ | 字段 | 类型 | 描述 | | ----------------- | ------ | ------------------------------------------------------------ | -| id | string | 脚本ID | -| script_version_id | long | 脚本版本ID | +| script_id | string | 脚本ID | +| id | long | 脚本版本ID | | status | int | 脚本版本当前状态(0:未上线,1:已上线,2:已下线,3:已禁用) | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/update_public_script_version.md b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/update_public_script_version.md index 65d108adc3..05d14b7306 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/update_public_script_version.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/update_public_script_version.md @@ -37,7 +37,7 @@ "code": 0, "result": true, "data": { - "script_version_id": 1000020, + "id": 1000020, "script_id": "4537fb49ec0840a1b91cef4179c99f9c", "name": "public script test", "script_language": 1, @@ -71,7 +71,7 @@ | 字段 | 类型 | 描述 | | ----------------- | ------ | ------------------------------------------------------------ | -| script_version_id | long | 公共脚本版本ID | +| id | long | 公共脚本版本ID | | script_id | string | 公共脚本ID | | name | string | 公共脚本名称 | | script_language | int | 脚本语言:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell, 6 - sql | diff --git a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/update_script_version.md b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/update_script_version.md index 400e469970..f02fdfa937 100644 --- a/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/update_script_version.md +++ b/docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/update_script_version.md @@ -41,7 +41,7 @@ "code": 0, "result": true, "data": { - "script_version_id": 1000019, + "id": 1000019, "script_id": "4a350b0e0707450e93326f6ace921072", "name": "script test", "script_language": 1, @@ -77,7 +77,7 @@ | 字段 | 类型 | 描述 | | ----------------- | ------ | ------------------------------------------------------------ | -| script_version_id | long | 脚本版本ID | +| id | long | 脚本版本ID | | script_id | string | 脚本ID | | name | string | 脚本名称 | | script_language | int | 脚本语言:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell, 6 - sql | diff --git a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/model/esb/v3/response/EsbScriptVersionDetailV3DTO.java b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/model/esb/v3/response/EsbScriptVersionDetailV3DTO.java index 69cd5f9f19..096c9af18b 100644 --- a/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/model/esb/v3/response/EsbScriptVersionDetailV3DTO.java +++ b/src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/model/esb/v3/response/EsbScriptVersionDetailV3DTO.java @@ -68,12 +68,6 @@ public class EsbScriptVersionDetailV3DTO extends EsbAppScopeDTO { @JsonProperty("last_modify_time") private Long lastModifyTime; - /** - * 脚本版本ID - */ - @JsonProperty("script_version_id") - private Long scriptVersionId; - /** * 脚本语言:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell */ diff --git a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/model/dto/ScriptDTO.java b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/model/dto/ScriptDTO.java index c1ce4abae3..6c09cec0de 100644 --- a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/model/dto/ScriptDTO.java +++ b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/model/dto/ScriptDTO.java @@ -163,7 +163,7 @@ public EsbScriptVersionDetailV3DTO toEsbScriptVersionDetailV3DTO() { public EsbScriptVersionDetailV3DTO toEsbCreateScriptV3DTO() { EsbScriptVersionDetailV3DTO scriptDetail = new EsbScriptVersionDetailV3DTO(); - scriptDetail.setScriptVersionId(scriptVersionId); + scriptDetail.setId(scriptVersionId); scriptDetail.setScriptId(id); scriptDetail.setName(name); scriptDetail.setType(type); @@ -185,7 +185,7 @@ public EsbScriptVersionDetailV3DTO toEsbCreateScriptV3DTO() { public EsbScriptVersionDetailV3DTO toEsbManageScriptV3DTO() { EsbScriptVersionDetailV3DTO managetDetail = new EsbScriptVersionDetailV3DTO(); - managetDetail.setScriptVersionId(scriptVersionId); + managetDetail.setId(scriptVersionId); managetDetail.setScriptId(id); managetDetail.setStatus(status); return managetDetail;