This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new c7b5956 [Feature-3941][ui] Remove tenant name (#3949)
c7b5956 is described below
commit c7b5956c5af37683344c91777626087e0b5c072a
Author: IamMujuziMoses <[email protected]>
AuthorDate: Fri Oct 30 07:18:00 2020 +0300
[Feature-3941][ui] Remove tenant name (#3949)
* FeatureUI-3941: Removed Tenant
* FeatureUI-3941: Removed tenantName in the suggested pages
* FeatureUI-3941: Updated the suggested files
* FeatureUI-3941: Updated the TenantController
* FeatureUI-3941: Updated the TenantController and the pom.xml
* FeatureUI-3941: Updated the TenantControllerTest
---
.../api/controller/TenantController.java | 23 ++++++++++----------
.../apache/dolphinscheduler/api/enums/Status.java | 2 +-
.../api/service/TenantService.java | 5 +----
.../api/service/impl/TenantServiceImpl.java | 12 ++---------
.../src/main/resources/i18n/messages.properties | 1 -
.../main/resources/i18n/messages_en_US.properties | 1 -
.../main/resources/i18n/messages_zh_CN.properties | 1 -
.../api/controller/TenantControllerTest.java | 8 +++----
.../api/service/TenantServiceTest.java | 13 +++++------
.../apache/dolphinscheduler/dao/entity/Tenant.java | 14 ------------
.../apache/dolphinscheduler/dao/entity/User.java | 15 -------------
.../dao/mapper/ProcessDefinitionMapper.xml | 2 +-
.../dolphinscheduler/dao/mapper/TenantMapper.xml | 2 +-
.../dolphinscheduler/dao/mapper/UserMapper.xml | 4 ++--
.../dao/mapper/ResourceMapperTest.java | 1 -
.../dao/mapper/TenantMapperTest.java | 4 ++--
.../dao/mapper/UserMapperTest.java | 2 --
.../consumer/TaskPriorityQueueConsumerTest.java | 1 -
.../pages/dag/_source/udp/_source/selectTenant.vue | 2 +-
.../pages/tenement/_source/createTenement.vue | 25 ----------------------
.../pages/security/pages/tenement/_source/list.vue | 8 -------
.../security/pages/users/_source/createUser.vue | 2 +-
.../pages/security/pages/users/_source/list.vue | 2 +-
.../home/pages/user/pages/account/_source/info.vue | 2 +-
.../src/js/conf/home/store/security/actions.js | 2 +-
.../src/js/module/i18n/locale/en_US.js | 2 --
.../src/js/module/i18n/locale/zh_CN.js | 2 --
.../locator/security/TenantManageLocator.java | 4 +---
.../page/security/TenantManagePage.java | 1 -
e2e/src/test/resources/testData/security_zh_cn.yml | 1 -
pom.xml | 1 +
.../mysql/dolphinscheduler_ddl.sql | 1 -
.../postgresql/dolphinscheduler_ddl.sql | 1 -
sql/dolphinscheduler-postgre.sql | 1 -
sql/dolphinscheduler_mysql.sql | 1 -
35 files changed, 36 insertions(+), 133 deletions(-)
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TenantController.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TenantController.java
index 2676a77..4c5dacb 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TenantController.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TenantController.java
@@ -29,6 +29,7 @@ import
org.apache.dolphinscheduler.api.exceptions.ApiException;
import org.apache.dolphinscheduler.api.service.TenantService;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
+import org.apache.dolphinscheduler.common.utils.StringUtils;
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
import org.apache.dolphinscheduler.dao.entity.User;
@@ -72,7 +73,6 @@ public class TenantController extends BaseController {
*
* @param loginUser login user
* @param tenantCode tenant code
- * @param tenantName tenant name
* @param queueId queue id
* @param description description
* @return create result code
@@ -80,7 +80,6 @@ public class TenantController extends BaseController {
@ApiOperation(value = "createTenant", notes = "CREATE_TENANT_NOTES")
@ApiImplicitParams({
@ApiImplicitParam(name = "tenantCode", value = "TENANT_CODE",
required = true, dataType = "String"),
- @ApiImplicitParam(name = "tenantName", value = "TENANT_NAME",
required = true, dataType = "String"),
@ApiImplicitParam(name = "queueId", value = "QUEUE_ID", required =
true, dataType = "Int", example = "100"),
@ApiImplicitParam(name = "description", value = "TENANT_DESC",
dataType = "String")
@@ -90,12 +89,13 @@ public class TenantController extends BaseController {
@ApiException(CREATE_TENANT_ERROR)
public Result createTenant(@ApiIgnore @RequestAttribute(value =
Constants.SESSION_USER) User loginUser,
@RequestParam(value = "tenantCode") String
tenantCode,
- @RequestParam(value = "tenantName") String
tenantName,
@RequestParam(value = "queueId") int queueId,
@RequestParam(value = "description", required =
false) String description) throws Exception {
- logger.info("login user {}, create tenant, tenantCode: {}, tenantName:
{}, queueId: {}, desc: {}",
- loginUser.getUserName(), tenantCode, tenantName, queueId,
description);
- Map<String, Object> result = tenantService.createTenant(loginUser,
tenantCode, tenantName, queueId, description);
+ String userReplace =
StringUtils.replaceNRTtoUnderline(loginUser.getUserName());
+ String tenantCodeReplace =
StringUtils.replaceNRTtoUnderline(tenantCode);
+ String descReplace = StringUtils.replaceNRTtoUnderline(description);
+ logger.info("login user {}, create tenant, tenantCode: {}, queueId:
{}, desc: {}", userReplace, tenantCodeReplace, queueId, descReplace);
+ Map<String, Object> result = tenantService.createTenant(loginUser,
tenantCode, queueId, description);
return returnDataList(result);
}
@@ -157,7 +157,6 @@ public class TenantController extends BaseController {
* @param loginUser login user
* @param id tennat id
* @param tenantCode tennat code
- * @param tenantName tennat name
* @param queueId queue id
* @param description description
* @return update result code
@@ -166,7 +165,6 @@ public class TenantController extends BaseController {
@ApiImplicitParams({
@ApiImplicitParam(name = "ID", value = "TENANT_ID", required =
true, dataType = "Int", example = "100"),
@ApiImplicitParam(name = "tenantCode", value = "TENANT_CODE",
required = true, dataType = "String"),
- @ApiImplicitParam(name = "tenantName", value = "TENANT_NAME",
required = true, dataType = "String"),
@ApiImplicitParam(name = "queueId", value = "QUEUE_ID", required =
true, dataType = "Int", example = "100"),
@ApiImplicitParam(name = "description", value = "TENANT_DESC",
type = "String")
@@ -177,12 +175,13 @@ public class TenantController extends BaseController {
public Result updateTenant(@ApiIgnore @RequestAttribute(value =
Constants.SESSION_USER) User loginUser,
@RequestParam(value = "id") int id,
@RequestParam(value = "tenantCode") String
tenantCode,
- @RequestParam(value = "tenantName") String
tenantName,
@RequestParam(value = "queueId") int queueId,
@RequestParam(value = "description", required =
false) String description) throws Exception {
- logger.info("login user {}, updateProcessInstance tenant, tenantCode:
{}, tenantName: {}, queueId: {}, description: {}",
- loginUser.getUserName(), tenantCode, tenantName, queueId,
description);
- Map<String, Object> result = tenantService.updateTenant(loginUser, id,
tenantCode, tenantName, queueId, description);
+ String userReplace =
StringUtils.replaceNRTtoUnderline(loginUser.getUserName());
+ String tenantCodeReplace =
StringUtils.replaceNRTtoUnderline(tenantCode);
+ String descReplace = StringUtils.replaceNRTtoUnderline(description);
+ logger.info("login user {}, create tenant, tenantCode: {}, queueId:
{}, desc: {}", userReplace, tenantCodeReplace, queueId, descReplace);
+ Map<String, Object> result = tenantService.updateTenant(loginUser, id,
tenantCode, queueId, description);
return returnDataList(result);
}
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 c6ad1cf..6e23808 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
@@ -36,7 +36,7 @@ public enum Status {
USER_NAME_NULL(10004, "user name is null", "用户名不能为空"),
HDFS_OPERATION_ERROR(10006, "hdfs operation error", "hdfs操作错误"),
TASK_INSTANCE_NOT_FOUND(10008, "task instance not found", "任务实例不存在"),
- TENANT_NAME_EXIST(10009, "tenant code {0} already exists", "租户编码[{0}]已存在"),
+ TENANT_CODE_EXIST(10009, "tenant code {0} already exists", "租户编码[{0}]已存在"),
USER_NOT_EXIST(10010, "user {0} not exists", "用户[{0}]不存在"),
ALERT_GROUP_NOT_EXIST(10011, "alarm group not found", "告警组不存在"),
ALERT_GROUP_EXIST(10012, "alarm group already exists", "告警组名称已存在"),
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TenantService.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TenantService.java
index 8e83e22..8ab84f9 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TenantService.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TenantService.java
@@ -32,7 +32,6 @@ public interface TenantService {
*
* @param loginUser login user
* @param tenantCode tenant code
- * @param tenantName tenant name
* @param queueId queue id
* @param desc description
* @return create result code
@@ -40,7 +39,6 @@ public interface TenantService {
*/
Map<String, Object> createTenant(User loginUser,
String tenantCode,
- String tenantName,
int queueId,
String desc) throws Exception;
@@ -61,13 +59,12 @@ public interface TenantService {
* @param loginUser login user
* @param id tennat id
* @param tenantCode tennat code
- * @param tenantName tennat name
* @param queueId queue id
* @param desc description
* @return update result code
* @throws Exception exception
*/
- Map<String, Object> updateTenant(User loginUser, int id, String
tenantCode, String tenantName, int queueId,
+ Map<String, Object> updateTenant(User loginUser, int id, String
tenantCode, int queueId,
String desc) throws Exception;
/**
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java
index 52f0d79..b24298d 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java
@@ -76,7 +76,6 @@ public class TenantServiceImpl extends BaseService implements
TenantService {
*
* @param loginUser login user
* @param tenantCode tenant code
- * @param tenantName tenant name
* @param queueId queue id
* @param desc description
* @return create result code
@@ -85,7 +84,6 @@ public class TenantServiceImpl extends BaseService implements
TenantService {
@Transactional(rollbackFor = Exception.class)
public Map<String, Object> createTenant(User loginUser,
String tenantCode,
- String tenantName,
int queueId,
String desc) throws Exception {
@@ -113,7 +111,6 @@ public class TenantServiceImpl extends BaseService
implements TenantService {
return result;
}
tenant.setTenantCode(tenantCode);
- tenant.setTenantName(tenantName);
tenant.setQueueId(queueId);
tenant.setDescription(desc);
tenant.setCreateTime(now);
@@ -166,13 +163,12 @@ public class TenantServiceImpl extends BaseService
implements TenantService {
* @param loginUser login user
* @param id tennat id
* @param tenantCode tennat code
- * @param tenantName tennat name
* @param queueId queue id
* @param desc description
* @return update result code
* @throws Exception exception
*/
- public Map<String, Object> updateTenant(User loginUser, int id, String
tenantCode, String tenantName, int queueId,
+ public Map<String, Object> updateTenant(User loginUser, int id, String
tenantCode, int queueId,
String desc) throws Exception {
Map<String, Object> result = new HashMap<>(5);
@@ -215,10 +211,6 @@ public class TenantServiceImpl extends BaseService
implements TenantService {
tenant.setTenantCode(tenantCode);
}
- if (StringUtils.isNotEmpty(tenantName)) {
- tenant.setTenantName(tenantName);
- }
-
if (queueId != 0) {
tenant.setQueueId(queueId);
}
@@ -317,7 +309,7 @@ public class TenantServiceImpl extends BaseService
implements TenantService {
public Result verifyTenantCode(String tenantCode) {
Result result = new Result();
if (checkTenantExists(tenantCode)) {
- putMsg(result, Status.TENANT_NAME_EXIST, tenantCode);
+ putMsg(result, Status.TENANT_CODE_EXIST, tenantCode);
} else {
putMsg(result, Status.SUCCESS);
}
diff --git a/dolphinscheduler-api/src/main/resources/i18n/messages.properties
b/dolphinscheduler-api/src/main/resources/i18n/messages.properties
index b2d601c..233d3b7 100644
--- a/dolphinscheduler-api/src/main/resources/i18n/messages.properties
+++ b/dolphinscheduler-api/src/main/resources/i18n/messages.properties
@@ -117,7 +117,6 @@ VERIFY_QUEUE_NOTES=verify queue
TENANT_TAG=tenant related operation
CREATE_TENANT_NOTES=create tenant
TENANT_CODE=tenant code
-TENANT_NAME=tenant name
QUEUE_NAME=queue name
PASSWORD=password
DATA_SOURCE_OTHER=jdbc connection params, format:{"key1":"value1",...}
diff --git
a/dolphinscheduler-api/src/main/resources/i18n/messages_en_US.properties
b/dolphinscheduler-api/src/main/resources/i18n/messages_en_US.properties
index db1fa25..a32ffb0 100644
--- a/dolphinscheduler-api/src/main/resources/i18n/messages_en_US.properties
+++ b/dolphinscheduler-api/src/main/resources/i18n/messages_en_US.properties
@@ -117,7 +117,6 @@ VERIFY_QUEUE_NOTES=verify queue
TENANT_TAG=tenant related operation
CREATE_TENANT_NOTES=create tenant
TENANT_CODE=tenant code
-TENANT_NAME=tenant name
QUEUE_NAME=queue name
PASSWORD=password
DATA_SOURCE_OTHER=jdbc connection params, format:{"key1":"value1",...}
diff --git
a/dolphinscheduler-api/src/main/resources/i18n/messages_zh_CN.properties
b/dolphinscheduler-api/src/main/resources/i18n/messages_zh_CN.properties
index d32f9d6..24e51ad 100644
--- a/dolphinscheduler-api/src/main/resources/i18n/messages_zh_CN.properties
+++ b/dolphinscheduler-api/src/main/resources/i18n/messages_zh_CN.properties
@@ -116,7 +116,6 @@ VERIFY_QUEUE_NOTES=验证队列
TENANT_TAG=租户相关操作
CREATE_TENANT_NOTES=创建租户
TENANT_CODE=租户编码
-TENANT_NAME=租户名称
QUEUE_NAME=队列名
PASSWORD=密码
DATA_SOURCE_OTHER=jdbc连接参数，格式为:{"key1":"value1",...}
diff --git
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/TenantControllerTest.java
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/TenantControllerTest.java
index 7cf622a..010b7ba 100644
---
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/TenantControllerTest.java
+++
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/TenantControllerTest.java
@@ -43,7 +43,6 @@ public class TenantControllerTest extends
AbstractControllerTest{
public void testCreateTenant() throws Exception {
MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
paramsMap.add("tenantCode","tenantCode");
- paramsMap.add("tenantName","tenantName");
paramsMap.add("queueId","1");
paramsMap.add("description","tenant description");
@@ -84,7 +83,6 @@ public class TenantControllerTest extends
AbstractControllerTest{
MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
paramsMap.add("id","9");
paramsMap.add("tenantCode","cxc_te");
- paramsMap.add("tenantName","tenant_update_2");
paramsMap.add("queueId","1");
paramsMap.add("description","tenant description");
@@ -96,7 +94,7 @@ public class TenantControllerTest extends
AbstractControllerTest{
.andReturn();
Result result =
JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(),
Result.class);
-
Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
+
Assert.assertEquals(Status.TENANT_NOT_EXIST.getCode(),result.getCode().intValue());
logger.info(mvcResult.getResponse().getContentAsString());
}
@@ -133,7 +131,7 @@ public class TenantControllerTest extends
AbstractControllerTest{
.andReturn();
Result result =
JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(),
Result.class);
- Assert.assertEquals(Status.TENANT_NAME_EXIST.getCode(),
result.getCode().intValue());
+ Assert.assertEquals(Status.TENANT_CODE_EXIST.getCode(),
result.getCode().intValue());
logger.info(mvcResult.getResponse().getContentAsString());
}
@@ -165,7 +163,7 @@ public class TenantControllerTest extends
AbstractControllerTest{
.andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
.andReturn();
Result result =
JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(),
Result.class);
-
Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
+
Assert.assertEquals(Status.TENANT_NOT_EXIST.getCode(),result.getCode().intValue());
logger.info(mvcResult.getResponse().getContentAsString());
}
}
diff --git
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TenantServiceTest.java
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TenantServiceTest.java
index 5dcf59c..86b2079 100644
---
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TenantServiceTest.java
+++
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TenantServiceTest.java
@@ -73,8 +73,6 @@ public class TenantServiceTest {
private static final String tenantCode = "TenantServiceTest";
- private static final String tenantName = "TenantServiceTest";
-
@Test
public void testCreateTenant() {
@@ -83,17 +81,17 @@ public class TenantServiceTest {
try {
//check tenantCode
Map<String, Object> result =
- tenantService.createTenant(getLoginUser(), "%!1111",
tenantName, 1, "TenantServiceTest");
+ tenantService.createTenant(getLoginUser(), "%!1111", 1,
"TenantServiceTest");
logger.info(result.toString());
Assert.assertEquals(Status.VERIFY_TENANT_CODE_ERROR,
result.get(Constants.STATUS));
//check exist
- result = tenantService.createTenant(loginUser, tenantCode,
tenantName, 1, "TenantServiceTest");
+ result = tenantService.createTenant(loginUser, tenantCode, 1,
"TenantServiceTest");
logger.info(result.toString());
Assert.assertEquals(Status.REQUEST_PARAMS_NOT_VALID_ERROR,
result.get(Constants.STATUS));
// success
- result = tenantService.createTenant(loginUser, "test", "test", 1,
"TenantServiceTest");
+ result = tenantService.createTenant(loginUser, "test", 1,
"TenantServiceTest");
logger.info(result.toString());
Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
@@ -126,11 +124,11 @@ public class TenantServiceTest {
try {
// id not exist
Map<String, Object> result =
- tenantService.updateTenant(getLoginUser(), 912222,
tenantCode, tenantName, 1, "desc");
+ tenantService.updateTenant(getLoginUser(), 912222,
tenantCode, 1, "desc");
logger.info(result.toString());
// success
Assert.assertEquals(Status.TENANT_NOT_EXIST,
result.get(Constants.STATUS));
- result = tenantService.updateTenant(getLoginUser(), 1, tenantCode,
"TenantServiceTest001", 1, "desc");
+ result = tenantService.updateTenant(getLoginUser(), 1, tenantCode,
1, "desc");
logger.info(result.toString());
Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
} catch (Exception e) {
@@ -236,7 +234,6 @@ public class TenantServiceTest {
Tenant tenant = new Tenant();
tenant.setId(id);
tenant.setTenantCode(tenantCode);
- tenant.setTenantName(tenantName);
return tenant;
}
diff --git
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Tenant.java
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Tenant.java
index 1b2eea4..87674fe 100644
---
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Tenant.java
+++
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Tenant.java
@@ -43,11 +43,6 @@ public class Tenant {
private String tenantCode;
/**
- * tenant name
- */
- private String tenantName;
-
- /**
* description
*/
private String description;
@@ -97,14 +92,6 @@ public class Tenant {
this.tenantCode = tenantCode;
}
- public String getTenantName() {
- return tenantName;
- }
-
- public void setTenantName(String tenantName) {
- this.tenantName = tenantName;
- }
-
public int getQueueId() {
return queueId;
}
@@ -150,7 +137,6 @@ public class Tenant {
return "Tenant{" +
"id=" + id +
", tenantCode='" + tenantCode + '\'' +
- ", tenantName='" + tenantName + '\'' +
", queueId=" + queueId +
", queueName='" + queueName + '\'' +
", queue='" + queue + '\'' +
diff --git
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/User.java
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/User.java
index 89da171..2110fe2 100644
---
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/User.java
+++
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/User.java
@@ -80,12 +80,6 @@ public class User {
private String tenantCode;
/**
- * tenant name
- */
- @TableField(exist = false)
- private String tenantName;
-
- /**
* queue name
*/
@TableField(exist = false)
@@ -203,14 +197,6 @@ public class User {
this.alertGroup = alertGroup;
}
- public String getTenantName() {
- return tenantName;
- }
-
- public void setTenantName(String tenantName) {
- this.tenantName = tenantName;
- }
-
public String getTenantCode() {
return tenantCode;
}
@@ -272,7 +258,6 @@ public class User {
", tenantId=" + tenantId +
", state=" + state +
", tenantCode='" + tenantCode + '\'' +
- ", tenantName='" + tenantName + '\'' +
", queueName='" + queueName + '\'' +
", alertGroup='" + alertGroup + '\'' +
", queue='" + queue + '\'' +
diff --git
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml
index e0ede93..ff9ab8f 100644
---
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml
+++
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml
@@ -25,7 +25,7 @@
and pd.name = #{processDefinitionName}
</select>
<select id="queryByDefineName"
resultType="org.apache.dolphinscheduler.dao.entity.ProcessDefinition">
- select pd.*,u.user_name,p.name as
project_name,t.tenant_code,t.tenant_name,q.queue,q.queue_name
+ select pd.*,u.user_name,p.name as
project_name,t.tenant_code,q.queue,q.queue_name
from t_ds_process_definition pd
JOIN t_ds_user u ON pd.user_id = u.id
JOIN t_ds_project p ON pd.project_id = p.id
diff --git
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TenantMapper.xml
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TenantMapper.xml
index fc9219c..93d4909 100644
---
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TenantMapper.xml
+++
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TenantMapper.xml
@@ -34,7 +34,7 @@
FROM t_ds_tenant t,t_ds_queue q
WHERE t.queue_id = q.id
<if test="searchVal != null and searchVal != ''">
- and t.tenant_name like concat('%', #{searchVal}, '%')
+ and t.tenant_code like concat('%', #{searchVal}, '%')
</if>
order by t.update_time desc
</select>
diff --git
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UserMapper.xml
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UserMapper.xml
index f219ad3..d1a3a90 100644
---
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UserMapper.xml
+++
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UserMapper.xml
@@ -32,7 +32,7 @@
</select>
<select id="queryUserPaging"
resultType="org.apache.dolphinscheduler.dao.entity.User">
select
u.id,u.user_name,u.user_password,u.user_type,u.email,u.phone,u.tenant_id,u.create_time,
- u.update_time,t.tenant_name,u.state,
+ u.update_time,t.tenant_code,u.state,
case when u.queue <![CDATA[ <> ]]> '' then u.queue else q.queue_name
end as queue, q.queue_name
from t_ds_user u
left join t_ds_tenant t on u.tenant_id=t.id
@@ -44,7 +44,7 @@
order by u.update_time desc
</select>
<select id="queryDetailsById"
resultType="org.apache.dolphinscheduler.dao.entity.User">
- select u.*, t.tenant_name,
+ select u.*, t.tenant_code,
case when u.queue <![CDATA[ <> ]]> '' then u.queue else q.queue_name
end as queue_name
from t_ds_user u
left join t_ds_tenant t on u.tenant_id=t.id
diff --git
a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapperTest.java
b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapperTest.java
index 76741a7..d36a26f 100644
---
a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapperTest.java
+++
b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapperTest.java
@@ -308,7 +308,6 @@ public class ResourceMapperTest {
Tenant tenant = new Tenant();
- tenant.setTenantName("ut tenant ");
tenant.setTenantCode("ut tenant code for resource");
int tenantInsertStatus = tenantMapper.insert(tenant);
diff --git
a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TenantMapperTest.java
b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TenantMapperTest.java
index 493e85b..a186070 100644
---
a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TenantMapperTest.java
+++
b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TenantMapperTest.java
@@ -137,12 +137,12 @@ public class TenantMapperTest {
Tenant tenant = insertOne();
tenant.setTenantCode("ut code");
- tenant.setTenantName("ut name");
tenant.setQueueId(queue.getId());
tenantMapper.updateById(tenant);
Page<Tenant> page = new Page(1,3);
- IPage<Tenant> tenantIPage = tenantMapper.queryTenantPaging(page,
tenant.getTenantName());
+ //tenant.getTenantCode() used instead of tenant.getTenantName()
+ IPage<Tenant> tenantIPage = tenantMapper.queryTenantPaging(page,
tenant.getTenantCode());
Assert.assertNotEquals(tenantIPage.getTotal(), 0);
}
diff --git
a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserMapperTest.java
b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserMapperTest.java
index 7b1849e..d1d5ffe 100644
---
a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserMapperTest.java
+++
b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserMapperTest.java
@@ -170,7 +170,6 @@ public class UserMapperTest {
private Tenant insertOneTenant(){
Tenant tenant = new Tenant();
tenant.setTenantCode("dolphin");
- tenant.setTenantName("dolphin test");
tenant.setDescription("dolphin user use");
tenant.setQueue("1");
tenant.setCreateTime(new Date());
@@ -186,7 +185,6 @@ public class UserMapperTest {
private Tenant insertOneTenant(Queue queue){
Tenant tenant = new Tenant();
tenant.setTenantCode("dolphin");
- tenant.setTenantName("dolphin test");
tenant.setDescription("dolphin user use");
tenant.setQueueId(queue.getId());
tenant.setQueue(queue.getQueue());
diff --git
a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumerTest.java
b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumerTest.java
index 32881b5..a9c6985 100644
---
a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumerTest.java
+++
b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumerTest.java
@@ -78,7 +78,6 @@ public class TaskPriorityQueueConsumerTest {
Tenant tenant = new Tenant();
tenant.setId(1);
tenant.setTenantCode("journey");
- tenant.setTenantName("journey");
tenant.setDescription("journey");
tenant.setQueueId(1);
tenant.setCreateTime(new Date());
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue
index feaba86..33635e8 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue
@@ -24,7 +24,7 @@
v-for="item in itemList"
:key="item.id"
:value="item.id"
- :label="item.tenantName">
+ :label="item.tenantCode">
</x-option>
</x-select>
</template>
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue
index eb20ff9..5fd08c0 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue
@@ -35,18 +35,6 @@
</template>
</m-list-box-f>
<m-list-box-f>
- <template slot="name"><strong>*</strong>{{$t('Tenant
Name')}}</template>
- <template slot="content">
- <x-input
- type="input"
- v-model="tenantName"
- maxlength="60"
- :placeholder="$t('Please enter name')"
- autocomplete="off">
- </x-input>
- </template>
- </m-list-box-f>
- <m-list-box-f>
<template slot="name"><strong>*</strong>{{$t('Queue')}}</template>
<template slot="content">
<x-select v-model="queueId">
@@ -89,7 +77,6 @@
queueList: [],
queueId: '',
tenantCode: '',
- tenantName: '',
description: '',
}
},
@@ -142,16 +129,6 @@
this.$message.warning(`${i18n.$t('Please enter tenant code in
English')}`)
return false
}
- if (!this.tenantName.replace(/\s*/g,"")) {
- this.$message.warning(`${i18n.$t('Please enter name')}`)
- return false
- }
- // Verify tenant name cannot contain special characters
- let isSpecial = /[~#^$@%&!*()<>《》:;'"{}【】 ]/gi
- if (isSpecial.test(this.tenantName)) {
- this.$message.warning(`${i18n.$t('Please enter tenant name without
special characters')}`)
- return false
- }
return true
},
@@ -159,7 +136,6 @@
// 提交
let param = {
tenantCode: this.tenantCode,
- tenantName: this.tenantName,
queueId: this.queueId,
description: this.description
}
@@ -189,7 +165,6 @@
this.queueId = this.item.queueId
})
this.tenantCode = this.item.tenantCode
- this.tenantName = this.item.tenantName
this.description = this.item.description
}
})
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue
index d0029d2..50f4d40 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue
@@ -26,9 +26,6 @@
<span>{{$t('Tenant Code')}}</span>
</th>
<th>
- <span>{{$t('Tenant Name')}}</span>
- </th>
- <th>
<span>{{$t('Description')}}</span>
</th>
<th>
@@ -54,11 +51,6 @@
</span>
</td>
<td>
- <span>
- {{item.tenantName}}
- </span>
- </td>
- <td>
<span v-if="item.description" class="ellipsis"
v-tooltip.large.top.start.light="{text: item.description, maxWidth:
'500px'}">{{item.description}}</span>
<span v-else>-</span>
</td>
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
index b284ca4..8814cdb 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
@@ -232,7 +232,7 @@
this.tenantList = _.map(arr, v => {
return {
id: v.id,
- code: v.tenantName
+ code: v.tenantCode
}
})
this.$nextTick(() => {
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
index 7868107..091c64b 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
@@ -65,7 +65,7 @@
<td>
<span>{{item.userType === 'GENERAL_USER' ? `${$t('Ordinary
users')}` : `${$t('Administrator')}`}}</span>
</td>
- <td><span>{{item.tenantName || '-'}}</span></td>
+ <td><span>{{item.tenantCode || '-'}}</span></td>
<td><span>{{item.queue || '-'}}</span></td>
<td>
<span>{{item.email || '-'}}</span>
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/_source/info.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/_source/info.vue
index f199527..da6196e 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/_source/info.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/_source/info.vue
@@ -43,7 +43,7 @@
<m-list-box-f v-ps="['GENERAL_USER']">
<template slot="name">{{$t('Tenant')}}</template>
<template slot="content">
- <span class="sp1">{{userInfo.tenantName}}</span>
+ <span class="sp1">{{userInfo.tenantCode}}</span>
</template>
</m-list-box-f>
<m-list-box-f v-ps="['GENERAL_USER']">
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
b/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
index d1d2389..363dee7 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
@@ -282,7 +282,7 @@ export default {
const list = res.data
list.unshift({
id: -1,
- tenantName: 'default'
+ tenantCode: 'default'
})
state.tenantAllList = list
resolve(list)
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index cb32a62..229a98b 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -182,12 +182,10 @@ export default {
'Last heartbeat time': 'Last heartbeat time',
'Edit Tenant': 'Edit Tenant',
'Tenant Code': 'Tenant Code',
- 'Tenant Name': 'Tenant Name',
Queue: 'Yarn Queue',
'Please select a queue': 'default is tenant association queue',
'Please enter the tenant code in English': 'Please enter the tenant code in
English',
'Please enter tenant code in English': 'Please enter tenant code in English',
- 'Please enter tenant name without special characters': 'Please enter tenant
name without special characters',
'Edit User': 'Edit User',
Tenant: 'Tenant',
Email: 'Email',
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index 8bedab1..9f4cae2 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -185,11 +185,9 @@ export default {
'Last heartbeat time': '最后心跳时间',
'Edit Tenant': '编辑租户',
'Tenant Code': '租户编码',
- 'Tenant Name': '租户名称',
Queue: 'Yarn 队列',
'Please enter the tenant code in English': '请输入租户编码只允许英文',
'Please enter tenant code in English': '请输入英文租户编码',
- 'Please enter tenant name without special characters': '请输入不包含特殊字符的租户名称',
'Edit User': '编辑用户',
Tenant: '租户',
Email: '邮件',
diff --git
a/e2e/src/test/java/org/apache/dolphinscheduler/locator/security/TenantManageLocator.java
b/e2e/src/test/java/org/apache/dolphinscheduler/locator/security/TenantManageLocator.java
index 2f7a5f9..d9316df 100644
---
a/e2e/src/test/java/org/apache/dolphinscheduler/locator/security/TenantManageLocator.java
+++
b/e2e/src/test/java/org/apache/dolphinscheduler/locator/security/TenantManageLocator.java
@@ -27,15 +27,13 @@ public class TenantManageLocator{
public static final By TENANT_INPUT_CODE =
By.xpath("//div[2]/div/div/div[2]/div/input");
- public static final By TENANT_INPUT_NAME =
By.xpath("//div[2]/div[2]/div/input");
-
public static final By QUEUE = By.xpath("//textarea");
public static final By DESCRIPTION = By.xpath("//textarea");
public static final By SUBMIT_BUTTON = By.xpath("//div[3]/button[2]/span");
- public static final By DELETE_TENANT_BUTTON =
By.xpath("//div[3]/div[1]/div/table/tr[2]/td[8]/span/button");
+ public static final By DELETE_TENANT_BUTTON =
By.xpath("//div[3]/div[1]/div/table/tr[2]/td[7]/span/button");
public static final By CONFIRM_DELETE_TENANT_BUTTON =
By.xpath("//div[2]/div/button[2]/span");
diff --git
a/e2e/src/test/java/org/apache/dolphinscheduler/page/security/TenantManagePage.java
b/e2e/src/test/java/org/apache/dolphinscheduler/page/security/TenantManagePage.java
index 44f45f1..9a8bced 100644
---
a/e2e/src/test/java/org/apache/dolphinscheduler/page/security/TenantManagePage.java
+++
b/e2e/src/test/java/org/apache/dolphinscheduler/page/security/TenantManagePage.java
@@ -55,7 +55,6 @@ public class TenantManagePage extends PageCommon {
// tenant data
sendInput(TenantManageLocator.TENANT_INPUT_CODE,
tenantManageData.getTenantData("tenantCode"));
- sendInput(TenantManageLocator.TENANT_INPUT_NAME,
tenantManageData.getTenantData("tenantName"));
sendInput(TenantManageLocator.QUEUE,
tenantManageData.getTenantData("queue"));
sendInput(TenantManageLocator.DESCRIPTION,
tenantManageData.getTenantData("description"));
diff --git a/e2e/src/test/resources/testData/security_zh_cn.yml
b/e2e/src/test/resources/testData/security_zh_cn.yml
index 89be444..40b41e7 100644
--- a/e2e/src/test/resources/testData/security_zh_cn.yml
+++ b/e2e/src/test/resources/testData/security_zh_cn.yml
@@ -29,7 +29,6 @@ userManage:
tenantManage:
tenantCode: selenium_tenant_code_1
- tenantName: selenium_tenant_Name
queue: default
description: create tenant test
tenantTitle: 租户管理 - DolphinScheduler
diff --git a/pom.xml b/pom.xml
index f760961..9220668 100644
--- a/pom.xml
+++ b/pom.xml
@@ -710,6 +710,7 @@
<!--<include>**/alert/utils/MailUtilsTest.java</include>-->
<include>**/alert/plugin/EmailAlertPluginTest.java</include>
<include>**/api/controller/ProcessDefinitionControllerTest.java</include>
+
<include>**/api/controller/TenantControllerTest.java</include>
<include>**/api/dto/resources/filter/ResourceFilterTest.java</include>
<include>**/api/dto/resources/visitor/ResourceTreeVisitorTest.java</include>
<includeDataxTaskTest>**/api/enums/testGetEnum.java</includeDataxTaskTest>
diff --git a/sql/create/release-1.0.0_schema/mysql/dolphinscheduler_ddl.sql
b/sql/create/release-1.0.0_schema/mysql/dolphinscheduler_ddl.sql
index ac0851a..86b474d 100644
--- a/sql/create/release-1.0.0_schema/mysql/dolphinscheduler_ddl.sql
+++ b/sql/create/release-1.0.0_schema/mysql/dolphinscheduler_ddl.sql
@@ -381,7 +381,6 @@ DROP TABLE IF EXISTS `t_escheduler_tenant`;
CREATE TABLE `t_escheduler_tenant` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'key',
`tenant_code` varchar(64) DEFAULT NULL COMMENT 'tenant code',
- `tenant_name` varchar(64) DEFAULT NULL COMMENT 'tenant name',
`desc` varchar(256) DEFAULT NULL COMMENT 'description',
`queue_id` int(11) DEFAULT NULL COMMENT 'queue id',
`create_time` datetime DEFAULT NULL COMMENT 'create time',
diff --git
a/sql/create/release-1.2.0_schema/postgresql/dolphinscheduler_ddl.sql
b/sql/create/release-1.2.0_schema/postgresql/dolphinscheduler_ddl.sql
index 75a5d56..14d99e1 100644
--- a/sql/create/release-1.2.0_schema/postgresql/dolphinscheduler_ddl.sql
+++ b/sql/create/release-1.2.0_schema/postgresql/dolphinscheduler_ddl.sql
@@ -584,7 +584,6 @@ DROP TABLE IF EXISTS t_ds_tenant;
CREATE TABLE t_ds_tenant (
id int NOT NULL ,
tenant_code varchar(64) DEFAULT NULL ,
- tenant_name varchar(64) DEFAULT NULL ,
description varchar(256) DEFAULT NULL ,
queue_id int DEFAULT NULL ,
create_time timestamp DEFAULT NULL ,
diff --git a/sql/dolphinscheduler-postgre.sql b/sql/dolphinscheduler-postgre.sql
index e2f5ebd..e91527e 100644
--- a/sql/dolphinscheduler-postgre.sql
+++ b/sql/dolphinscheduler-postgre.sql
@@ -608,7 +608,6 @@ DROP TABLE IF EXISTS t_ds_tenant;
CREATE TABLE t_ds_tenant (
id int NOT NULL ,
tenant_code varchar(64) DEFAULT NULL ,
- tenant_name varchar(64) DEFAULT NULL ,
description varchar(256) DEFAULT NULL ,
queue_id int DEFAULT NULL ,
create_time timestamp DEFAULT NULL ,
diff --git a/sql/dolphinscheduler_mysql.sql b/sql/dolphinscheduler_mysql.sql
index 9039a19..6065018 100644
--- a/sql/dolphinscheduler_mysql.sql
+++ b/sql/dolphinscheduler_mysql.sql
@@ -756,7 +756,6 @@ DROP TABLE IF EXISTS `t_ds_tenant`;
CREATE TABLE `t_ds_tenant` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'key',
`tenant_code` varchar(64) DEFAULT NULL COMMENT 'tenant code',
- `tenant_name` varchar(64) DEFAULT NULL COMMENT 'tenant name',
`description` varchar(256) DEFAULT NULL,
`queue_id` int(11) DEFAULT NULL COMMENT 'queue id',
`create_time` datetime DEFAULT NULL COMMENT 'create time',
