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

Author: shimingxy

maxkey-authentications/maxkey-authentication-provider-mgt/src/main/java/org/dromara/maxkey/authn/realm/ldap/ActiveDirectoryServer.java

@@ -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;
 

maxkey-authentications/maxkey-authentication-provider-mgt/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealmService.java

@@ -23,8 +23,8 @@
 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;

maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/ActiveDirectoryServer.java

@@ -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;
 

maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealmService.java

@@ -23,8 +23,8 @@
 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;

maxkey-common/src/main/java/org/dromara/maxkey/ldap/ActiveDirectoryUtils.java renamed to maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/ActiveDirectoryUtils.java

@@ -15,14 +15,15 @@
  */
 
 
-package org.dromara.maxkey.ldap;
+package org.dromara.maxkey.ldap.activedirectory;
 
 import java.util.Properties;
 
 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;
 

maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/ActiveDirectoryUser.java renamed to maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUser.java

@@ -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;

maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/ActiveDirectoryUserAccountControl.java renamed to maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUserAccountControl.java

@@ -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

maxkey-core/src/test/java/org/dromara/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java

@@ -20,7 +20,7 @@
 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 {

maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AttributeStatementGenerator.java

@@ -29,7 +29,7 @@
 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;

maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectoryOrganizationService.java

@@ -33,8 +33,8 @@
 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;

maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectorySynchronizerService.java

@@ -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;

maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java

@@ -34,9 +34,9 @@
 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;

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfLdapContextController.java

@@ -23,8 +23,8 @@
 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;