From 8f6b13c2fead1fca214a2016efb64ea416840ae7 Mon Sep 17 00:00:00 2001
From: MyronZhang <zhangzhishun1024@gmail.com>
Date: Tue, 11 Feb 2025 16:17:53 +0800
Subject: [PATCH 1/2] fix send ByAll

---
 common/message/main.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/common/message/main.go b/common/message/main.go
index 5ce82a64..eea0f956 100644
--- a/common/message/main.go
+++ b/common/message/main.go
@@ -12,6 +12,16 @@ const (
 )
 
 func Notify(by string, title string, description string, content string) error {
+	if by == ByAll {
+		if err := SendEmail(title, config.RootUserEmail, content); err != nil {
+			return fmt.Errorf("failed to send email: %v", err)
+		}
+		if err := SendMessage(title, description, content); err != nil {
+			return fmt.Errorf("failed to send message: %v", err)
+		}
+		return nil
+	}
+
 	if by == ByEmail {
 		return SendEmail(title, config.RootUserEmail, content)
 	}

From a78360efd8040ae4f9b52bc088f0175c770ed8cb Mon Sep 17 00:00:00 2001
From: MyronZhang <zhangzhishun1024@gmail.com>
Date: Tue, 11 Feb 2025 18:32:59 +0800
Subject: [PATCH 2/2] fix send ByAll

---
 common/message/main.go     | 10 ++++++++--
 controller/channel-test.go |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/common/message/main.go b/common/message/main.go
index eea0f956..4d1470f9 100644
--- a/common/message/main.go
+++ b/common/message/main.go
@@ -12,12 +12,18 @@ const (
 )
 
 func Notify(by string, title string, description string, content string) error {
+
 	if by == ByAll {
+		var errMsgs []string
 		if err := SendEmail(title, config.RootUserEmail, content); err != nil {
-			return fmt.Errorf("failed to send email: %v", err)
+			errMsgs = append(errMsgs, fmt.Sprintf("failed to send email: %v", err))
 		}
 		if err := SendMessage(title, description, content); err != nil {
-			return fmt.Errorf("failed to send message: %v", err)
+			errMsgs = append(errMsgs, fmt.Sprintf("failed to send message: %v", err))
+		}
+
+		if len(errMsgs) > 0 {
+			return fmt.Errorf("multiple errors occurred: %v", errMsgs)
 		}
 		return nil
 	}
diff --git a/controller/channel-test.go b/controller/channel-test.go
index 3894691c..e01b2967 100644
--- a/controller/channel-test.go
+++ b/controller/channel-test.go
@@ -266,7 +266,7 @@ func testChannels(ctx context.Context, notify bool, scope string) error {
 		if notify {
 			err := message.Notify(message.ByAll, "渠道测试完成", "", "渠道测试完成，如果没有收到禁用通知，说明所有渠道都正常")
 			if err != nil {
-				logger.SysError(fmt.Sprintf("failed to send email: %s", err.Error()))
+				logger.SysError(fmt.Sprintf("failed to send notify: %s", err.Error()))
 			}
 		}
 	}()