From 0a067bce36b5e81d40780c0c96fc777e843ccf01 Mon Sep 17 00:00:00 2001
From: fanghanyun <fanghanyun@shizhuang-inc.com>
Date: Tue, 9 Mar 2021 10:19:08 +0800
Subject: [PATCH] Support AD LDAP

---
 .../xiaojukeji/kafka/manager/common/entity/ResultStatus.java    | 2 +-
 .../xiaojukeji/kafka/manager/common/entity/vo/ResultStatus.java | 1 -
 .../kafka/manager/common/entity/vo/rd/ResultStatus.java         | 2 --
 .../kafka/manager/common/utils/ldap/LDAPAuthentication.java     | 1 -
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ResultStatus.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ResultStatus.java
index fd33cd9c..8f0f229b 100644
--- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ResultStatus.java
+++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ResultStatus.java
@@ -73,7 +73,6 @@ public enum ResultStatus {
     QUOTA_NOT_EXIST(7113, "quota not exist, please check clusterId, topicName and appId"),
     CONSUMER_GROUP_NOT_EXIST(7114, "consumerGroup not exist"),
     TOPIC_BIZ_DATA_NOT_EXIST(7115, "topic biz data not exist, please sync topic to db"),
-    LDAP_AUTHENTICATION_FAILED(7116, "LDAP authentication failed"),
 
     // 资源已存在
     RESOURCE_ALREADY_EXISTED(7200, "资源已经存在"),
@@ -107,6 +106,7 @@ public enum ResultStatus {
     STORAGE_UPLOAD_FILE_FAILED(8050, "upload file failed"),
     STORAGE_FILE_TYPE_NOT_SUPPORT(8051, "File type not support"),
     STORAGE_DOWNLOAD_FILE_FAILED(8052, "download file failed"),
+    LDAP_AUTHENTICATION_FAILED(8053, "LDAP authentication failed"),
 
     ;
 
diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/ResultStatus.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/ResultStatus.java
index c25ab28b..663dd0a6 100644
--- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/ResultStatus.java
+++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/ResultStatus.java
@@ -73,7 +73,6 @@ public enum ResultStatus {
     QUOTA_NOT_EXIST(7113, "quota not exist, please check clusterId, topicName and appId"),
     CONSUMER_GROUP_NOT_EXIST(7114, "consumerGroup not exist"),
     TOPIC_BIZ_DATA_NOT_EXIST(7115, "topic biz data not exist, please sync topic to db"),
-    LDAP_AUTHENTICATION_FAILED(7116, "LDAP authentication failed"),
 
 
     // 资源已存在
diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/rd/ResultStatus.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/rd/ResultStatus.java
index c25ab28b..94acb56d 100644
--- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/rd/ResultStatus.java
+++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/rd/ResultStatus.java
@@ -73,8 +73,6 @@ public enum ResultStatus {
     QUOTA_NOT_EXIST(7113, "quota not exist, please check clusterId, topicName and appId"),
     CONSUMER_GROUP_NOT_EXIST(7114, "consumerGroup not exist"),
     TOPIC_BIZ_DATA_NOT_EXIST(7115, "topic biz data not exist, please sync topic to db"),
-    LDAP_AUTHENTICATION_FAILED(7116, "LDAP authentication failed"),
-
 
     // 资源已存在
     RESOURCE_ALREADY_EXISTED(7200, "资源已经存在"),
diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/ldap/LDAPAuthentication.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/ldap/LDAPAuthentication.java
index 723aaa75..eff3bc25 100644
--- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/ldap/LDAPAuthentication.java
+++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/ldap/LDAPAuthentication.java
@@ -1,7 +1,6 @@
 package com.xiaojukeji.kafka.manager.common.utils.ldap;
 
 import com.xiaojukeji.kafka.manager.common.utils.ValidateUtils;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;