From 2921bc9869c3625ca512391bafabe98ecb557761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=A7=E9=A9=8A?= Date: Sat, 1 Mar 2025 22:19:06 +0800 Subject: [PATCH] chore: golint --- internal/svc/service_context.go | 2 ++ notification.go | 5 +++-- pkg/repository/aws_ses_mailer.go | 13 +++++++------ pkg/repository/smtp_mailer.go | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/internal/svc/service_context.go b/internal/svc/service_context.go index 2bc61a5..8674c25 100644 --- a/internal/svc/service_context.go +++ b/internal/svc/service_context.go @@ -6,6 +6,7 @@ import ( useD "app-cloudep-notification-service/pkg/domain/usecase" "app-cloudep-notification-service/pkg/repository" "app-cloudep-notification-service/pkg/usecase" + "code.30cm.net/digimon/library-go/errs" "code.30cm.net/digimon/library-go/errs/code" ) @@ -75,6 +76,7 @@ func NewServiceContext(c config.Config) *ServiceContext { } uc := usecase.MustDeliveryUseCase(param) + return &ServiceContext{ Config: c, DeliveryUseCase: uc, diff --git a/notification.go b/notification.go index b35a92c..95fe1ec 100644 --- a/notification.go +++ b/notification.go @@ -2,7 +2,8 @@ package main import ( "flag" - "fmt" + + "github.com/zeromicro/go-zero/core/logx" "app-cloudep-notification-service/gen_result/pb/notification" "app-cloudep-notification-service/internal/config" @@ -34,6 +35,6 @@ func main() { }) defer s.Stop() - fmt.Printf("Starting rpc server at %s...\n", c.ListenOn) + logx.Infof("Starting rpc server at %s...\n", c.ListenOn) s.Start() } diff --git a/pkg/repository/aws_ses_mailer.go b/pkg/repository/aws_ses_mailer.go index 721afea..229cb4a 100644 --- a/pkg/repository/aws_ses_mailer.go +++ b/pkg/repository/aws_ses_mailer.go @@ -50,9 +50,7 @@ func (use *AwsEmailDeliveryRepository) SendMail(ctx context.Context, req reposit err := use.Pool.Submit(func() { // 設置郵件參數 to := make([]string, 0, len(req.To)) - for _, item := range req.To { - to = append(to, item) - } + to = append(to, req.To...) input := &ses.SendEmailInput{ Destination: &types.Destination{ @@ -74,9 +72,12 @@ func (use *AwsEmailDeliveryRepository) SendMail(ctx context.Context, req reposit } // 發送郵件 - //TODO 不明原因送不出去,會被 context cancel 這裡先把它手動加到100sec - c, _ := context.WithTimeout(context.Background(), 100*time.Second) - if _, err := use.Client.SendEmail(c, input); err != nil { + // TODO 不明原因送不出去,會被 context cancel 這裡先把它手動加到100sec + newCtx, cancel := context.WithTimeout(context.Background(), 100*time.Second) + defer cancel() + + //nolint:contextcheck + if _, err := use.Client.SendEmail(newCtx, input); err != nil { _ = domain.ThirdPartyErrorL( code.CloudEPNotification, domain.FailedToSendEmailErrorCode, diff --git a/pkg/repository/smtp_mailer.go b/pkg/repository/smtp_mailer.go index 63f9f0b..0c13a24 100644 --- a/pkg/repository/smtp_mailer.go +++ b/pkg/repository/smtp_mailer.go @@ -31,7 +31,7 @@ func MustSMTPUseCase(param SMTPMailUseCaseParam) repository.MailRepository { } } -func (repo *SMTPMailRepository) SendMail(ctx context.Context, req repository.MailReq) error { +func (repo *SMTPMailRepository) SendMail(_ context.Context, req repository.MailReq) error { // 用 goroutine pool 送,否則會超時 err := repo.Pool.Submit(func() { m := gomail.NewMessage()