diff --git a/build.gradle b/build.gradle index 755a8f17..811ad5c6 100644 --- a/build.gradle +++ b/build.gradle @@ -50,7 +50,7 @@ def libjarsmapper=[ 'maxkey-synchronizers' :'maxkey_mgt', 'maxkey-synchronizers-activedirectory' :'maxkey_mgt', 'maxkey-synchronizers-ldap' :'maxkey_mgt', - 'maxkey-synchronizers-dingding' :'maxkey_mgt', + 'maxkey-synchronizers-dingtalk' :'maxkey_mgt', 'maxkey-synchronizers-workweixin' :'maxkey_mgt', 'maxkey-synchronizers-reorgdept' :'maxkey_mgt', 'maxkey-boot-monitor' :'maxkey_monitor' @@ -300,9 +300,9 @@ subprojects { implementation group: 'com.alibaba.cloud', name: 'spring-cloud-starter-alibaba-nacos-config', version: "${springcloudalibabaVersion}" //saml - implementation group: 'org.opensaml', name: 'opensaml', version: "${opensamlVersion}" - implementation group: 'org.opensaml', name: 'openws', version: "${openwsVersion}" - implementation group: 'org.opensaml', name: 'xmltooling', version: "${xmltoolingVersion}" + //implementation group: 'org.opensaml', name: 'opensaml', version: "${opensamlVersion}" + //implementation group: 'org.opensaml', name: 'openws', version: "${openwsVersion}" + //implementation group: 'org.opensaml', name: 'xmltooling', version: "${xmltoolingVersion}" implementation group: 'net.shibboleth.utilities', name: 'java-support', version: "${javasupportVersion}" //jose-jwt implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: "${nimbusjosejwtVersion}" diff --git a/config/build_standard.gradle b/config/build_standard.gradle index 1dd7ece8..64ea80b4 100644 --- a/config/build_standard.gradle +++ b/config/build_standard.gradle @@ -50,7 +50,7 @@ def libjarsmapper=[ 'maxkey-synchronizers' :'maxkey_mgt', 'maxkey-synchronizers-activedirectory' :'maxkey_mgt', 'maxkey-synchronizers-ldap' :'maxkey_mgt', - 'maxkey-synchronizers-dingding' :'maxkey_mgt', + 'maxkey-synchronizers-dingtalk' :'maxkey_mgt', 'maxkey-synchronizers-workweixin' :'maxkey_mgt', 'maxkey-synchronizers-reorgdept' :'maxkey_mgt', 'maxkey-boot-monitor' :'maxkey_monitor' diff --git a/maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingSynchronizerService.java b/maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingSynchronizerService.java deleted file mode 100644 index 075c92f6..00000000 --- a/maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingSynchronizerService.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright [2021] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.synchronizer.dingding; - -import org.maxkey.entity.Synchronizers; -import org.maxkey.synchronizer.ISynchronizerService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.taobao.api.ApiException; - -@Service -public class DingdingSynchronizerService implements ISynchronizerService{ - final static Logger _logger = LoggerFactory.getLogger(DingdingSynchronizerService.class); - Synchronizers synchronizer; - - @Autowired - DingdingUsersService dingdingUsersService; - - @Autowired - DingdingOrganizationService dingdingOrganizationService; - - - DingdingAccessTokenService dingdingAccessTokenService = new DingdingAccessTokenService(); - - public DingdingSynchronizerService() { - super(); - } - - public void sync() throws ApiException { - _logger.info("Sync ..."); - dingdingAccessTokenService.setAppkey(synchronizer.getPrincipal()); - dingdingAccessTokenService.setAppsecret(synchronizer.getCredentials()); - String access_token=dingdingAccessTokenService.requestToken(); - - dingdingOrganizationService.setSynchronizer(synchronizer); - dingdingOrganizationService.setAccess_token(access_token); - dingdingOrganizationService.sync(); - - dingdingUsersService.setSynchronizer(synchronizer); - dingdingUsersService.setAccess_token(access_token); - dingdingUsersService.sync(); - } - - public DingdingUsersService getDingdingUsersService() { - return dingdingUsersService; - } - - public void setDingdingUsersService(DingdingUsersService dingdingUsersService) { - this.dingdingUsersService = dingdingUsersService; - } - - public DingdingOrganizationService getDingdingOrganizationService() { - return dingdingOrganizationService; - } - - public void setDingdingOrganizationService(DingdingOrganizationService dingdingOrganizationService) { - this.dingdingOrganizationService = dingdingOrganizationService; - } - - public DingdingAccessTokenService getDingdingAccessTokenService() { - return dingdingAccessTokenService; - } - - public void setDingdingAccessTokenService(DingdingAccessTokenService dingdingAccessTokenService) { - this.dingdingAccessTokenService = dingdingAccessTokenService; - } - - @Override - public void setSynchronizer(Synchronizers synchronizer) { - this.synchronizer = synchronizer; - - } - -} diff --git a/maxkey-identitys/maxkey-synchronizers-dingding/build.gradle b/maxkey-identitys/maxkey-synchronizers-dingtalk/build.gradle similarity index 87% rename from maxkey-identitys/maxkey-synchronizers-dingding/build.gradle rename to maxkey-identitys/maxkey-synchronizers-dingtalk/build.gradle index 1d20494b..8b750a73 100644 --- a/maxkey-identitys/maxkey-synchronizers-dingding/build.gradle +++ b/maxkey-identitys/maxkey-synchronizers-dingtalk/build.gradle @@ -1,4 +1,4 @@ -description = "maxkey-synchronizers-dingding" +description = "maxkey-synchronizers-dingtalk" apply plugin: 'java' diff --git a/maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingAccessTokenService.java b/maxkey-identitys/maxkey-synchronizers-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkAccessTokenService.java similarity index 88% rename from maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingAccessTokenService.java rename to maxkey-identitys/maxkey-synchronizers-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkAccessTokenService.java index 275661f7..9a6a7028 100644 --- a/maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingAccessTokenService.java +++ b/maxkey-identitys/maxkey-synchronizers-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkAccessTokenService.java @@ -15,7 +15,7 @@ */ -package org.maxkey.synchronizer.dingding; +package org.maxkey.synchronizer.dingtalk; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,17 +26,17 @@ import com.dingtalk.api.request.OapiGettokenRequest; import com.dingtalk.api.response.OapiGettokenResponse; import com.taobao.api.ApiException; -public class DingdingAccessTokenService { - final static Logger _logger = LoggerFactory.getLogger(DingdingAccessTokenService.class); +public class DingtalkAccessTokenService { + final static Logger _logger = LoggerFactory.getLogger(DingtalkAccessTokenService.class); String appkey; String appsecret; - public DingdingAccessTokenService() { + public DingtalkAccessTokenService() { } - public DingdingAccessTokenService(String appkey, String appsecret) { + public DingtalkAccessTokenService(String appkey, String appsecret) { super(); this.appkey = appkey; this.appsecret = appsecret; diff --git a/maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingOrganizationService.java b/maxkey-identitys/maxkey-synchronizers-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkOrganizationService.java similarity index 94% rename from maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingOrganizationService.java rename to maxkey-identitys/maxkey-synchronizers-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkOrganizationService.java index e927b906..a0bfceb9 100644 --- a/maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingOrganizationService.java +++ b/maxkey-identitys/maxkey-synchronizers-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkOrganizationService.java @@ -15,7 +15,7 @@ */ -package org.maxkey.synchronizer.dingding; +package org.maxkey.synchronizer.dingtalk; import org.maxkey.entity.Organizations; import org.maxkey.synchronizer.AbstractSynchronizerService; @@ -31,8 +31,8 @@ import com.dingtalk.api.response.OapiV2DepartmentListsubResponse.DeptBaseRespons import com.taobao.api.ApiException; @Service -public class DingdingOrganizationService extends AbstractSynchronizerService implements ISynchronizerService{ - final static Logger _logger = LoggerFactory.getLogger(DingdingOrganizationService.class); +public class DingtalkOrganizationService extends AbstractSynchronizerService implements ISynchronizerService{ + final static Logger _logger = LoggerFactory.getLogger(DingtalkOrganizationService.class); OapiV2DepartmentListsubResponse rspDepts; diff --git a/maxkey-identitys/maxkey-synchronizers-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkSynchronizerService.java b/maxkey-identitys/maxkey-synchronizers-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkSynchronizerService.java new file mode 100644 index 00000000..978eb312 --- /dev/null +++ b/maxkey-identitys/maxkey-synchronizers-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkSynchronizerService.java @@ -0,0 +1,97 @@ +/* + * Copyright [2021] [MaxKey of copyright http://www.maxkey.top] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +package org.maxkey.synchronizer.dingtalk; + +import org.maxkey.entity.Synchronizers; +import org.maxkey.synchronizer.ISynchronizerService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.taobao.api.ApiException; + +@Service +public class DingtalkSynchronizerService implements ISynchronizerService{ + final static Logger _logger = LoggerFactory.getLogger(DingtalkSynchronizerService.class); + Synchronizers synchronizer; + + @Autowired + DingtalkUsersService dingtalkUsersService; + + @Autowired + DingtalkOrganizationService dingtalkOrganizationService; + + + DingtalkAccessTokenService dingtalkAccessTokenService = new DingtalkAccessTokenService(); + + public DingtalkSynchronizerService() { + super(); + } + + public void sync() throws ApiException { + _logger.info("Sync ..."); + dingtalkAccessTokenService.setAppkey(synchronizer.getPrincipal()); + dingtalkAccessTokenService.setAppsecret(synchronizer.getCredentials()); + String access_token=dingtalkAccessTokenService.requestToken(); + + dingtalkOrganizationService.setSynchronizer(synchronizer); + dingtalkOrganizationService.setAccess_token(access_token); + dingtalkOrganizationService.sync(); + + dingtalkUsersService.setSynchronizer(synchronizer); + dingtalkUsersService.setAccess_token(access_token); + dingtalkUsersService.sync(); + } + + public DingtalkUsersService getDingtalkUsersService() { + return dingtalkUsersService; + } + + public void setDingtalkUsersService(DingtalkUsersService dingtalkUsersService) { + this.dingtalkUsersService = dingtalkUsersService; + } + + public DingtalkOrganizationService getDingtalkOrganizationService() { + return dingtalkOrganizationService; + } + + public void setDingtalkOrganizationService(DingtalkOrganizationService dingtalkOrganizationService) { + this.dingtalkOrganizationService = dingtalkOrganizationService; + } + + public Synchronizers getSynchronizer() { + return synchronizer; + } + + + public DingtalkAccessTokenService getDingtalkAccessTokenService() { + return dingtalkAccessTokenService; + } + + public void setDingtalkAccessTokenService(DingtalkAccessTokenService dingtalkAccessTokenService) { + this.dingtalkAccessTokenService = dingtalkAccessTokenService; + } + + @Override + public void setSynchronizer(Synchronizers synchronizer) { + this.synchronizer = synchronizer; + + } + +} diff --git a/maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingUsersService.java b/maxkey-identitys/maxkey-synchronizers-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkUsersService.java similarity index 93% rename from maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingUsersService.java rename to maxkey-identitys/maxkey-synchronizers-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkUsersService.java index 271636d9..159cb65e 100644 --- a/maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingUsersService.java +++ b/maxkey-identitys/maxkey-synchronizers-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkUsersService.java @@ -15,7 +15,7 @@ */ -package org.maxkey.synchronizer.dingding; +package org.maxkey.synchronizer.dingtalk; import org.apache.commons.lang3.StringUtils; import org.joda.time.DateTime; @@ -36,11 +36,11 @@ import com.dingtalk.api.response.OapiV2DepartmentListsubResponse.DeptBaseRespons import com.dingtalk.api.response.OapiV2UserListResponse.ListUserResponse; @Service -public class DingdingUsersService extends AbstractSynchronizerService implements ISynchronizerService{ - final static Logger _logger = LoggerFactory.getLogger(DingdingUsersService.class); +public class DingtalkUsersService extends AbstractSynchronizerService implements ISynchronizerService{ + final static Logger _logger = LoggerFactory.getLogger(DingtalkUsersService.class); @Autowired - DingdingOrganizationService dingdingOrganizationService; + DingtalkOrganizationService dingdingOrganizationService; String access_token; @@ -115,7 +115,7 @@ public class DingdingUsersService extends AbstractSynchronizerService implement this.access_token = access_token; } - public void setDingdingOrganizationService(DingdingOrganizationService dingdingOrganizationService) { + public void setDingdingOrganizationService(DingtalkOrganizationService dingdingOrganizationService) { this.dingdingOrganizationService = dingdingOrganizationService; } diff --git a/maxkey-lib/opensaml-2.6.6.jar b/maxkey-lib/opensaml-2.6.6.jar new file mode 100644 index 00000000..34ae4e3f Binary files /dev/null and b/maxkey-lib/opensaml-2.6.6.jar differ diff --git a/maxkey-lib/openws-1.5.6.jar b/maxkey-lib/openws-1.5.6.jar new file mode 100644 index 00000000..563b0f94 Binary files /dev/null and b/maxkey-lib/openws-1.5.6.jar differ diff --git a/maxkey-lib/xmltooling-1.4.6.jar b/maxkey-lib/xmltooling-1.4.6.jar new file mode 100644 index 00000000..6bf1f4f1 Binary files /dev/null and b/maxkey-lib/xmltooling-1.4.6.jar differ diff --git a/maxkey-webs/maxkey-web-mgt/build.gradle b/maxkey-webs/maxkey-web-mgt/build.gradle index 3f21e823..81b3eeab 100644 --- a/maxkey-webs/maxkey-web-mgt/build.gradle +++ b/maxkey-webs/maxkey-web-mgt/build.gradle @@ -22,7 +22,7 @@ dependencies { 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-dingding") + implementation project(":maxkey-identitys:maxkey-synchronizers-dingtalk") implementation project(":maxkey-webs:maxkey-web-resources") } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 3b036343..4ceae30d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -37,7 +37,7 @@ include ( 'maxkey-identitys:maxkey-synchronizers-reorgdept', 'maxkey-identitys:maxkey-synchronizers-activedirectory', 'maxkey-identitys:maxkey-synchronizers-ldap', - 'maxkey-identitys:maxkey-synchronizers-dingding', + 'maxkey-identitys:maxkey-synchronizers-dingtalk', 'maxkey-identitys:maxkey-synchronizers-workweixin', //Protocol 'maxkey-protocols:maxkey-protocol-authorize',