Commit f7e1d99c authored by 黎博's avatar 黎博

修改发送钉钉消息的BUG

parent 46a4cae2
...@@ -3,6 +3,7 @@ package cn.qg.holmes.controller.monitor; ...@@ -3,6 +3,7 @@ package cn.qg.holmes.controller.monitor;
import cn.qg.holmes.common.JsonResult; import cn.qg.holmes.common.JsonResult;
import cn.qg.holmes.entity.monitor.SqlMonitorDataSource; import cn.qg.holmes.entity.monitor.SqlMonitorDataSource;
import cn.qg.holmes.entity.monitor.SqlMonitorTask; import cn.qg.holmes.entity.monitor.SqlMonitorTask;
import cn.qg.holmes.quartz.SqlMonitorHandler;
import cn.qg.holmes.service.monitor.SqlMonitorDataSourceService; import cn.qg.holmes.service.monitor.SqlMonitorDataSourceService;
import cn.qg.holmes.service.monitor.SqlMonitorTaskService; import cn.qg.holmes.service.monitor.SqlMonitorTaskService;
import cn.qg.holmes.utils.DingdingUtils; import cn.qg.holmes.utils.DingdingUtils;
...@@ -193,7 +194,9 @@ public class SqlMonitorTaskController { ...@@ -193,7 +194,9 @@ public class SqlMonitorTaskController {
sqlMonitorDataSource.getUsername(), sqlMonitorDataSource.getPassword(), null, sqlMonitorTask.getSql()); sqlMonitorDataSource.getUsername(), sqlMonitorDataSource.getPassword(), null, sqlMonitorTask.getSql());
String dingUrl = sqlMonitorTask.getDingUrl(); String dingUrl = sqlMonitorTask.getDingUrl();
String dingText = sqlMonitorTask.getDingText(); String dingText = sqlMonitorTask.getDingText();
dingText = dingText.replaceAll("\\{count}", String.valueOf(resultList.size())); if (resultList != null) {
dingText = SqlMonitorHandler.replaceDingText(dingText, resultList);
}
String markdownMsg = DingdingUtils.buildMarkdownMsg("监控测试", dingText + "\n" + JSON.toJSONString(resultList), false); String markdownMsg = DingdingUtils.buildMarkdownMsg("监控测试", dingText + "\n" + JSON.toJSONString(resultList), false);
boolean result = DingdingUtils.sendToDingding(markdownMsg, dingUrl); boolean result = DingdingUtils.sendToDingding(markdownMsg, dingUrl);
return JsonResult.buildSuccessResult(result ? "发送成功!" : "发送失败!", true); return JsonResult.buildSuccessResult(result ? "发送成功!" : "发送失败!", true);
......
...@@ -48,7 +48,9 @@ public class SqlMonitorHandler extends QuartzJobBean { ...@@ -48,7 +48,9 @@ public class SqlMonitorHandler extends QuartzJobBean {
sqlMonitorDataSource.getUsername(), sqlMonitorDataSource.getPassword(), null, sqlMonitorTask.getSql()); sqlMonitorDataSource.getUsername(), sqlMonitorDataSource.getPassword(), null, sqlMonitorTask.getSql());
String dingUrl = sqlMonitorTask.getDingUrl(); String dingUrl = sqlMonitorTask.getDingUrl();
String dingText = sqlMonitorTask.getDingText(); String dingText = sqlMonitorTask.getDingText();
dingText = replaceDingText(dingText, resultList); if (resultList != null) {
dingText = replaceDingText(dingText, resultList);
}
String markdownMsg = DingdingUtils.buildMarkdownMsg("监控测试", dingText + "\n" + JSON.toJSONString(resultList), false); String markdownMsg = DingdingUtils.buildMarkdownMsg("监控测试", dingText + "\n" + JSON.toJSONString(resultList), false);
DingdingUtils.sendToDingding(markdownMsg, dingUrl); DingdingUtils.sendToDingding(markdownMsg, dingUrl);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment