Merge branch 'master' into pil0txia_feat_4501

Pil0tXia · Dec 10, 2023 · 0b4118b · 0b4118b
2 parents f915dd5 + 24873dd
commit 0b4118b
Show file tree

Hide file tree

Showing 123 changed files with 18,682 additions and 487 deletions.
diff --git a/.licenserc.yaml b/.licenserc.yaml
@@ -23,6 +23,8 @@ header:
     copyright-owner: Apache Software Foundation
 
   paths-ignore:
+    - 'eventmesh-operator/config/crd/bases'
+    - 'eventmesh-operator/config/rbac'
     - '.github/PULL_REQUEST_TEMPLATE'
     - '.gitmodules'
     - '**/.gitkeep'

diff --git a/build.gradle b/build.gradle
@@ -499,6 +499,8 @@ subprojects {
             dependency "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.0"
             dependency "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.0"
 
+            dependency "com.squareup.okhttp3:okhttp:3.14.9"
+
             dependency "org.asynchttpclient:async-http-client:2.12.0"
             dependency "org.apache.httpcomponents:httpclient:4.5.13"
 

diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java
@@ -205,15 +205,4 @@ public class Constants {
     public static final String OS_WIN_PREFIX = "win";
 
     public static final String DEFAULT = "default";
-
-    public static final String FEISHU_SEND_MESSAGE_API = "https://open.feishu.cn/open-apis/im/v1/messages?receive_id_type=";
-
-    public static final String FEISHU_RECEIVE_ID = "receive_id";
-
-    public static final String FEISHU_MSG_TYPE = "msg_type";
-
-    public static final String FEISHU_CONTENT = "content";
-
-    public static final String FEISHU_UUID = "uuid";
-
 }
diff --git a/...sh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/common/ProtocolKey.java b/...sh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/common/ProtocolKey.java
@@ -43,10 +43,13 @@ public class ProtocolKey {
 
     public static final String CLIENT_TYPE = "clienttype";
 
-    public static final String GRPC_RESPONSE_CODE = "status_code";
-    public static final String GRPC_RESPONSE_MESSAGE = "response_message";
+    public static final String GRPC_RESPONSE_CODE = "statuscode";
+    public static final String GRPC_RESPONSE_MESSAGE = "responsemessage";
     public static final String GRPC_RESPONSE_TIME = "time";
 
+    public static final String SUB_MESSAGE_TYPE = "submessagetype";
+    public static final String SUB_REPLY_MESSAGE = "subscription_reply";
+
     /**
      * CloudEvents spec
      *

diff --git a/eventmesh-connectors/README.md b/eventmesh-connectors/README.md
@@ -30,8 +30,8 @@ Add a new connector by implementing the source/sink interface using :
 |     [Dingtalk](eventmesh-connector-dingtalk)     |    Sink     |    ✅    |
 |                      Email                       |   Source    |    ⬜    |
 |                      Email                       |    Sink     |    ⬜    |
-|                      FeiShu                      |   Source    |    ⬜    |
-|       [FeiShu](eventmesh-connector-feishu)       |    Sink     |    ✅    |
+|                      Lark                        |   Source    |    ⬜    |
+|         [Lark](eventmesh-connector-lark)         |    Sink     |    ✅    |
 |         [File](eventmesh-connector-file)         |   Source    |    ✅    |
 |         [File](eventmesh-connector-file)         |    Sink     |    ✅    |
 |                      Github                      |   Source    |    ⬜    |
@@ -66,4 +66,6 @@ Add a new connector by implementing the source/sink interface using :
 |       [Spring](eventmesh-connector-spring)       |    Sink     |    ✅    |
 |                      WeCom                       |   Source    |    ⬜    |
 |        [WeCom](eventmesh-connector-wecom)        |    Sink     |    ✅    |
+|                      WeChat                      |   Source    |    ⬜    |
+|       [WeChat](eventmesh-connector-wechat)       |    Sink     |    ✅    |
 |         More connectors will be added...         | Source/Sink |   N/A   |
diff --git a/.../org/apache/eventmesh/connector/dingtalk/common/constants/ConnectRecordExtensionKeys.java b/.../org/apache/eventmesh/connector/dingtalk/common/constants/ConnectRecordExtensionKeys.java
@@ -22,7 +22,7 @@
  */
 public interface ConnectRecordExtensionKeys {
 
-    String DINGTALK_TEMPLATE_TYPE_KEY = "dingtalktemplatetype";
+    String DINGTALK_TEMPLATE_TYPE = "dingtalktemplatetype";
 
     String DINGTALK_MARKDOWN_MESSAGE_TITLE = "dingtalkmarkdownmessagetitle";
 }
diff --git a/...main/java/org/apache/eventmesh/connector/dingtalk/config/DingDingMessageTemplateType.java b/...main/java/org/apache/eventmesh/connector/dingtalk/config/DingDingMessageTemplateType.java
@@ -21,23 +21,30 @@
 
 public enum DingDingMessageTemplateType {
 
-    PLAIN_TEXT("sampleText"),
-    MARKDOWN("sampleMarkdown");
+    PLAIN_TEXT("text", "sampleText"),
+    MARKDOWN("markdown", "sampleMarkdown");
+
+    private final String templateType;
 
     private final String templateKey;
 
-    DingDingMessageTemplateType(String templateKey) {
+    DingDingMessageTemplateType(String templateType, String templateKey) {
+        this.templateType = templateType;
         this.templateKey = templateKey;
     }
 
+    public String getTemplateType() {
+        return templateType;
+    }
+
     public String getTemplateKey() {
         return templateKey;
     }
 
-    public static DingDingMessageTemplateType of(String templateKey) {
+    public static DingDingMessageTemplateType of(String templateType) {
         return Arrays.stream(values())
-            .filter(v -> v.getTemplateKey().equals(templateKey))
+            .filter(v -> v.getTemplateType().equals(templateType))
             .findFirst()
-            .orElseThrow(() -> new IllegalArgumentException("TemplateKey: " + templateKey + " not found."));
+            .orElseThrow(() -> new IllegalArgumentException("TemplateType: " + templateType + " not found."));
     }
 }
diff --git a/...in/java/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnector.java b/...in/java/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnector.java
@@ -126,9 +126,9 @@ public void put(List<ConnectRecord> sinkRecords) {
                     new OrgGroupSendHeaders();
                 orgGroupSendHeaders.xAcsDingtalkAccessToken = accessToken;
 
-                String templateTypeKey = record.getExtension(ConnectRecordExtensionKeys.DINGTALK_TEMPLATE_TYPE_KEY);
+                String templateTypeKey = record.getExtension(ConnectRecordExtensionKeys.DINGTALK_TEMPLATE_TYPE);
                 if (null == templateTypeKey || "null".equals(templateTypeKey)) {
-                    templateTypeKey = DingDingMessageTemplateType.PLAIN_TEXT.getTemplateKey();
+                    templateTypeKey = DingDingMessageTemplateType.PLAIN_TEXT.getTemplateType();
                 }
                 DingDingMessageTemplateType templateType = DingDingMessageTemplateType.of(templateTypeKey);
 

diff --git a/...ava/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnectorTest.java b/...ava/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnectorTest.java
@@ -94,8 +94,8 @@ public void testSendMessageToDingDing() throws Exception {
             RecordOffset offset = new RecordOffset();
             ConnectRecord connectRecord = new ConnectRecord(partition, offset,
                 System.currentTimeMillis(), "Hello, EventMesh!".getBytes(StandardCharsets.UTF_8));
-            connectRecord.addExtension(ConnectRecordExtensionKeys.DINGTALK_TEMPLATE_TYPE_KEY,
-                DingDingMessageTemplateType.PLAIN_TEXT.getTemplateKey());
+            connectRecord.addExtension(ConnectRecordExtensionKeys.DINGTALK_TEMPLATE_TYPE,
+                DingDingMessageTemplateType.PLAIN_TEXT.getTemplateType());
             records.add(connectRecord);
         }
         connector.put(records);

diff --git a/...c/main/java/org/apache/eventmesh/connector/feishu/sink/connector/FeishuSinkConnector.java b/...c/main/java/org/apache/eventmesh/connector/feishu/sink/connector/FeishuSinkConnector.java
diff --git a/...eishu/src/test/java/org/apache/eventmesh/connector/s3/source/FeishuSinkConnectorTest.java b/...eishu/src/test/java/org/apache/eventmesh/connector/s3/source/FeishuSinkConnectorTest.java