diff --git a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/LarkAlarm.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/LarkAlarm.java index d2c094a5..e4612b48 100644 --- a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/LarkAlarm.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/LarkAlarm.java @@ -36,7 +36,7 @@ import java.util.Map; public class LarkAlarm extends AbstractAlarm { - public static final String atLabel = ""; + public static final String AT_LABEL = ""; @Override public Integer getAlarmType() { @@ -45,9 +45,7 @@ public class LarkAlarm extends AbstractAlarm { @Override public boolean asyncSendMessage(AlarmContext context) { - threadPoolExecutor.execute(() -> { - syncSendMessage(context); - }); + threadPoolExecutor.execute(() -> syncSendMessage(context)); return true; } @@ -69,12 +67,15 @@ public class LarkAlarm extends AbstractAlarm { HttpRequest request = post.body(JsonUtil.toJsonString(builder), ContentType.JSON.toString()); HttpResponse execute = request.execute(); LogUtils.debug(log, JsonUtil.toJsonString(execute)); + if (execute.isOk()) { + return true; + } + log.error("发送lark消息失败:{}", execute.body()); + return false; } catch (Exception e) { log.error("发送lark消息失败", e); return false; } - - return true; } private List buildElements(String text, List ats) { @@ -123,10 +124,10 @@ public class LarkAlarm extends AbstractAlarm { StringBuilder sb = new StringBuilder(text); if (ats.stream().map(String::toLowerCase).anyMatch(SystemConstants.AT_ALL::equals)) { - sb.append(MessageFormat.format(atLabel, SystemConstants.AT_ALL)); + sb.append(MessageFormat.format(AT_LABEL, SystemConstants.AT_ALL)); } else { ats.stream().filter(StrUtil::isNotBlank) - .forEach(at -> sb.append(MessageFormat.format(atLabel, at))); + .forEach(at -> sb.append(MessageFormat.format(AT_LABEL, at))); } return sb.toString(); } diff --git a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/QiYeWechatAlarm.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/QiYeWechatAlarm.java index 91f7a277..c0508bee 100644 --- a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/QiYeWechatAlarm.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/QiYeWechatAlarm.java @@ -26,7 +26,7 @@ import java.util.Map; @Component public class QiYeWechatAlarm extends AbstractAlarm { - public static final String atLabel = "<@{0}>"; + public static final String AT_LABEL = "<@{0}>"; @Override public Integer getAlarmType() { @@ -50,19 +50,22 @@ public class QiYeWechatAlarm extends AbstractAlarm { } Map map = MapUtil.newHashMap(); QiYeWechatMessageContent messageContent = new QiYeWechatMessageContent(); - messageContent.setContent(StrUtil.sub(DingDingUtils.getAtText(qiYeWechatAttribute.getAts(), context.getText(), atLabel), 0, 4096)); + messageContent.setContent(StrUtil.sub(DingDingUtils.getAtText(qiYeWechatAttribute.getAts(), context.getText(), AT_LABEL), 0, 4096)); map.put("msgtype", "markdown"); map.put("markdown", messageContent); HttpRequest post = HttpUtil.createPost(webhookUrl); HttpRequest request = post.body(JsonUtil.toJsonString(map), ContentType.JSON.toString()); HttpResponse execute = request.execute(); LogUtils.debug(log, JsonUtil.toJsonString(execute)); + if (execute.isOk()) { + return true; + } + log.error("发送企业微信消息失败:{}", execute.body()); + return false; } catch (Exception e) { log.error("发送企业微信消息失败", e); return false; } - return true; - } @Override