From bbb56ad482805e3c02f4a8a89ad5252653ec9ade Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Sun, 28 Mar 2021 21:02:56 +0800
Subject: [PATCH] LDAP

---
 .../constants/ldap/ActiveDirectoryUser.java     | 17 ++++++++++++-----
 .../constants/ldap/OrganizationalUnit.java      |  9 +++++++--
 .../main/java/org/maxkey/domain/UserInfo.java   | 12 +++++++++++-
 .../org/maxkey/persistence/ldap/LdapUtils.java  |  7 +++++--
 4 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ldap/ActiveDirectoryUser.java b/maxkey-core/src/main/java/org/maxkey/constants/ldap/ActiveDirectoryUser.java
index 59f492e2..ee13f0f2 100644
--- a/maxkey-core/src/main/java/org/maxkey/constants/ldap/ActiveDirectoryUser.java
+++ b/maxkey-core/src/main/java/org/maxkey/constants/ldap/ActiveDirectoryUser.java
@@ -115,6 +115,8 @@ public class ActiveDirectoryUser {
      *	主要组			Set Primary Group 	primaryGroupID
 	 */
 
+	public static final String CN 							= "cn";
+	public static final String NAME 						= "name";
 	
 	public static final String GIVENNAME 					= "givenName";
 	public static final String SN 							= "sn";
@@ -123,6 +125,7 @@ public class ActiveDirectoryUser {
 	public static final String PHYSICALDELIVERYOFFICENAME 	= "physicalDeliveryOfficeName";
 	public static final String MAIL 						= "mail";
 	public static final String WWWHOMEPAGE 					= "wwwHomePage";
+	public static final String DISPLAYNAME 					= "displayName";
 
 	public static final String TELEPHONENUMBER 				= "telephoneNumber";
 	public static final String OTHERTELEPHONE 				= "otherTelephone";
@@ -135,6 +138,8 @@ public class ActiveDirectoryUser {
 	public static final String IPPHONE 						= "ipPhone";
 	public static final String OTHERIPPHONE 				= "otherIpPhone";
 	public static final String INFO 						= "info";
+	public static final String HOMEPHONE 					= "homePhone";
+	
 
 	public static final String USERPRINCIPALNAME 			= "userPrincipalName";
 	public static final String SAMACCOUNTNAME 				= "sAMAccountname";
@@ -143,17 +148,19 @@ public class ActiveDirectoryUser {
 	public static final String USERACCOUNTCONTROL		 	= "userAccountControl   ";
 	public static final String PWDLASTSET 					= "pwdLastSet";
 	public static final String ACCOUNTEXPIRES 				= "accountExpires";
-
+	
+	public static final String CO 							= "co";
+	public static final String C 							= "c";
+	public static final String COUNTRYCODE 					= "countryCode";
+	public static final String ST 							= "st";
+	public static final String L 							= "l";
 	public static final String STREETADDRESS 				= "streetAddress";
 	public static final String POSTOFFICEBOX 				= "postOfficeBox";
 	public static final String POSTALCODE 					= "postalCode";
-	public static final String L 							= "l";
-	public static final String ST 							= "st";
-	public static final String C 							= "c";
 
 	public static final String TITLE 						= "title";
-	public static final String DEPARTMENT 					= "department";
 	public static final String COMPANY 						= "company";
+	public static final String DEPARTMENT 					= "department";
 	public static final String MANAGER 						= "manager";
 	public static final String DIRECTREPORTS 				= "directReports";
 
diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ldap/OrganizationalUnit.java b/maxkey-core/src/main/java/org/maxkey/constants/ldap/OrganizationalUnit.java
index 6b12d4c9..7628af23 100644
--- a/maxkey-core/src/main/java/org/maxkey/constants/ldap/OrganizationalUnit.java
+++ b/maxkey-core/src/main/java/org/maxkey/constants/ldap/OrganizationalUnit.java
@@ -70,8 +70,13 @@ public class OrganizationalUnit {
 	/**OrganizationalUnit physicalDeliveryOfficeName*/
 	public static final String PHYSICALDELIVERYOFFICENAME    = "physicalDeliveryOfficeName";
 	/**OrganizationalUnit st*/
-	public static final String ST                            = "st";
+	public static final String ST                            = "st";//省/州
 	/**OrganizationalUnit l*/
-	public static final String L                             = "l";
+	public static final String L                             = "l";//县市
+
+	public static final String CO                            = "co"; //中国
+	public static final String C                             = "c"; //CN
+	public static final String COUNTRYCODE                   = "countryCode";//156
+	public static final String NAME                   		 = "name";
 	
 }
diff --git a/maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java b/maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java
index f7d9ddf5..1f392fe4 100644
--- a/maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java
+++ b/maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java
@@ -166,6 +166,8 @@ public class UserInfo extends JpaBaseDomain {
     protected String workPostalCode;
     @Column
     protected String workFax;
+    
+    protected String workOfficeName;
     // for home
     @Column
     protected String homeCountry;
@@ -417,7 +419,15 @@ public class UserInfo extends JpaBaseDomain {
         this.password = password;
     }
 
-    public String getDecipherable() {
+    public String getWorkOfficeName() {
+		return workOfficeName;
+	}
+
+	public void setWorkOfficeName(String workOfficeName) {
+		this.workOfficeName = workOfficeName;
+	}
+
+	public String getDecipherable() {
         return decipherable;
     }
 
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 70848669..1496a4de 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
@@ -273,9 +273,12 @@ public class LdapUtils {
         try {
             if (attrs.get(elem) != null) {
                 for (int i = 0; i < attrs.get(elem).size(); i++) {
-                    value += "," + attrs.get(elem).get(i).toString();
+                	if(i == 0) {
+                		value += attrs.get(elem).get(i).toString();
+                	}else {
+                		value += "," + attrs.get(elem).get(i).toString();
+                	}
                 }
-                value = value.substring(1);
             }
         } catch (NamingException e) {
             e.printStackTrace();
-- 
GitLab