-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Feature][Connector2] Add DingTalk Source #2684 #2757
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
# DingTalk | ||
|
||
> DinkTalk source connector | ||
## Description | ||
|
||
A source plugin which use DingTalk | ||
|
||
## Key features | ||
|
||
- [x] [batch](../../concept/connector-v2-features.md) | ||
- [x] [stream](../../concept/connector-v2-features.md) | ||
- [ ] [exactly-once](../../concept/connector-v2-features.md) | ||
- [ ] [schema projection](../../concept/connector-v2-features.md) | ||
- [ ] [parallelism](../../concept/connector-v2-features.md) | ||
- [ ] [support user-defined split](../../concept/connector-v2-features.md) | ||
|
||
## Options | ||
|
||
| name | type | required | default value | | ||
|---------------| ---------- |------------| ------------- | | ||
| api_client | string | yes | - | | ||
| access_token | string | yes | - | | ||
| app_key | string | yes | - | | ||
| app_secret | string | yes | - | | ||
|
||
|
||
### url [string] | ||
|
||
[DingTalk API](https://open.dingtalk.com/document/orgapp-server/api-overview) address like : https://oapi.dingtalk.com/topapi/v2/department/listsub(string) | ||
|
||
### access_token [string] | ||
|
||
DingTalk access_token [DingTalk Doc](https://open.dingtalk.com/document/orgapp-server/obtain-the-access_token-of-an-internal-app) | ||
The valid period of access token is 7200 seconds , if access token expired , can use app_key and app_secret get new message (string) | ||
access_token is the source voucher , can direct use of access_token or use app_key and app_secret get it | ||
|
||
### app_key [string] | ||
|
||
DingTalk app key (string) | ||
|
||
### app_secret [string] | ||
|
||
DingTalk app secret (string) | ||
|
||
## Example | ||
|
||
```hocon | ||
source { | ||
DingTalk { | ||
api_client="https://oapi.dingtalk.com/topapi/v2/department/listsub" | ||
access_token="8c61c395035c37c7812b9b1b1dbecb20" | ||
} | ||
} | ||
or | ||
source { | ||
DingTalk { | ||
api_client="https://oapi.dingtalk.com/topapi/v2/department/listsub" | ||
app_key="dingpsi2nsmw2v" | ||
app_secret="qv5pLes-M9JvHXjaBqkPFdAyk9WKEjDjEZOpLZKHi" | ||
} | ||
} | ||
|
||
result : | ||
row=1 : {"auto_add_user":false,"create_dept_group":false,"dept_id":101254282,"ext":"{\"faceCount\":\"1\"}","name":"技术部","parent_id":1} | ||
row=2 : {"auto_add_user":true,"create_dept_group":true,"dept_id":101279294,"name":"财务部","parent_id":1} | ||
row=3 : {"auto_add_user":false,"create_dept_group":false,"dept_id":101316242,"ext":"{\"faceCount\":\"2\"}","name":"渠道部","parent_id":1} | ||
row=4 : {"auto_add_user":false,"create_dept_group":false,"dept_id":101340237,"name":"运营部","parent_id":1} | ||
row=5 : {"auto_add_user":false,"create_dept_group":false,"dept_id":101467231,"ext":"{\"faceCount\":\"1\"}","name":"客服部","parent_id":1} | ||
row=6 : {"auto_add_user":true,"create_dept_group":true,"dept_id":101532253,"name":"人力部","parent_id":1} | ||
row=7 : {"auto_add_user":true,"create_dept_group":true,"dept_id":101532254,"name":"直销部","parent_id":1} | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
...talk/src/main/java/org/apache/seatunnel/connectors/seatunnel/common/DingTalkConstant.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You 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.apache.seatunnel.connectors.seatunnel.common; | ||
|
||
/** | ||
* @description: DingTalk contant | ||
**/ | ||
|
||
public class DingTalkConstant { | ||
public static final String APP_KEY = "app_key"; | ||
public static final String APP_SECRET = "app_secret"; | ||
public static final String ACCESS_TOKEN = "access_token"; | ||
public static final String API_CLIENT = "api_client"; | ||
public static final String DEFAULT_FORMAT = "json"; | ||
public static final String SCHEMA = "schema"; | ||
public static final String STATUS_OK = "ok"; | ||
public static final String BODY_RESULT = "result"; | ||
} |
60 changes: 60 additions & 0 deletions
60
...alk/src/main/java/org/apache/seatunnel/connectors/seatunnel/common/DingTalkParameter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You 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.apache.seatunnel.connectors.seatunnel.common; | ||
|
||
import org.apache.seatunnel.connectors.seatunnel.http.config.HttpConfig; | ||
|
||
import org.apache.seatunnel.shade.com.typesafe.config.Config; | ||
|
||
import lombok.Data; | ||
|
||
import java.io.Serializable; | ||
import java.util.Map; | ||
import java.util.stream.Collectors; | ||
|
||
/** | ||
* @description: Ding Talk Parameter | ||
**/ | ||
|
||
@Data | ||
public class DingTalkParameter implements Serializable { | ||
|
||
private String appKey; | ||
private String appSecret; | ||
private String accessToken; | ||
private String apiClient; | ||
private Map<String, String> params; | ||
|
||
public void buildParameter(Config pluginConfig, Boolean hasToken) { | ||
if (!hasToken) { | ||
// DingTalk app key | ||
this.setAppKey(pluginConfig.getString(DingTalkConstant.APP_KEY)); | ||
// DingTalk app secret | ||
this.setAppSecret(pluginConfig.getString(DingTalkConstant.APP_SECRET)); | ||
} else { | ||
// DingTalk app token | ||
this.setAccessToken(pluginConfig.getString(DingTalkConstant.ACCESS_TOKEN)); | ||
} | ||
// DingTalk api client | ||
this.setApiClient(pluginConfig.getString(DingTalkConstant.API_CLIENT)); | ||
// set params | ||
if (pluginConfig.hasPath(HttpConfig.PARAMS)) { | ||
this.setParams(pluginConfig.getConfig(HttpConfig.PARAMS).entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, entry -> String.valueOf(entry.getValue().unwrapped()), (v1, v2) -> v2))); | ||
} | ||
} | ||
} |
52 changes: 52 additions & 0 deletions
52
...dingtalk/src/main/java/org/apache/seatunnel/connectors/seatunnel/common/DingTalkUtil.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You 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.apache.seatunnel.connectors.seatunnel.common; | ||
|
||
import com.aliyun.dingtalkoauth2_1_0.models.GetAccessTokenResponse; | ||
import java.io.IOException; | ||
|
||
/** | ||
* @description: Ding Talk util | ||
**/ | ||
|
||
public class DingTalkUtil { | ||
|
||
/** | ||
* @return Client | ||
*/ | ||
public static com.aliyun.dingtalkoauth2_1_0.Client createClient() throws Exception { | ||
com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config(); | ||
config.protocol = "https"; | ||
config.regionId = "central"; | ||
return new com.aliyun.dingtalkoauth2_1_0.Client(config); | ||
} | ||
|
||
public static String getAppToken(String appKey, String appSecret) { | ||
String appToken = null; | ||
try { | ||
com.aliyun.dingtalkoauth2_1_0.Client client = DingTalkUtil.createClient(); | ||
com.aliyun.dingtalkoauth2_1_0.models.GetAccessTokenRequest getAccessTokenRequest = new com.aliyun.dingtalkoauth2_1_0.models.GetAccessTokenRequest() | ||
.setAppKey(appKey).setAppSecret(appSecret); | ||
GetAccessTokenResponse res = client.getAccessToken(getAccessTokenRequest); | ||
appToken = res.getBody().getAccessToken(); | ||
} catch (Exception e) { | ||
throw new RuntimeException(e); | ||
} | ||
return appToken; | ||
} | ||
} |
105 changes: 105 additions & 0 deletions
105
...ngtalk/src/main/java/org/apache/seatunnel/connectors/seatunnel/source/DingTalkSource.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,105 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You 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.apache.seatunnel.connectors.seatunnel.source; | ||
|
||
import org.apache.seatunnel.api.common.JobContext; | ||
import org.apache.seatunnel.api.common.PrepareFailException; | ||
import org.apache.seatunnel.api.serialization.DeserializationSchema; | ||
import org.apache.seatunnel.api.source.Boundedness; | ||
import org.apache.seatunnel.api.source.SeaTunnelSource; | ||
import org.apache.seatunnel.api.table.type.SeaTunnelDataType; | ||
import org.apache.seatunnel.api.table.type.SeaTunnelRow; | ||
import org.apache.seatunnel.api.table.type.SeaTunnelRowType; | ||
import org.apache.seatunnel.common.config.CheckConfigUtil; | ||
import org.apache.seatunnel.common.config.CheckResult; | ||
import org.apache.seatunnel.common.constants.JobMode; | ||
import org.apache.seatunnel.common.constants.PluginType; | ||
import org.apache.seatunnel.connectors.seatunnel.common.DingTalkConstant; | ||
import org.apache.seatunnel.connectors.seatunnel.common.DingTalkParameter; | ||
import org.apache.seatunnel.connectors.seatunnel.common.DingTalkUtil; | ||
import org.apache.seatunnel.connectors.seatunnel.common.schema.SeaTunnelSchema; | ||
import org.apache.seatunnel.connectors.seatunnel.common.source.AbstractSingleSplitReader; | ||
import org.apache.seatunnel.connectors.seatunnel.common.source.AbstractSingleSplitSource; | ||
import org.apache.seatunnel.connectors.seatunnel.common.source.SingleSplitReaderContext; | ||
|
||
import org.apache.seatunnel.shade.com.typesafe.config.Config; | ||
|
||
import com.google.auto.service.AutoService; | ||
|
||
@AutoService(SeaTunnelSource.class) | ||
public class DingTalkSource extends AbstractSingleSplitSource<SeaTunnelRow> { | ||
|
||
protected final DingTalkParameter dtParameter = new DingTalkParameter(); | ||
protected SeaTunnelRowType rowType; | ||
protected JobContext jobContext; | ||
protected DeserializationSchema<SeaTunnelRow> deserializationSchema; | ||
|
||
@Override | ||
public String getPluginName() { | ||
return "DingTalk"; | ||
} | ||
|
||
@Override | ||
public Boundedness getBoundedness() { | ||
return JobMode.BATCH.equals(jobContext.getJobMode()) ? Boundedness.BOUNDED : Boundedness.UNBOUNDED; | ||
} | ||
|
||
@Override | ||
public void prepare(Config pluginConfig) throws PrepareFailException { | ||
CheckResult hasClient = CheckConfigUtil.checkAllExists(pluginConfig, DingTalkConstant.API_CLIENT); | ||
if (!hasClient.isSuccess()) { | ||
throw new PrepareFailException(getPluginName(), PluginType.SOURCE, hasClient.getMsg()); | ||
} | ||
CheckResult hasToken = CheckConfigUtil.checkAllExists(pluginConfig, DingTalkConstant.ACCESS_TOKEN); | ||
if (!hasToken.isSuccess()) { | ||
CheckResult hasKey = CheckConfigUtil.checkAllExists(pluginConfig, DingTalkConstant.APP_KEY, DingTalkConstant.APP_SECRET); | ||
if (!hasKey.isSuccess()) { | ||
throw new PrepareFailException(getPluginName(), PluginType.SOURCE, hasKey.getMsg()); | ||
} | ||
String appToken = DingTalkUtil.getAppToken(pluginConfig.getString(DingTalkConstant.APP_KEY), pluginConfig.getString(DingTalkConstant.APP_SECRET)); | ||
if (null == appToken) { | ||
throw new PrepareFailException(getPluginName(), PluginType.SOURCE, "Get App Token Error!"); | ||
} | ||
this.dtParameter.setAccessToken(appToken); | ||
} | ||
this.dtParameter.buildParameter(pluginConfig, hasToken.isSuccess()); | ||
|
||
if (pluginConfig.hasPath(DingTalkConstant.SCHEMA)) { | ||
Config schema = pluginConfig.getConfig(DingTalkConstant.SCHEMA); | ||
this.rowType = SeaTunnelSchema.buildWithConfig(schema).getSeaTunnelRowType(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Unused fields in schema? |
||
} else { | ||
this.rowType = SeaTunnelSchema.buildSimpleTextSchema(); | ||
} | ||
} | ||
|
||
@Override | ||
public void setJobContext(JobContext jobContext) { | ||
this.jobContext = jobContext; | ||
} | ||
|
||
@Override | ||
public SeaTunnelDataType<SeaTunnelRow> getProducedType() { | ||
return this.rowType; | ||
} | ||
|
||
@Override | ||
public AbstractSingleSplitReader<SeaTunnelRow> createReader(SingleSplitReaderContext readerContext) throws Exception { | ||
return new DingTalkSourceReader(this.dtParameter, readerContext); | ||
} | ||
|
||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I checked the DingTalk documentation, this is the new version of the sdk; so can the old version of the sdk(
alibaba-dingtalk-service-sdk
) be removed?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
old sdk version is used by sink plugin , next sink plugin update will be remove