diff --git a/src/api/auth/config/core/object.yaml b/src/api/auth/config/core/object.yaml index 61c83733..e8ce8baa 100755 --- a/src/api/auth/config/core/object.yaml +++ b/src/api/auth/config/core/object.yaml @@ -1,6 +1,6 @@ objects: - object_class: bkdata - object_name: 蓝鲸数据平台 + object_name: 蓝鲸基础计算平台 object_name_en: DataSystem has_object: False scope_id_key: "*" diff --git a/src/api/auth/contents/auth.sql b/src/api/auth/contents/auth.sql index a1b8997a..2183ffdb 100755 --- a/src/api/auth/contents/auth.sql +++ b/src/api/auth/contents/auth.sql @@ -219,7 +219,7 @@ INSERT INTO auth_role_config(role_id, role_name, object_class, created_by, updat ('result_table.viewer', '数据观察员', 'result_table', 'admin', 'admin'); INSERT INTO auth_object_config(object_class, object_name, has_object, scope_id_key, scope_name_key, user_mode, created_by, updated_by) values - ('bkdata', '蓝鲸数据平台', 0, '*', '*', 0, 'admin', 'admin'), + ('bkdata', '蓝鲸基础计算平台', 0, '*', '*', 0, 'admin', 'admin'), ('biz', '业务', 1, 'bk_biz_id', 'bk_biz_name', 1, 'admin', 'admin'), ('project', '项目', 1, 'project_id', 'project_name', 1, 'admin', 'admin'), ('flow', '任务', 1, 'flow_id', 'flow_name', 0, 'admin', 'admin'), @@ -475,7 +475,7 @@ INSERT INTO content_language_config(content_key, language, content_value, active ('数据清洗员', 'en', 'DataCleaner', 1, 'auth'), ('数据观察员', 'en', 'DataViewer', 1, 'auth'), ('任务开发员', 'en', 'FlowDeveloper', 1, 'auth'), - ('蓝鲸数据平台', 'en', 'BlueKing Data System', 1, 'auth'), + ('蓝鲸基础计算平台', 'en', 'BlueKing Data System', 1, 'auth'), ('业务', 'en', 'Business', 1, 'auth'), ('项目', 'en', 'Project', 1, 'auth'), ('任务', 'en', 'Task', 1, 'auth'), diff --git a/src/api/auth/models/auth_models.py b/src/api/auth/models/auth_models.py index d89217d5..a6d6d172 100644 --- a/src/api/auth/models/auth_models.py +++ b/src/api/auth/models/auth_models.py @@ -361,7 +361,7 @@ def apply_permission(self, data_scope): 'scope_object_class': 'biz', 'scope_name_key': 'bk_biz_name', 'scope_display': { - 'bk_biz_name': '蓝鲸数据平台对内版' + 'bk_biz_name': '蓝鲸基础计算平台' }, 'scope': { 'bk_biz_id': '591' diff --git a/src/api/auth/views/project_views.py b/src/api/auth/views/project_views.py index c53a8541..6f3802a9 100644 --- a/src/api/auth/views/project_views.py +++ b/src/api/auth/views/project_views.py @@ -273,7 +273,7 @@ def biz_tickets_count(self, request, project_id): processing: 1, succeeded: 0 }, - bk_biz_name: "蓝鲸数据平台对内版", + bk_biz_name: "蓝鲸基础计算平台", description: "枫叶对内版本的配置管理" } ] diff --git a/src/api/meta/public/views/biz.py b/src/api/meta/public/views/biz.py index d482562b..ef07e93a 100644 --- a/src/api/meta/public/views/biz.py +++ b/src/api/meta/public/views/biz.py @@ -46,7 +46,7 @@ def retrieve(self, request, bk_biz_id): "data": { "bk_biz_id": "591", "maintainers": "maintainer1;maintainer2", - "bk_biz_name": "蓝鲸数据平台对内版", + "bk_biz_name": "蓝鲸基础计算平台", "description": "some description" }, "result": true diff --git a/src/dataweb/app/README.md b/src/dataweb/app/README.md index c47d7fea..6d4d2c17 100644 --- a/src/dataweb/app/README.md +++ b/src/dataweb/app/README.md @@ -1,6 +1,6 @@ # BK_DATAWEB -蓝鲸数据平台WEB端，项目采用前后端分离的方式开发，前端使用 VUE 框架，后端使用 DJANGO+DRF 提供 API +蓝鲸基础计算平台WEB端，项目采用前后端分离的方式开发，前端使用 VUE 框架，后端使用 DJANGO+DRF 提供 API ## 代码规范 diff --git a/src/dataweb/app/apps/dataflow/handlers/result_table.py b/src/dataweb/app/apps/dataflow/handlers/result_table.py index 3e95cdd9..09528e8d 100644 --- a/src/dataweb/app/apps/dataflow/handlers/result_table.py +++ b/src/dataweb/app/apps/dataflow/handlers/result_table.py @@ -937,7 +937,7 @@ def result_table_type_alias(self): def platform(self): """ 结果表所属平台 - bkdata=蓝鲸数据平台 + bkdata=蓝鲸基础计算平台 tdw=TDW """ return self.data.get("platform", "bkdata") diff --git a/src/dataweb/app/apps/dataflow/views/biz_views.py b/src/dataweb/app/apps/dataflow/views/biz_views.py index 920a2336..69d35a11 100644 --- a/src/dataweb/app/apps/dataflow/views/biz_views.py +++ b/src/dataweb/app/apps/dataflow/views/biz_views.py @@ -41,7 +41,7 @@ def list(self, request): [ { "biz_id": 111, - "biz_name": "蓝鲸数据平台" + "biz_name": "蓝鲸基础计算平台" }, { "biz_id": 222, @@ -161,7 +161,7 @@ def list_mine_biz(self, request, biz_id=None): [ { "bk_biz_id": 111, - "bk_biz_name": "蓝鲸数据平台" + "bk_biz_name": "蓝鲸基础计算平台" }, { "bk_biz_id": 222, diff --git a/src/dataweb/app/apps/dataflow/views/data_dict_views.py b/src/dataweb/app/apps/dataflow/views/data_dict_views.py index d627b399..762c2468 100644 --- a/src/dataweb/app/apps/dataflow/views/data_dict_views.py +++ b/src/dataweb/app/apps/dataflow/views/data_dict_views.py @@ -657,7 +657,7 @@ def lineage(self, request): "count_freq_unit":"s", "alias":"直接清洗", "project_id":4, - "bk_biz_name":"蓝鲸数据平台对内版", + "bk_biz_name":"蓝鲸基础计算平台", "id":"result_table_591_xxxx1115", "name":"591_xxxx1115" }, diff --git a/src/dataweb/app/apps/dataflow/views/tool_views.py b/src/dataweb/app/apps/dataflow/views/tool_views.py index cc1efb3d..642b669d 100644 --- a/src/dataweb/app/apps/dataflow/views/tool_views.py +++ b/src/dataweb/app/apps/dataflow/views/tool_views.py @@ -93,7 +93,7 @@ def list_bk_app(self, request): [ { "app_code": "data", - "app_name": "蓝鲸数据平台" + "app_name": "蓝鲸基础计算平台" }, { "app_code": "log_search", diff --git a/src/dataweb/app/static/webdoc/index.html b/src/dataweb/app/static/webdoc/index.html index 5bf1ec49..6565af21 100644 --- a/src/dataweb/app/static/webdoc/index.html +++ b/src/dataweb/app/static/webdoc/index.html @@ -3,7 +3,7 @@ - 蓝鲸数据平台文档 + 蓝鲸基础计算平台文档 diff --git a/src/dataweb/web/src/i18n/en/common.json b/src/dataweb/web/src/i18n/en/common.json index a99c8dd7..09818932 100644 --- a/src/dataweb/web/src/i18n/en/common.json +++ b/src/dataweb/web/src/i18n/en/common.json @@ -1306,7 +1306,7 @@ "您还没有项目": "You have no projects yet", "无结果数据表_是否新建任务": "No result data table, whether to create a new task", "未经处理的数据_只能连接数据清洗节点": "Unprocessed data can only be connected to the data cleaning node.", - "保存在蓝鲸数据平台存储中的数据_可以连接实时计算_离线计算": "The data stored in the blue whale data platform storage can be connected to real-time calculations and offline calculations.", + "保存在蓝鲸基础计算平台存储中的数据_可以连接实时计算_离线计算": "The data stored in the blue whale data platform storage can be connected to real-time calculations and offline calculations.", "基于流式处理的实时计算_支持秒级和分钟级的计算": "Real-time calculation based on streaming, supporting calculations in seconds and minutes.", "基于批处理的离线计算_支持小时级和天级的计算": "Batch-based offline calculations support hourly and day-level calculations.", "基于HDFS的历史数据存储_不可以直接查询_只能连接离线": "HDFS-based historical data storage, can not be directly queried, can only be connected offline.", @@ -1424,7 +1424,7 @@ "业务数据": "Business data", "删除时间": "Deleted At", "项目详情": "Project details", - "蓝鲸数据平台": "BlueKing Data System", + "蓝鲸基础计算平台": "BlueKing Data System", "操作状态": "Status", "批量启动成功": "Batch start succeeded", "批量停止成功": "Batch stop succeeded", @@ -2011,7 +2011,7 @@ "上传本地文件支持csv_excel格式到数据平台_请注意_一次上传文件大小需小于等于10M": "Upload local files (support csv, excel format) to the Data System. Please note: the size of one upload file must be less than or equal to 10M", "点击选择上传文件": "Click to select upload file", "选择文件": "Select file", - "蓝鲸数据平台会将脚本下发到指定的服务器_并托管执行该脚本": "The BlueKing Data System will deliver the script to the specified server and execute the script by hosting.", + "蓝鲸基础计算平台会将脚本下发到指定的服务器_并托管执行该脚本": "The BlueKing Data System will deliver the script to the specified server and execute the script by hosting.", "调试": "Debug", "对接入对象的描述或者说明信息": "Description or notes of the access object", "TLOG表": "TLOG table", diff --git a/src/dataweb/web/src/i18n/zh-cn/common.json b/src/dataweb/web/src/i18n/zh-cn/common.json index cf0f1670..e6d091bf 100644 --- a/src/dataweb/web/src/i18n/zh-cn/common.json +++ b/src/dataweb/web/src/i18n/zh-cn/common.json @@ -657,7 +657,7 @@ "您还没有项目": "您还没有项目", "无结果数据表_是否新建任务": "无结果数据表，是否新建任务", "未经处理的数据_只能连接数据清洗节点": "未经处理的数据，只能连接数据清洗节点。", - "保存在蓝鲸数据平台存储中的数据_可以连接实时计算_离线计算": "保存在蓝鲸数据平台存储中的数据，可以连接实时计算、离线计算。", + "保存在蓝鲸基础计算平台存储中的数据_可以连接实时计算_离线计算": "保存在蓝鲸基础计算平台存储中的数据，可以连接实时计算、离线计算。", "基于流式处理的实时计算_支持秒级和分钟级的计算": "基于流式处理的实时计算，支持秒级和分钟级的计算。", "基于批处理的离线计算_支持小时级和天级的计算": "基于批处理的离线计算，支持小时级和天级的计算。", "基于HDFS的历史数据存储_不可以直接查询_只能连接离线": "基于HDFS的历史数据存储，不可以直接查询，只能连接离线。", @@ -777,7 +777,7 @@ "业务数据": "业务数据", "删除时间": "删除时间", "项目详情": "项目详情", - "蓝鲸数据平台": "蓝鲸数据平台", + "蓝鲸基础计算平台": "蓝鲸基础计算平台", "操作状态": "操作状态", "批量启动成功": "批量启动成功", "批量停止成功": "批量停止成功", @@ -1371,7 +1371,7 @@ "上传本地文件支持csv_excel格式到数据平台_请注意_一次上传文件大小需小于等于10M": "上传本地文件（支持csv，excel格式）到数据平台，请注意：一次上传文件大小需小于等于10M", "点击选择上传文件": "点击选择上传文件", "选择文件": "选择文件", - "蓝鲸数据平台会将脚本下发到指定的服务器_并托管执行该脚本": "蓝鲸数据平台会将脚本下发到指定的服务器，并托管执行该脚本", + "蓝鲸基础计算平台会将脚本下发到指定的服务器_并托管执行该脚本": "蓝鲸基础计算平台会将脚本下发到指定的服务器，并托管执行该脚本", "调试": "调试", "对接入对象的描述或者说明信息": "对接入对象的描述或者说明信息", "TLOG表": "TLOG表", diff --git a/src/dataweb/web/src/pages/DataAccess/NewForm/FormItems/Components/AccessScript.vue b/src/dataweb/web/src/pages/DataAccess/NewForm/FormItems/Components/AccessScript.vue index 60fc2b85..1f49df67 100644 --- a/src/dataweb/web/src/pages/DataAccess/NewForm/FormItems/Components/AccessScript.vue +++ b/src/dataweb/web/src/pages/DataAccess/NewForm/FormItems/Components/AccessScript.vue @@ -26,7 +26,7 @@
- {{ $t('蓝鲸数据平台会将脚本下发到指定的服务器_并托管执行该脚本') }} + {{ $t('蓝鲸基础计算平台会将脚本下发到指定的服务器_并托管执行该脚本') }}