Unverified Commit 49fdee0c authored by easyscheduler's avatar easyscheduler Committed by GitHub
Browse files

Merge pull request #110 from samz406/master 

TENANT_NAME_EXIST 这里实际验证的是租户编码，不是租户名称是否唯一。
parents e2eab11e 1908e6d1

escheduler-api/src/main/java/cn/escheduler/api/enums/Status.java

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ public enum Status { 
    HDFS_OPERATION_ERROR(10006, "hdfs operation error"),

    UPDATE_FAILED(10007, "updateProcessInstance failed"),

    TASK_INSTANCE_HOST_NOT_FOUND(10008, "task instance does not set host"),

    TENANT_NAME_EXIST(10009, "tenant name already exists"),

    TENANT_NAME_EXIST(10009, "tenant code already exists"),

    USER_NOT_EXIST(10010, "user {0} not exists"),

    ALERT_GROUP_NOT_EXIST(10011, "alarm group not found"),

    ALERT_GROUP_EXIST(10012, "alarm group already exists"),

escheduler-api/src/main/java/cn/escheduler/api/service/UsersService.java

+5 −0
Original line number Diff line number Diff line
@@ -216,6 +216,11 @@ public class UsersService extends BaseService { 
        Date now = new Date();



        if (StringUtils.isNotEmpty(userName)) {

            User tempUser = userMapper.queryByUserName(userName);

            if (tempUser != null && tempUser.getId() != userId) {

                putMsg(result, Status.USER_NAME_EXIST);

                return result;

            }

            user.setUserName(userName);

        }