From 7d531ac8769a8d3e6f3de5f1bcbbfb35e0a03592 Mon Sep 17 00:00:00 2001 From: zengxiaobo Date: Fri, 5 Jul 2024 17:38:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8E=BB=E6=8E=89=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=9A=84stacks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/axzo/foundation/result/ApiResult.java | 9 --------- .../foundation/web/support/alert/AlertClientImpl.java | 4 ++++ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/common-lib/src/main/java/cn/axzo/foundation/result/ApiResult.java b/common-lib/src/main/java/cn/axzo/foundation/result/ApiResult.java index 9696d5c..9e175ad 100644 --- a/common-lib/src/main/java/cn/axzo/foundation/result/ApiResult.java +++ b/common-lib/src/main/java/cn/axzo/foundation/result/ApiResult.java @@ -1,6 +1,5 @@ package cn.axzo.foundation.result; -import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.annotation.JsonIgnore; import com.google.common.base.Strings; import lombok.AllArgsConstructor; @@ -27,8 +26,6 @@ public class ApiResult { protected T data; - protected JSONObject stacks; - public static ApiResult success() { return success(null); } @@ -74,12 +71,6 @@ public class ApiResult { return SUCCESS_CODE.equals(getCode()); } - - public ApiResult setStacks(JSONObject stacks) { - this.stacks = stacks; - return this; - } - /** * 根据appId 获取标准的code * 如果code > 100000 则认为可能已经带了appId diff --git a/web-support-lib/src/main/java/cn/axzo/foundation/web/support/alert/AlertClientImpl.java b/web-support-lib/src/main/java/cn/axzo/foundation/web/support/alert/AlertClientImpl.java index 0a97e3e..cbd0902 100644 --- a/web-support-lib/src/main/java/cn/axzo/foundation/web/support/alert/AlertClientImpl.java +++ b/web-support-lib/src/main/java/cn/axzo/foundation/web/support/alert/AlertClientImpl.java @@ -6,6 +6,7 @@ import com.google.common.collect.Multimaps; import com.google.common.util.concurrent.RateLimiter; import lombok.Builder; import lombok.extern.slf4j.Slf4j; +import org.springframework.util.CollectionUtils; import java.time.LocalDateTime; import java.util.Collection; @@ -74,6 +75,9 @@ public class AlertClientImpl implements AlertClient { private void consume() { Map> map = alertsMap.asMap(); + if (CollectionUtils.isEmpty(map)) { + return; + } try { consumer.accept(map); } catch (Exception ex) {