[BUG][Alert]fix alert plugin DingTalkSender (#4629)

* fix DingTalkSender

* optimize context

dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkParamsConstants.java

@@ -22,36 +22,24 @@ package org.apache.dolphinscheduler.plugin.alert.dingtalk;
  */
 public class DingTalkParamsConstants {
 
+
+    static final String DING_TALK_PROXY_ENABLE = "isEnableProxy";
+    static final String DING_TALK_WEB_HOOK = "webhook";
+    static final String NAME_DING_TALK_WEB_HOOK = "WebHook";
+    static final String DING_TALK_KEYWORD = "keyword";
+    static final String NAME_DING_TALK_KEYWORD = "Keyword";
+    static final String NAME_DING_TALK_PROXY_ENABLE = "IsEnableProxy";
+    static final String DING_TALK_PROXY = "proxy";
+    static final String NAME_DING_TALK_PROXY = "Proxy";
+    static final String DING_TALK_PORT = "port";
+    static final String NAME_DING_TALK_PORT = "Port";
+    static final String DING_TALK_USER = "user";
+    static final String NAME_DING_TALK_USER = "User";
+    static final String DING_TALK_PASSWORD = "password";
+    static final String NAME_DING_TALK_PASSWORD = "Password";
+
     private DingTalkParamsConstants() {
         throw new IllegalStateException("Utility class");
     }
 
-    static final String DING_TALK_WEB_HOOK = "dingtalk.webhook";
-
-    static final String NAME_DING_TALK_WEB_HOOK = "dingTalkWebHook";
-
-    static final String DING_TALK_KEYWORD = "dingtalk.keyword";
-
-    static final String NAME_DING_TALK_KEYWORD = "dingTalkKeyword";
-
-    public static final String DING_TALK_PROXY_ENABLE = "dingtalk.isEnableProxy";
-
-    static final String NAME_DING_TALK_PROXY_ENABLE = "dingTalkIsEnableProxy";
-
-    static final String DING_TALK_PROXY = "dingtalk.proxy";
-
-    static final String NAME_DING_TALK_PROXY = "dingTalkProxy";
-
-    static final String DING_TALK_PORT = "dingtalk.port";
-
-    static final String NAME_DING_TALK_PORT = "dingTalkPort";
-
-    static final String DING_TALK_USER = "dingtalk.user";
-
-    static final String NAME_DING_TALK_USER = "dingTalkUser";
-
-    static final String DING_TALK_PASSWORD = "dingtalk.password";
-
-    static final String NAME_DING_TALK_PASSWORD = "dingTalkPassword";
-
 }

dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkSender.java

@@ -75,51 +75,6 @@ public class DingTalkSender {
 
     }
 
-    public AlertResult sendDingTalkMsg(String msg, String charset) {
-        AlertResult alertResult;
-        try {
-            String resp = sendMsg(msg, charset);
-            return checkSendDingTalkSendMsgResult(resp);
-        } catch (Exception e) {
-            logger.info("send ding talk alert msg  exception : {}", e.getMessage());
-            alertResult = new AlertResult();
-            alertResult.setStatus("false");
-            alertResult.setMessage("send ding talk alert fail.");
-        }
-        return alertResult;
-    }
-
-    private String sendMsg(String msg, String charset) throws IOException {
-
-        String msgToJson = textToJsonString(msg + "#" + keyword);
-        HttpPost httpPost = constructHttpPost(url, msgToJson, charset);
-
-        CloseableHttpClient httpClient;
-        if (Boolean.TRUE.equals(enableProxy)) {
-            httpClient = getProxyClient(proxy, port, user, password);
-            RequestConfig rcf = getProxyConfig(proxy, port);
-            httpPost.setConfig(rcf);
-        } else {
-            httpClient = getDefaultClient();
-        }
-
-        try {
-            CloseableHttpResponse response = httpClient.execute(httpPost);
-            String resp;
-            try {
-                HttpEntity entity = response.getEntity();
-                resp = EntityUtils.toString(entity, charset);
-                EntityUtils.consume(entity);
-            } finally {
-                response.close();
-            }
-            logger.info("Ding Talk send {}, resp: {}", msg, resp);
-            return resp;
-        } finally {
-            httpClient.close();
-        }
-    }
-
     private static HttpPost constructHttpPost(String url, String msg, String charset) {
         HttpPost post = new HttpPost(url);
         StringEntity entity = new StringEntity(msg, charset);
@@ -155,27 +110,6 @@ public class DingTalkSender {
         return JSONUtils.toJsonString(items);
     }
 
-    public static class DingTalkSendMsgResponse {
-        private Integer errcode;
-        private String errmsg;
-
-        public Integer getErrcode() {
-            return errcode;
-        }
-
-        public void setErrcode(Integer errcode) {
-            this.errcode = errcode;
-        }
-
-        public String getErrmsg() {
-            return errmsg;
-        }
-
-        public void setErrmsg(String errmsg) {
-            this.errmsg = errmsg;
-        }
-    }
-
     private static AlertResult checkSendDingTalkSendMsgResult(String result) {
         AlertResult alertResult = new AlertResult();
         alertResult.setStatus("false");
@@ -201,4 +135,70 @@ public class DingTalkSender {
         return alertResult;
     }
 
+    public AlertResult sendDingTalkMsg(String title, String content) {
+        AlertResult alertResult;
+        try {
+            String resp = sendMsg(title, content);
+            return checkSendDingTalkSendMsgResult(resp);
+        } catch (Exception e) {
+            logger.info("send ding talk alert msg  exception : {}", e.getMessage());
+            alertResult = new AlertResult();
+            alertResult.setStatus("false");
+            alertResult.setMessage("send ding talk alert fail.");
+        }
+        return alertResult;
+    }
+
+    private String sendMsg(String title, String content) throws IOException {
+
+        String msgToJson = textToJsonString(title + content + "#" + keyword);
+        HttpPost httpPost = constructHttpPost(url, msgToJson, "UTF-8");
+
+        CloseableHttpClient httpClient;
+        if (Boolean.TRUE.equals(enableProxy)) {
+            httpClient = getProxyClient(proxy, port, user, password);
+            RequestConfig rcf = getProxyConfig(proxy, port);
+            httpPost.setConfig(rcf);
+        } else {
+            httpClient = getDefaultClient();
+        }
+
+        try {
+            CloseableHttpResponse response = httpClient.execute(httpPost);
+            String resp;
+            try {
+                HttpEntity entity = response.getEntity();
+                resp = EntityUtils.toString(entity, "UTF-8");
+                EntityUtils.consume(entity);
+            } finally {
+                response.close();
+            }
+            logger.info("Ding Talk send title :{},content : {}, resp: {}", title, content, resp);
+            return resp;
+        } finally {
+            httpClient.close();
+        }
+    }
+
+    public static class DingTalkSendMsgResponse {
+        private Integer errcode;
+        private String errmsg;
+
+        public Integer getErrcode() {
+            return errcode;
+        }
+
+        public void setErrcode(Integer errcode) {
+            this.errcode = errcode;
+        }
+
+        public String getErrmsg() {
+            return errmsg;
+        }
+
+        public void setErrmsg(String errmsg) {
+            this.errmsg = errmsg;
+        }
+    }
+
 }

dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/test/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkSenderTest.java

@@ -50,7 +50,7 @@ public class DingTalkSenderTest {
         dingTalkSender.sendDingTalkMsg("keyWord+Welcome", "UTF-8");
         dingTalkConfig.put(DingTalkParamsConstants.NAME_DING_TALK_PROXY_ENABLE, "true");
         dingTalkSender = new DingTalkSender(dingTalkConfig);
-        AlertResult alertResult = dingTalkSender.sendDingTalkMsg("keyWord+Welcome", "UTF-8");
+        AlertResult alertResult = dingTalkSender.sendDingTalkMsg("title", "content test");
         Assert.assertEquals("false",alertResult.getStatus());
     }