把activedirectory相关移动到org.dromara.maxkey.ldap.activedirectory下

This commit is contained in:
shimingxy 2024-11-12 10:02:04 +08:00
parent 3728e769ea
commit 176355d7a6
13 changed files with 15 additions and 14 deletions

View File

@ -21,7 +21,7 @@
package org.dromara.maxkey.authn.realm.ldap;
import org.dromara.maxkey.authn.realm.IAuthenticationServer;
import org.dromara.maxkey.ldap.ActiveDirectoryUtils;
import org.dromara.maxkey.ldap.activedirectory.ActiveDirectoryUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

View File

@ -23,8 +23,8 @@ import java.util.concurrent.TimeUnit;
import org.dromara.maxkey.authn.realm.IAuthenticationServer;
import org.dromara.maxkey.crypto.password.PasswordReciprocal;
import org.dromara.maxkey.entity.cnf.CnfLdapContext;
import org.dromara.maxkey.ldap.ActiveDirectoryUtils;
import org.dromara.maxkey.ldap.LdapUtils;
import org.dromara.maxkey.ldap.activedirectory.ActiveDirectoryUtils;
import org.dromara.maxkey.persistence.service.CnfLdapContextService;
import com.github.benmanes.caffeine.cache.Cache;

View File

@ -21,7 +21,7 @@
package org.dromara.maxkey.authn.realm.ldap;
import org.dromara.maxkey.authn.realm.IAuthenticationServer;
import org.dromara.maxkey.ldap.ActiveDirectoryUtils;
import org.dromara.maxkey.ldap.activedirectory.ActiveDirectoryUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

View File

@ -23,8 +23,8 @@ import java.util.concurrent.TimeUnit;
import org.dromara.maxkey.authn.realm.IAuthenticationServer;
import org.dromara.maxkey.crypto.password.PasswordReciprocal;
import org.dromara.maxkey.entity.cnf.CnfLdapContext;
import org.dromara.maxkey.ldap.ActiveDirectoryUtils;
import org.dromara.maxkey.ldap.LdapUtils;
import org.dromara.maxkey.ldap.activedirectory.ActiveDirectoryUtils;
import org.dromara.maxkey.persistence.service.CnfLdapContextService;
import com.github.benmanes.caffeine.cache.Cache;

View File

@ -15,7 +15,7 @@
*/
package org.dromara.maxkey.ldap;
package org.dromara.maxkey.ldap.activedirectory;
import java.util.Properties;
@ -23,6 +23,7 @@ import javax.naming.Context;
import javax.naming.directory.DirContext;
import javax.naming.directory.SearchControls;
import org.dromara.maxkey.ldap.LdapUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

View File

@ -15,7 +15,7 @@
*/
package org.dromara.maxkey.ldap.constants;
package org.dromara.maxkey.ldap.activedirectory.constants;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;

View File

@ -15,7 +15,7 @@
*/
package org.dromara.maxkey.ldap.constants;
package org.dromara.maxkey.ldap.activedirectory.constants;
/** userAccountControl值得说明
* http://support.microsoft.com/zh-cn/kb/305144

View File

@ -20,7 +20,7 @@ package org.dromara.maxkey.persistence.ldap;
import javax.naming.NamingException;
import javax.naming.directory.DirContext;
import org.dromara.maxkey.ldap.ActiveDirectoryUtils;
import org.dromara.maxkey.ldap.activedirectory.ActiveDirectoryUtils;
public class ActiveDirectoryUtilsTest {
public static void main(String[] args) throws Exception {

View File

@ -29,7 +29,7 @@ import org.dromara.maxkey.entity.ExtraAttr;
import org.dromara.maxkey.entity.ExtraAttrs;
import org.dromara.maxkey.entity.apps.AppsSAML20Details;
import org.dromara.maxkey.entity.idm.UserInfo;
import org.dromara.maxkey.ldap.constants.ActiveDirectoryUser;
import org.dromara.maxkey.ldap.activedirectory.constants.ActiveDirectoryUser;
import org.opensaml.Configuration;
import org.opensaml.saml2.core.Attribute;
import org.opensaml.saml2.core.AttributeStatement;

View File

@ -33,8 +33,8 @@ import org.dromara.maxkey.constants.ConstsStatus;
import org.dromara.maxkey.entity.SynchroRelated;
import org.dromara.maxkey.entity.history.HistorySynchronizer;
import org.dromara.maxkey.entity.idm.Organizations;
import org.dromara.maxkey.ldap.ActiveDirectoryUtils;
import org.dromara.maxkey.ldap.LdapUtils;
import org.dromara.maxkey.ldap.activedirectory.ActiveDirectoryUtils;
import org.dromara.maxkey.ldap.constants.OrganizationalUnit;
import org.dromara.maxkey.synchronizer.AbstractSynchronizerService;
import org.dromara.maxkey.synchronizer.ISynchronizerService;

View File

@ -18,7 +18,7 @@
package org.dromara.maxkey.synchronizer.activedirectory;
import org.dromara.maxkey.entity.Synchronizers;
import org.dromara.maxkey.ldap.ActiveDirectoryUtils;
import org.dromara.maxkey.ldap.activedirectory.ActiveDirectoryUtils;
import org.dromara.maxkey.synchronizer.ISynchronizerService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

View File

@ -34,9 +34,9 @@ import org.dromara.maxkey.entity.SynchroRelated;
import org.dromara.maxkey.entity.history.HistorySynchronizer;
import org.dromara.maxkey.entity.idm.Organizations;
import org.dromara.maxkey.entity.idm.UserInfo;
import org.dromara.maxkey.ldap.ActiveDirectoryUtils;
import org.dromara.maxkey.ldap.LdapUtils;
import org.dromara.maxkey.ldap.constants.ActiveDirectoryUser;
import org.dromara.maxkey.ldap.activedirectory.ActiveDirectoryUtils;
import org.dromara.maxkey.ldap.activedirectory.constants.ActiveDirectoryUser;
import org.dromara.maxkey.synchronizer.AbstractSynchronizerService;
import org.dromara.maxkey.synchronizer.ISynchronizerService;
import org.dromara.maxkey.entity.SyncJobConfigField;

View File

@ -23,8 +23,8 @@ import org.dromara.maxkey.crypto.password.PasswordReciprocal;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.cnf.CnfLdapContext;
import org.dromara.maxkey.entity.idm.UserInfo;
import org.dromara.maxkey.ldap.ActiveDirectoryUtils;
import org.dromara.maxkey.ldap.LdapUtils;
import org.dromara.maxkey.ldap.activedirectory.ActiveDirectoryUtils;
import org.dromara.maxkey.persistence.service.CnfLdapContextService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;