dingding rename to dingtalk

maxkey-synchronizers-dingding

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}"

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'

maxkey-identitys/maxkey-synchronizers-dingding/build.gradle → maxkey-identitys/maxkey-synchronizers-dingtalk/build.gradle

-description = "maxkey-synchronizers-dingding"
+description = "maxkey-synchronizers-dingtalk"
 
 apply plugin: 'java'
 

maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingAccessTokenService.java → 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;

maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingOrganizationService.java → 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;
 	

maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingSynchronizerService.java → maxkey-identitys/maxkey-synchronizers-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkSynchronizerService.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.synchronizer.dingding;
+package org.maxkey.synchronizer.dingtalk;
 
 import org.maxkey.entity.Synchronizers;
 import org.maxkey.synchronizer.ISynchronizerService;
@@ -27,60 +27,65 @@ import org.springframework.stereotype.Service;
 import com.taobao.api.ApiException;
 
 @Service
-public class DingdingSynchronizerService  implements ISynchronizerService{
-	final static Logger _logger = LoggerFactory.getLogger(DingdingSynchronizerService.class);
+public class DingtalkSynchronizerService  implements ISynchronizerService{
+	final static Logger _logger = LoggerFactory.getLogger(DingtalkSynchronizerService.class);
 	Synchronizers synchronizer;
 	
 	@Autowired
-	DingdingUsersService dingdingUsersService;
+	DingtalkUsersService dingtalkUsersService;
 	
 	@Autowired
-	DingdingOrganizationService dingdingOrganizationService;
+	DingtalkOrganizationService dingtalkOrganizationService;
 	
 
-	DingdingAccessTokenService dingdingAccessTokenService = new DingdingAccessTokenService();
+	DingtalkAccessTokenService dingtalkAccessTokenService = new DingtalkAccessTokenService();
 	
-	public DingdingSynchronizerService() {
+	public DingtalkSynchronizerService() {
 		super();
 	}
 
 	public void sync() throws ApiException {
 		_logger.info("Sync ...");
-		dingdingAccessTokenService.setAppkey(synchronizer.getPrincipal());
-		dingdingAccessTokenService.setAppsecret(synchronizer.getCredentials());
-		String access_token=dingdingAccessTokenService.requestToken();
+		dingtalkAccessTokenService.setAppkey(synchronizer.getPrincipal());
+		dingtalkAccessTokenService.setAppsecret(synchronizer.getCredentials());
+		String access_token=dingtalkAccessTokenService.requestToken();
 		
-		dingdingOrganizationService.setSynchronizer(synchronizer);
-		dingdingOrganizationService.setAccess_token(access_token);
-		dingdingOrganizationService.sync();
+		dingtalkOrganizationService.setSynchronizer(synchronizer);
+		dingtalkOrganizationService.setAccess_token(access_token);
+		dingtalkOrganizationService.sync();
 		
-		dingdingUsersService.setSynchronizer(synchronizer);
-		dingdingUsersService.setAccess_token(access_token);
-		dingdingUsersService.sync();
+		dingtalkUsersService.setSynchronizer(synchronizer);
+		dingtalkUsersService.setAccess_token(access_token);
+		dingtalkUsersService.sync();
 	}
 
-	public DingdingUsersService getDingdingUsersService() {
-		return dingdingUsersService;
+	public DingtalkUsersService getDingtalkUsersService() {
+		return dingtalkUsersService;
 	}
 
-	public void setDingdingUsersService(DingdingUsersService dingdingUsersService) {
-		this.dingdingUsersService = dingdingUsersService;
+	public void setDingtalkUsersService(DingtalkUsersService dingtalkUsersService) {
+		this.dingtalkUsersService = dingtalkUsersService;
 	}
 
-	public DingdingOrganizationService getDingdingOrganizationService() {
-		return dingdingOrganizationService;
+	public DingtalkOrganizationService getDingtalkOrganizationService() {
+		return dingtalkOrganizationService;
 	}
 
-	public void setDingdingOrganizationService(DingdingOrganizationService dingdingOrganizationService) {
-		this.dingdingOrganizationService = dingdingOrganizationService;
+	public void setDingtalkOrganizationService(DingtalkOrganizationService dingtalkOrganizationService) {
+		this.dingtalkOrganizationService = dingtalkOrganizationService;
 	}
 
-	public DingdingAccessTokenService getDingdingAccessTokenService() {
-		return dingdingAccessTokenService;
+	public Synchronizers getSynchronizer() {
+		return synchronizer;
 	}
 
-	public void setDingdingAccessTokenService(DingdingAccessTokenService dingdingAccessTokenService) {
-		this.dingdingAccessTokenService = dingdingAccessTokenService;
+
+	public DingtalkAccessTokenService getDingtalkAccessTokenService() {
+		return dingtalkAccessTokenService;
+	}
+
+	public void setDingtalkAccessTokenService(DingtalkAccessTokenService dingtalkAccessTokenService) {
+		this.dingtalkAccessTokenService = dingtalkAccessTokenService;
 	}
 
 	@Override

maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingUsersService.java → 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;
 	}
 

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

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',