This commit is contained in:
MaxKey 2021-03-28 21:02:56 +08:00
parent c18b5de9ac
commit bbb56ad482
4 changed files with 35 additions and 10 deletions

View File

@ -115,6 +115,8 @@ public class ActiveDirectoryUser {
* 主要组 Set Primary Group primaryGroupID * 主要组 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 GIVENNAME = "givenName";
public static final String SN = "sn"; public static final String SN = "sn";
@ -123,6 +125,7 @@ public class ActiveDirectoryUser {
public static final String PHYSICALDELIVERYOFFICENAME = "physicalDeliveryOfficeName"; public static final String PHYSICALDELIVERYOFFICENAME = "physicalDeliveryOfficeName";
public static final String MAIL = "mail"; public static final String MAIL = "mail";
public static final String WWWHOMEPAGE = "wwwHomePage"; public static final String WWWHOMEPAGE = "wwwHomePage";
public static final String DISPLAYNAME = "displayName";
public static final String TELEPHONENUMBER = "telephoneNumber"; public static final String TELEPHONENUMBER = "telephoneNumber";
public static final String OTHERTELEPHONE = "otherTelephone"; public static final String OTHERTELEPHONE = "otherTelephone";
@ -135,6 +138,8 @@ public class ActiveDirectoryUser {
public static final String IPPHONE = "ipPhone"; public static final String IPPHONE = "ipPhone";
public static final String OTHERIPPHONE = "otherIpPhone"; public static final String OTHERIPPHONE = "otherIpPhone";
public static final String INFO = "info"; public static final String INFO = "info";
public static final String HOMEPHONE = "homePhone";
public static final String USERPRINCIPALNAME = "userPrincipalName"; public static final String USERPRINCIPALNAME = "userPrincipalName";
public static final String SAMACCOUNTNAME = "sAMAccountname"; public static final String SAMACCOUNTNAME = "sAMAccountname";
@ -144,16 +149,18 @@ public class ActiveDirectoryUser {
public static final String PWDLASTSET = "pwdLastSet"; public static final String PWDLASTSET = "pwdLastSet";
public static final String ACCOUNTEXPIRES = "accountExpires"; 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 STREETADDRESS = "streetAddress";
public static final String POSTOFFICEBOX = "postOfficeBox"; public static final String POSTOFFICEBOX = "postOfficeBox";
public static final String POSTALCODE = "postalCode"; 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 TITLE = "title";
public static final String DEPARTMENT = "department";
public static final String COMPANY = "company"; public static final String COMPANY = "company";
public static final String DEPARTMENT = "department";
public static final String MANAGER = "manager"; public static final String MANAGER = "manager";
public static final String DIRECTREPORTS = "directReports"; public static final String DIRECTREPORTS = "directReports";

View File

@ -70,8 +70,13 @@ public class OrganizationalUnit {
/**OrganizationalUnit physicalDeliveryOfficeName*/ /**OrganizationalUnit physicalDeliveryOfficeName*/
public static final String PHYSICALDELIVERYOFFICENAME = "physicalDeliveryOfficeName"; public static final String PHYSICALDELIVERYOFFICENAME = "physicalDeliveryOfficeName";
/**OrganizationalUnit st*/ /**OrganizationalUnit st*/
public static final String ST = "st"; public static final String ST = "st";///
/**OrganizationalUnit l*/ /**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";
} }

View File

@ -166,6 +166,8 @@ public class UserInfo extends JpaBaseDomain {
protected String workPostalCode; protected String workPostalCode;
@Column @Column
protected String workFax; protected String workFax;
protected String workOfficeName;
// for home // for home
@Column @Column
protected String homeCountry; protected String homeCountry;
@ -417,7 +419,15 @@ public class UserInfo extends JpaBaseDomain {
this.password = password; this.password = password;
} }
public String getDecipherable() { public String getWorkOfficeName() {
return workOfficeName;
}
public void setWorkOfficeName(String workOfficeName) {
this.workOfficeName = workOfficeName;
}
public String getDecipherable() {
return decipherable; return decipherable;
} }

View File

@ -273,9 +273,12 @@ public class LdapUtils {
try { try {
if (attrs.get(elem) != null) { if (attrs.get(elem) != null) {
for (int i = 0; i < attrs.get(elem).size(); i++) { 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) { } catch (NamingException e) {
e.printStackTrace(); e.printStackTrace();