From 28f871e58b10262788275d74ba1c8bdc31ad6708 Mon Sep 17 00:00:00 2001 From: zhang <60912722+boy-xiaozhang@users.noreply.github.com> Date: Tue, 9 Nov 2021 23:34:13 +0800 Subject: [PATCH] [Fix-6764]modifying prompt messages and modify dolphinscheduler_mysql.sql dolphinscheduler version (#6765) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [FIX:201106]fix issue#6657 * replacement version number * update resource create error messag Co-authored-by: 张柏强 Co-authored-by: crane --- .../java/org/apache/dolphinscheduler/api/enums/Status.java | 2 ++ .../api/service/impl/ResourcesServiceImpl.java | 4 ++-- .../src/main/resources/sql/dolphinscheduler_mysql.sql | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java index 7ea8f9bdee..6f8b2d6f70 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java @@ -210,6 +210,8 @@ public enum Status { QUERY_WORKER_ADDRESS_LIST_FAIL(10178, "query worker address list fail ", "查询worker地址列表失败"), TRANSFORM_PROJECT_OWNERSHIP(10179, "Please transform project ownership [{0}]", "请先转移项目所有权[{0}]"), QUERY_ALERT_GROUP_ERROR(10180, "query alert group error", "查询告警组错误"), + CURRENT_LOGIN_USER_TENANT_NOT_EXIST(10181, "the tenant of the currently login user is not specified", "未指定当前登录用户的租户"), + UDF_FUNCTION_NOT_EXIST(20001, "UDF function not found", "UDF函数不存在"), UDF_FUNCTION_EXISTS(20002, "UDF function already exists", "UDF函数已存在"), diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java index 7107fd4487..05e84bb03e 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java @@ -768,7 +768,7 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe putMsg(result,Status.HDFS_OPERATION_ERROR); } } else { - putMsg(result,Status.TENANT_NOT_EXIST); + putMsg(result,Status.CURRENT_LOGIN_USER_TENANT_NOT_EXIST); } } @@ -1285,7 +1285,7 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe Tenant tenant = tenantMapper.queryById(user.getTenantId()); if (tenant == null) { logger.error("tenant not exists"); - putMsg(result, Status.TENANT_NOT_EXIST); + putMsg(result, Status.CURRENT_LOGIN_USER_TENANT_NOT_EXIST); return null; } return tenant.getTenantCode(); diff --git a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql index cd4c84b449..5c3615d697 100644 --- a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql +++ b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql @@ -940,7 +940,7 @@ CREATE TABLE `t_ds_version` ( -- ---------------------------- -- Records of t_ds_version -- ---------------------------- -INSERT INTO `t_ds_version` VALUES ('1', '1.4.0'); +INSERT INTO `t_ds_version` VALUES ('1', '2.0.2'); -- ----------------------------