From a3a41ac8ee55f9bf59847a32c4059a7fb758fe01 Mon Sep 17 00:00:00 2001 From: samz406 Date: Tue, 23 Apr 2019 15:21:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?TENANT=5FNAME=5FEXIST=20=E8=BF=99=E9=87=8C?= =?UTF-8?q?=E5=AE=9E=E9=99=85=E9=AA=8C=E8=AF=81=E7=9A=84=E6=98=AF=E7=A7=9F?= =?UTF-8?q?=E6=88=B7=E7=BC=96=E7=A0=81=EF=BC=8C=E4=B8=8D=E6=98=AF=E7=A7=9F?= =?UTF-8?q?=E6=88=B7=E5=90=8D=E7=A7=B0=E6=98=AF=E5=90=A6=E5=94=AF=E4=B8=80?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TENANT_NAME_EXIST 这里实际验证的是租户编码，不是租户名称是否唯一。 --- .../src/main/java/cn/escheduler/api/enums/Status.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/escheduler-api/src/main/java/cn/escheduler/api/enums/Status.java b/escheduler-api/src/main/java/cn/escheduler/api/enums/Status.java index 9f8b7efc14..fe9091ec27 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/enums/Status.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/enums/Status.java @@ -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"), From ce7ececda69905ac34c54b6a4e9b072a48c99208 Mon Sep 17 00:00:00 2001 From: samz406 Date: Tue, 23 Apr 2019 16:25:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=97=B6=E5=A1=AB=E5=86=99=E5=B7=B2=E7=BB=8F=E5=AD=98=E7=9A=84?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更新用户名如果填写已经存在的用户名会报错。 --- .../main/java/cn/escheduler/api/service/UsersService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/UsersService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/UsersService.java index 82e1a850f5..9ddb74891e 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/UsersService.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/service/UsersService.java @@ -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, userId); + return result; + } user.setUserName(userName); } From dd35addfb6dd68841709ab3664f237cf239e4973 Mon Sep 17 00:00:00 2001 From: samz406 Date: Tue, 23 Apr 2019 16:27:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=97=B6=E5=A1=AB=E5=86=99=E5=B7=B2=E7=BB=8F=E5=AD=98=E7=9A=84?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更新用户名如果填写已经存在的用户名会报错。 --- .../src/main/java/cn/escheduler/api/service/UsersService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/UsersService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/UsersService.java index 9ddb74891e..fb9e4e99f3 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/UsersService.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/service/UsersService.java @@ -218,7 +218,7 @@ public class UsersService extends BaseService { if (StringUtils.isNotEmpty(userName)) { User tempUser = userMapper.queryByUserName(userName); if (tempUser != null && tempUser.getId() != userId) { - putMsg(result, Status.USER_NAME_EXIST, userId); + putMsg(result, Status.USER_NAME_EXIST, userName); return result; } user.setUserName(userName); From 1908e6d174fb15ff527e1bdffac8da4c8b858cf5 Mon Sep 17 00:00:00 2001 From: samz406 Date: Tue, 23 Apr 2019 16:33:39 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=97=B6=E5=A1=AB=E5=86=99=E5=B7=B2=E7=BB=8F=E5=AD=98=E7=9A=84?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更新用户名如果填写已经存在的用户名会报错。 --- .../src/main/java/cn/escheduler/api/service/UsersService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/UsersService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/UsersService.java index fb9e4e99f3..33cd50bac0 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/UsersService.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/service/UsersService.java @@ -218,7 +218,7 @@ public class UsersService extends BaseService { if (StringUtils.isNotEmpty(userName)) { User tempUser = userMapper.queryByUserName(userName); if (tempUser != null && tempUser.getId() != userId) { - putMsg(result, Status.USER_NAME_EXIST, userName); + putMsg(result, Status.USER_NAME_EXIST); return result; } user.setUserName(userName);