diff --git a/build.gradle b/build.gradle index 811ad5c6a..ae898b5b6 100644 --- a/build.gradle +++ b/build.gradle @@ -47,12 +47,12 @@ def libjarsmapper=[ 'maxkey-identity-rest' :'maxkey_mgt', 'maxkey-identity-scim' :'maxkey_mgt', 'maxkey-web-mgt' :'maxkey_mgt', - 'maxkey-synchronizers' :'maxkey_mgt', - 'maxkey-synchronizers-activedirectory' :'maxkey_mgt', - 'maxkey-synchronizers-ldap' :'maxkey_mgt', - 'maxkey-synchronizers-dingtalk' :'maxkey_mgt', - 'maxkey-synchronizers-workweixin' :'maxkey_mgt', - 'maxkey-synchronizers-reorgdept' :'maxkey_mgt', + 'maxkey-synchronizer' :'maxkey_mgt', + 'maxkey-synchronizer-activedirectory' :'maxkey_mgt', + 'maxkey-synchronizer-ldap' :'maxkey_mgt', + 'maxkey-synchronizer-dingtalk' :'maxkey_mgt', + 'maxkey-synchronizer-workweixin' :'maxkey_mgt', + 'maxkey-synchronizer-reorgdept' :'maxkey_mgt', 'maxkey-boot-monitor' :'maxkey_monitor' ] diff --git a/config/build_standard.gradle b/config/build_standard.gradle index 64ea80b45..1495e9261 100644 --- a/config/build_standard.gradle +++ b/config/build_standard.gradle @@ -47,12 +47,12 @@ def libjarsmapper=[ 'maxkey-identity-rest' :'maxkey_mgt', 'maxkey-identity-scim' :'maxkey_mgt', 'maxkey-web-mgt' :'maxkey_mgt', - 'maxkey-synchronizers' :'maxkey_mgt', - 'maxkey-synchronizers-activedirectory' :'maxkey_mgt', - 'maxkey-synchronizers-ldap' :'maxkey_mgt', - 'maxkey-synchronizers-dingtalk' :'maxkey_mgt', - 'maxkey-synchronizers-workweixin' :'maxkey_mgt', - 'maxkey-synchronizers-reorgdept' :'maxkey_mgt', + 'maxkey-synchronizer' :'maxkey_mgt', + 'maxkey-synchronizer-activedirectory' :'maxkey_mgt', + 'maxkey-synchronizer-ldap' :'maxkey_mgt', + 'maxkey-synchronizer-dingtalk' :'maxkey_mgt', + 'maxkey-synchronizer-workweixin' :'maxkey_mgt', + 'maxkey-synchronizer-reorgdept' :'maxkey_mgt', 'maxkey-boot-monitor' :'maxkey_monitor' ] diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java index cf8551e16..e10184988 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java @@ -143,6 +143,7 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ socialsAssociate =new SocialsAssociate(); socialsAssociate.setProvider(provider); socialsAssociate.setSocialUserId(this.accountId); + socialsAssociate.setInstId(WebContext.getInst(WebContext.getRequest())); //for login String socialSignOnType= diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java index 2a969e46a..52f2f10cc 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java @@ -32,13 +32,13 @@ import org.springframework.jdbc.core.RowMapper; public class JdbcSocialsAssociateService implements SocialsAssociateService{ private static final Logger _logger = LoggerFactory.getLogger(JdbcSocialsAssociateService.class); - private static final String DEFAULT_DEFAULT_INSERT_STATEMENT = "insert into mxk_socials_associate(id, userid , username , provider , socialuserid , accesstoken , socialuserinfo , exattribute )values( ? , ? , ? , ? , ?, ? , ? , ?)"; + private static final String DEFAULT_DEFAULT_INSERT_STATEMENT = "insert into mxk_socials_associate(id, userid , username , provider , socialuserid , accesstoken , socialuserinfo , exattribute , instid)values( ? , ? , ? , ? , ?, ? , ? , ?, ?)"; - private static final String DEFAULT_DEFAULT_INSERT_STATEMENT_ORACLE = "insert into mxk_socials_associate(id, userid , username , provider , socialuserid , accesstoken , socialuserinfo , exattribute )values( ? , ? , ? , ? , ?, ? , ? , ?)"; + private static final String DEFAULT_DEFAULT_INSERT_STATEMENT_ORACLE = "insert into mxk_socials_associate(id, userid , username , provider , socialuserid , accesstoken , socialuserinfo , exattribute , instid)values( ? , ? , ? , ? , ?, ? , ? , ?, ?)"; - private static final String DEFAULT_DEFAULT_SIGNON_SELECT_STATEMENT = "select id, userid , username , provider , socialuserid , accesstoken , socialuserinfo , exattribute , createddate , updateddate from mxk_socials_associate where provider = ? and socialuserid = ?"; + private static final String DEFAULT_DEFAULT_SIGNON_SELECT_STATEMENT = "select id, userid , username , provider , socialuserid , accesstoken , socialuserinfo , exattribute , createddate , updateddate , instid from mxk_socials_associate where provider = ? and socialuserid = ?"; - private static final String DEFAULT_DEFAULT_BIND_SELECT_STATEMENT = "select id, userid , username , provider , socialuserid , accesstoken , socialuserinfo , exattribute , createddate , updateddate from mxk_socials_associate where userid = ?" ; + private static final String DEFAULT_DEFAULT_BIND_SELECT_STATEMENT = "select id, userid , username , provider , socialuserid , accesstoken , socialuserinfo , exattribute , createddate , updateddate , instid from mxk_socials_associate where userid = ?" ; private static final String DEFAULT_DEFAULT_DELETE_STATEMENT = "delete from mxk_socials_associate where userid = ? and provider = ?"; @@ -64,10 +64,13 @@ public class JdbcSocialsAssociateService implements SocialsAssociateService{ socialsAssociate.getSocialUserId(), socialsAssociate.getAccessToken(), socialsAssociate.getSocialUserInfo(), - socialsAssociate.getExAttribute()}, + socialsAssociate.getExAttribute(), + socialsAssociate.getInstId() + }, new int[] { Types.VARCHAR, Types.VARCHAR,Types.VARCHAR,Types.VARCHAR, - Types.VARCHAR,Types.VARCHAR, Types.VARCHAR,Types.VARCHAR + Types.VARCHAR,Types.VARCHAR, Types.VARCHAR,Types.VARCHAR, + Types.VARCHAR }); return true; } @@ -135,6 +138,7 @@ public class JdbcSocialsAssociateService implements SocialsAssociateService{ socialsAssociate.setExAttribute(rs.getString(8)); socialsAssociate.setCreatedDate(rs.getString(9)); socialsAssociate.setUpdatedDate(rs.getString(10)); + socialsAssociate.setInstId(rs.getString(11)); return socialsAssociate; } } diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialsAssociate.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialsAssociate.java index b269fbcac..057abd063 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialsAssociate.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialsAssociate.java @@ -39,6 +39,7 @@ public class SocialsAssociate extends JpaBaseEntity { private String exAttribute; private String createdDate; private String updatedDate; + private String instId; public SocialsAssociate() {} @@ -128,7 +129,15 @@ public class SocialsAssociate extends JpaBaseEntity { this.updatedDate = updatedDate; } - @Override + public String getInstId() { + return instId; + } + + public void setInstId(String instId) { + this.instId = instId; + } + + @Override public String toString() { StringBuilder builder = new StringBuilder(); builder.append("SocialsAssociate [id="); diff --git a/maxkey-identitys/maxkey-synchronizers-workweixin/build.gradle b/maxkey-identitys/maxkey-synchronizers-workweixin/build.gradle deleted file mode 100644 index af7c9357c..000000000 --- a/maxkey-identitys/maxkey-synchronizers-workweixin/build.gradle +++ /dev/null @@ -1,14 +0,0 @@ -description = "maxkey-synchronizers-workweixin" - -apply plugin: 'java' - -dependencies { - //local jars - implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - - implementation project(":maxkey-common") - implementation project(":maxkey-core") - implementation project(":maxkey-persistence") - implementation project(":maxkey-identitys:maxkey-synchronizers") - -} \ No newline at end of file diff --git a/maxkey-identitys/maxkey-synchronizers-activedirectory/build.gradle b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/build.gradle similarity index 70% rename from maxkey-identitys/maxkey-synchronizers-activedirectory/build.gradle rename to maxkey-synchronizers/maxkey-synchronizer-activedirectory/build.gradle index 2bac66985..92b63ca7d 100644 --- a/maxkey-identitys/maxkey-synchronizers-activedirectory/build.gradle +++ b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/build.gradle @@ -1,4 +1,4 @@ -description = "maxkey-synchronizers" +description = "maxkey-synchronizer" apply plugin: 'java' @@ -9,6 +9,6 @@ dependencies { implementation project(":maxkey-common") implementation project(":maxkey-core") implementation project(":maxkey-persistence") - implementation project(":maxkey-identitys:maxkey-synchronizers") + implementation project(":maxkey-synchronizers:maxkey-synchronizer") } \ No newline at end of file diff --git a/maxkey-identitys/maxkey-synchronizers-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryOrganizationService.java b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryOrganizationService.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryOrganizationService.java rename to maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryOrganizationService.java diff --git a/maxkey-identitys/maxkey-synchronizers-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectorySynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectorySynchronizerService.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectorySynchronizerService.java rename to maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectorySynchronizerService.java diff --git a/maxkey-identitys/maxkey-synchronizers-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java rename to maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java diff --git a/maxkey-identitys/maxkey-synchronizers-dingtalk/build.gradle b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/build.gradle similarity index 69% rename from maxkey-identitys/maxkey-synchronizers-dingtalk/build.gradle rename to maxkey-synchronizers/maxkey-synchronizer-dingtalk/build.gradle index 8b750a735..0ac780723 100644 --- a/maxkey-identitys/maxkey-synchronizers-dingtalk/build.gradle +++ b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/build.gradle @@ -1,4 +1,4 @@ -description = "maxkey-synchronizers-dingtalk" +description = "maxkey-synchronizer-dingtalk" apply plugin: 'java' @@ -9,6 +9,6 @@ dependencies { implementation project(":maxkey-common") implementation project(":maxkey-core") implementation project(":maxkey-persistence") - implementation project(":maxkey-identitys:maxkey-synchronizers") + implementation project(":maxkey-synchronizers:maxkey-synchronizer") } \ No newline at end of file diff --git a/maxkey-identitys/maxkey-synchronizers-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkAccessTokenService.java b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkAccessTokenService.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkAccessTokenService.java rename to maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkAccessTokenService.java diff --git a/maxkey-identitys/maxkey-synchronizers-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkOrganizationService.java b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkOrganizationService.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkOrganizationService.java rename to maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkOrganizationService.java diff --git a/maxkey-identitys/maxkey-synchronizers-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkSynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkSynchronizerService.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkSynchronizerService.java rename to maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkSynchronizerService.java diff --git a/maxkey-identitys/maxkey-synchronizers-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkUsersService.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkUsersService.java rename to maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkUsersService.java diff --git a/maxkey-identitys/maxkey-synchronizers-ldap/build.gradle b/maxkey-synchronizers/maxkey-synchronizer-ldap/build.gradle similarity index 69% rename from maxkey-identitys/maxkey-synchronizers-ldap/build.gradle rename to maxkey-synchronizers/maxkey-synchronizer-ldap/build.gradle index f8f190d07..9fd15f1fc 100644 --- a/maxkey-identitys/maxkey-synchronizers-ldap/build.gradle +++ b/maxkey-synchronizers/maxkey-synchronizer-ldap/build.gradle @@ -1,4 +1,4 @@ -description = "maxkey-synchronizers-ldap" +description = "maxkey-synchronizer-ldap" apply plugin: 'java' @@ -9,6 +9,6 @@ dependencies { implementation project(":maxkey-common") implementation project(":maxkey-core") implementation project(":maxkey-persistence") - implementation project(":maxkey-identitys:maxkey-synchronizers") + implementation project(":maxkey-synchronizers:maxkey-synchronizer") } \ No newline at end of file diff --git a/maxkey-identitys/maxkey-synchronizers-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapOrganizationService.java b/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapOrganizationService.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapOrganizationService.java rename to maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapOrganizationService.java diff --git a/maxkey-identitys/maxkey-synchronizers-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapSynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapSynchronizerService.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapSynchronizerService.java rename to maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapSynchronizerService.java diff --git a/maxkey-identitys/maxkey-synchronizers-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapUsersService.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapUsersService.java rename to maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapUsersService.java diff --git a/maxkey-identitys/maxkey-synchronizers-reorgdept/build.gradle b/maxkey-synchronizers/maxkey-synchronizer-reorgdept/build.gradle similarity index 69% rename from maxkey-identitys/maxkey-synchronizers-reorgdept/build.gradle rename to maxkey-synchronizers/maxkey-synchronizer-reorgdept/build.gradle index 0d8de414f..d1ec0e5b9 100644 --- a/maxkey-identitys/maxkey-synchronizers-reorgdept/build.gradle +++ b/maxkey-synchronizers/maxkey-synchronizer-reorgdept/build.gradle @@ -1,4 +1,4 @@ -description = "maxkey-synchronizers-reorgdept" +description = "maxkey-synchronizer-reorgdept" apply plugin: 'java' @@ -9,6 +9,6 @@ dependencies { implementation project(":maxkey-common") implementation project(":maxkey-core") implementation project(":maxkey-persistence") - implementation project(":maxkey-identitys:maxkey-synchronizers") + implementation project(":maxkey-synchronizers:maxkey-synchronizer") } \ No newline at end of file diff --git a/maxkey-identitys/maxkey-synchronizers-reorgdept/src/main/java/org/maxkey/synchronizer/reorg/ReorgDeptSynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer-reorgdept/src/main/java/org/maxkey/synchronizer/reorg/ReorgDeptSynchronizerService.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers-reorgdept/src/main/java/org/maxkey/synchronizer/reorg/ReorgDeptSynchronizerService.java rename to maxkey-synchronizers/maxkey-synchronizer-reorgdept/src/main/java/org/maxkey/synchronizer/reorg/ReorgDeptSynchronizerService.java diff --git a/maxkey-identitys/maxkey-synchronizers-reorgdept/src/main/java/org/maxkey/synchronizer/workweixin/service/ReorgDeptService.java b/maxkey-synchronizers/maxkey-synchronizer-reorgdept/src/main/java/org/maxkey/synchronizer/workweixin/service/ReorgDeptService.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers-reorgdept/src/main/java/org/maxkey/synchronizer/workweixin/service/ReorgDeptService.java rename to maxkey-synchronizers/maxkey-synchronizer-reorgdept/src/main/java/org/maxkey/synchronizer/workweixin/service/ReorgDeptService.java diff --git a/maxkey-synchronizers/maxkey-synchronizer-workweixin/build.gradle b/maxkey-synchronizers/maxkey-synchronizer-workweixin/build.gradle new file mode 100644 index 000000000..a76b42b9c --- /dev/null +++ b/maxkey-synchronizers/maxkey-synchronizer-workweixin/build.gradle @@ -0,0 +1,14 @@ +description = "maxkey-synchronizer-workweixin" + +apply plugin: 'java' + +dependencies { + //local jars + implementation fileTree(dir: '../maxkey-lib/*/', include: '*.jar') + + implementation project(":maxkey-common") + implementation project(":maxkey-core") + implementation project(":maxkey-persistence") + implementation project(":maxkey-synchronizers:maxkey-synchronizer") + +} \ No newline at end of file diff --git a/maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java rename to maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java diff --git a/maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinOrganizationService.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinOrganizationService.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinOrganizationService.java rename to maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinOrganizationService.java diff --git a/maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinSynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinSynchronizerService.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinSynchronizerService.java rename to maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinSynchronizerService.java diff --git a/maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinUsersService.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinUsersService.java rename to maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinUsersService.java diff --git a/maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinDepts.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinDepts.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinDepts.java rename to maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinDepts.java diff --git a/maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinDeptsResponse.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinDeptsResponse.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinDeptsResponse.java rename to maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinDeptsResponse.java diff --git a/maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinUsers.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinUsers.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinUsers.java rename to maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinUsers.java diff --git a/maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinUsersResponse.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinUsersResponse.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinUsersResponse.java rename to maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/entity/WorkWeixinUsersResponse.java diff --git a/maxkey-identitys/maxkey-synchronizers/build.gradle b/maxkey-synchronizers/maxkey-synchronizer/build.gradle similarity index 87% rename from maxkey-identitys/maxkey-synchronizers/build.gradle rename to maxkey-synchronizers/maxkey-synchronizer/build.gradle index 9bc8c44d0..b2a79f7b1 100644 --- a/maxkey-identitys/maxkey-synchronizers/build.gradle +++ b/maxkey-synchronizers/maxkey-synchronizer/build.gradle @@ -1,4 +1,4 @@ -description = "maxkey-synchronizers" +description = "maxkey-synchronizer" apply plugin: 'java' diff --git a/maxkey-identitys/maxkey-synchronizers/src/main/java/org/maxkey/synchronizer/AbstractSynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/AbstractSynchronizerService.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers/src/main/java/org/maxkey/synchronizer/AbstractSynchronizerService.java rename to maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/AbstractSynchronizerService.java diff --git a/maxkey-identitys/maxkey-synchronizers/src/main/java/org/maxkey/synchronizer/ISynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/ISynchronizerService.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers/src/main/java/org/maxkey/synchronizer/ISynchronizerService.java rename to maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/ISynchronizerService.java diff --git a/maxkey-identitys/maxkey-synchronizers/src/main/java/org/maxkey/synchronizer/SynchronizerJob.java b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/SynchronizerJob.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers/src/main/java/org/maxkey/synchronizer/SynchronizerJob.java rename to maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/SynchronizerJob.java diff --git a/maxkey-identitys/maxkey-synchronizers/src/main/java/org/maxkey/synchronizer/autoconfigure/SynchronizerAutoConfiguration.java b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/autoconfigure/SynchronizerAutoConfiguration.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers/src/main/java/org/maxkey/synchronizer/autoconfigure/SynchronizerAutoConfiguration.java rename to maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/autoconfigure/SynchronizerAutoConfiguration.java diff --git a/maxkey-identitys/maxkey-synchronizers/src/main/java/org/maxkey/synchronizer/entity/AccessToken.java b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/entity/AccessToken.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers/src/main/java/org/maxkey/synchronizer/entity/AccessToken.java rename to maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/entity/AccessToken.java diff --git a/maxkey-identitys/maxkey-synchronizers/src/main/java/org/maxkey/synchronizer/entity/ResponseData.java b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/entity/ResponseData.java similarity index 100% rename from maxkey-identitys/maxkey-synchronizers/src/main/java/org/maxkey/synchronizer/entity/ResponseData.java rename to maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/entity/ResponseData.java diff --git a/maxkey-webs/maxkey-web-mgt/build.gradle b/maxkey-webs/maxkey-web-mgt/build.gradle index 81b3eeabe..00bd7920f 100644 --- a/maxkey-webs/maxkey-web-mgt/build.gradle +++ b/maxkey-webs/maxkey-web-mgt/build.gradle @@ -17,12 +17,14 @@ dependencies { //identity implementation project(":maxkey-identitys:maxkey-identity-scim") - implementation project(":maxkey-identitys:maxkey-identity-rest") - implementation project(":maxkey-identitys:maxkey-synchronizers") - implementation project(":maxkey-identitys:maxkey-synchronizers-activedirectory") - implementation project(":maxkey-identitys:maxkey-synchronizers-ldap") - implementation project(":maxkey-identitys:maxkey-synchronizers-workweixin") - implementation project(":maxkey-identitys:maxkey-synchronizers-dingtalk") + implementation project(":maxkey-identitys:maxkey-identity-rest") + + //synchronizers + implementation project(":maxkey-synchronizers:maxkey-synchronizer") + implementation project(":maxkey-synchronizers:maxkey-synchronizer-activedirectory") + implementation project(":maxkey-synchronizers:maxkey-synchronizer-ldap") + implementation project(":maxkey-synchronizers:maxkey-synchronizer-workweixin") + implementation project(":maxkey-synchronizers:maxkey-synchronizer-dingtalk") implementation project(":maxkey-webs:maxkey-web-resources") } \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-mgt/config/build_docker.gradle b/maxkey-webs/maxkey-web-mgt/config/build_docker.gradle index 0960a0405..48375f9c8 100644 --- a/maxkey-webs/maxkey-web-mgt/config/build_docker.gradle +++ b/maxkey-webs/maxkey-web-mgt/config/build_docker.gradle @@ -53,11 +53,13 @@ dependencies { //identity implementation project(":maxkey-identitys:maxkey-identity-scim") implementation project(":maxkey-identitys:maxkey-identity-rest") - implementation project(":maxkey-identitys:maxkey-synchronizers") - implementation project(":maxkey-identitys:maxkey-synchronizers-activedirectory") - implementation project(":maxkey-identitys:maxkey-synchronizers-ldap") - implementation project(":maxkey-identitys:maxkey-synchronizers-workweixin") - implementation project(":maxkey-identitys:maxkey-synchronizers-dingtalk") + + //synchronizers + implementation project(":maxkey-synchronizers:maxkey-synchronizer") + implementation project(":maxkey-synchronizers:maxkey-synchronizer-activedirectory") + implementation project(":maxkey-synchronizers:maxkey-synchronizer-ldap") + implementation project(":maxkey-synchronizers:maxkey-synchronizer-workweixin") + implementation project(":maxkey-synchronizers:maxkey-synchronizer-dingtalk") implementation project(":maxkey-webs:maxkey-web-resources") diff --git a/maxkey-webs/maxkey-web-mgt/config/build_jar.gradle b/maxkey-webs/maxkey-web-mgt/config/build_jar.gradle index 593b83490..903619f25 100644 --- a/maxkey-webs/maxkey-web-mgt/config/build_jar.gradle +++ b/maxkey-webs/maxkey-web-mgt/config/build_jar.gradle @@ -54,11 +54,13 @@ dependencies { //identity implementation project(":maxkey-identitys:maxkey-identity-scim") implementation project(":maxkey-identitys:maxkey-identity-rest") - implementation project(":maxkey-identitys:maxkey-synchronizers") - implementation project(":maxkey-identitys:maxkey-synchronizers-activedirectory") - implementation project(":maxkey-identitys:maxkey-synchronizers-ldap") - implementation project(":maxkey-identitys:maxkey-synchronizers-workweixin") - implementation project(":maxkey-identitys:maxkey-synchronizers-dingtalk") + + //synchronizers + implementation project(":maxkey-synchronizers:maxkey-synchronizer") + implementation project(":maxkey-synchronizers:maxkey-synchronizer-activedirectory") + implementation project(":maxkey-synchronizers:maxkey-synchronizer-ldap") + implementation project(":maxkey-synchronizers:maxkey-synchronizer-workweixin") + implementation project(":maxkey-synchronizers:maxkey-synchronizer-dingtalk") implementation project(":maxkey-webs:maxkey-web-resources") } diff --git a/maxkey-webs/maxkey-web-mgt/config/build_standard.gradle b/maxkey-webs/maxkey-web-mgt/config/build_standard.gradle index 81b3eeabe..69e6118aa 100644 --- a/maxkey-webs/maxkey-web-mgt/config/build_standard.gradle +++ b/maxkey-webs/maxkey-web-mgt/config/build_standard.gradle @@ -18,11 +18,13 @@ dependencies { //identity implementation project(":maxkey-identitys:maxkey-identity-scim") implementation project(":maxkey-identitys:maxkey-identity-rest") - implementation project(":maxkey-identitys:maxkey-synchronizers") - implementation project(":maxkey-identitys:maxkey-synchronizers-activedirectory") - implementation project(":maxkey-identitys:maxkey-synchronizers-ldap") - implementation project(":maxkey-identitys:maxkey-synchronizers-workweixin") - implementation project(":maxkey-identitys:maxkey-synchronizers-dingtalk") + + //synchronizers + implementation project(":maxkey-synchronizers:maxkey-synchronizer") + implementation project(":maxkey-synchronizers:maxkey-synchronizer-activedirectory") + implementation project(":maxkey-synchronizers:maxkey-synchronizer-ldap") + implementation project(":maxkey-synchronizers:maxkey-synchronizer-workweixin") + implementation project(":maxkey-synchronizers:maxkey-synchronizer-dingtalk") implementation project(":maxkey-webs:maxkey-web-resources") } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 4ceae30dc..e80cc61dc 100644 --- a/settings.gradle +++ b/settings.gradle @@ -33,12 +33,13 @@ include ( //identity 'maxkey-identitys:maxkey-identity-scim', 'maxkey-identitys:maxkey-identity-rest', - 'maxkey-identitys:maxkey-synchronizers', - 'maxkey-identitys:maxkey-synchronizers-reorgdept', - 'maxkey-identitys:maxkey-synchronizers-activedirectory', - 'maxkey-identitys:maxkey-synchronizers-ldap', - 'maxkey-identitys:maxkey-synchronizers-dingtalk', - 'maxkey-identitys:maxkey-synchronizers-workweixin', + //synchronizers + 'maxkey-synchronizers:maxkey-synchronizer', + 'maxkey-synchronizers:maxkey-synchronizer-reorgdept', + 'maxkey-synchronizers:maxkey-synchronizer-activedirectory', + 'maxkey-synchronizers:maxkey-synchronizer-ldap', + 'maxkey-synchronizers:maxkey-synchronizer-dingtalk', + 'maxkey-synchronizers:maxkey-synchronizer-workweixin', //Protocol 'maxkey-protocols:maxkey-protocol-authorize', 'maxkey-protocols:maxkey-protocol-oauth-2.0',