From dd0e80cd2c8b67fa66c3bad1674fb0e0c7ccb3d9 Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Sun, 21 Mar 2021 23:08:29 +0800
Subject: [PATCH] EXTEND

---
 .../org/maxkey/constants/ldap/InetOrgPerson.java  |  5 +++++
 .../persistence/ldap/ActiveDirectoryUtils.java    |  8 --------
 .../org/maxkey/persistence/ldap/LdapUtils.java    | 15 ---------------
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ldap/InetOrgPerson.java b/maxkey-core/src/main/java/org/maxkey/constants/ldap/InetOrgPerson.java
index 7194dec7..8fd62556 100644
--- a/maxkey-core/src/main/java/org/maxkey/constants/ldap/InetOrgPerson.java
+++ b/maxkey-core/src/main/java/org/maxkey/constants/ldap/InetOrgPerson.java
@@ -122,5 +122,10 @@ public class InetOrgPerson {
 	/**inetOrgPerson x500uniqueIdentifier*/
 	public static final String X500UNIQUEIDENTIFIER          = "x500uniqueIdentifier";
 	
+	//MaxKey EXTEND
+	public static final String mobile 						 = "mobile";
+	public static final String manager 				    	 = "manager";
+    public static final String department 				     = "department";
+	
 
 }
diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/ldap/ActiveDirectoryUtils.java b/maxkey-core/src/main/java/org/maxkey/persistence/ldap/ActiveDirectoryUtils.java
index 95366289..96235a67 100644
--- a/maxkey-core/src/main/java/org/maxkey/persistence/ldap/ActiveDirectoryUtils.java
+++ b/maxkey-core/src/main/java/org/maxkey/persistence/ldap/ActiveDirectoryUtils.java
@@ -33,14 +33,6 @@ import org.slf4j.LoggerFactory;
 public class ActiveDirectoryUtils extends LdapUtils {
     private final static Logger _logger = LoggerFactory.getLogger(ActiveDirectoryUtils.class);
 
-    public final static String sAMAccountName = "sAMAccountName";
-    public final static String unicodePwd = "unicodePwd";
-    public final static String CN = "CN";
-
-    public final static String servicePrincipalName = "servicePrincipalName";
-    public final static String userPrincipalName = "userPrincipalName";
-    public final static String userAccountControl = "userAccountControl";
-
     protected String domain;
 
     /**
diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/ldap/LdapUtils.java b/maxkey-core/src/main/java/org/maxkey/persistence/ldap/LdapUtils.java
index 330a100d..6e70e2b3 100644
--- a/maxkey-core/src/main/java/org/maxkey/persistence/ldap/LdapUtils.java
+++ b/maxkey-core/src/main/java/org/maxkey/persistence/ldap/LdapUtils.java
@@ -40,21 +40,6 @@ public class LdapUtils {
     public static final  String propertyDomain = "domain";
     public static final  String propertyTrustStore = "trustStore";
     public static final  String propertyTrustStorePassword = "trustStorePassword";
-            
-    public static final  String uid = "uid";
-    public static final  String userPassword = "userPassword";
-    public static final  String cn = "cn";
-    public static final  String displayName = "displayName";
-    public static final  String givenName = "givenName";
-    public static final  String sn = "sn";
-    public static final  String mobile = "mobile";
-    public static final  String mail = "mail";
-    public static final  String employeeNumber = "employeeNumber";
-    public static final  String ou = "ou";
-    public static final  String manager = "manager";
-    public static final  String department = "department";
-    public static final  String departmentNumber = "departmentNumber";
-    public static final  String title = "title";
 
     protected DirContext ctx;
     protected String baseDN;
-- 
GitLab