refactor: remove nikoksr/notify deps

internal/domain/access.go

@@ -260,7 +260,7 @@ type AccessConfigForSSLCom struct {
 	EabHmacKey string `json:"eabHmacKey"`
 }
 
-type AccessConfigForTelegram struct {
+type AccessConfigForTelegramBot struct {
 	BotToken      string `json:"botToken"`
 	DefaultChatId int64  `json:"defaultChatId,omitempty"`
 }

internal/domain/provider.go

@@ -67,7 +67,7 @@ const (
 	AccessProviderTypeSafeLine            = AccessProviderType("safeline")
 	AccessProviderTypeSSH                 = AccessProviderType("ssh")
 	AccessProviderTypeSSLCOM              = AccessProviderType("sslcom")
-	AccessProviderTypeTelegram            = AccessProviderType("telegram")
+	AccessProviderTypeTelegramBot         = AccessProviderType("telegrambot")
 	AccessProviderTypeTencentCloud        = AccessProviderType("tencentcloud")
 	AccessProviderTypeUCloud              = AccessProviderType("ucloud")
 	AccessProviderTypeUpyun               = AccessProviderType("upyun")
@@ -259,7 +259,7 @@ const (
 	NotificationProviderTypeEmail       = NotificationProviderType(AccessProviderTypeEmail)
 	NotificationProviderTypeLarkBot     = NotificationProviderType(AccessProviderTypeLarkBot)
 	NotificationProviderTypeMattermost  = NotificationProviderType(AccessProviderTypeMattermost)
-	NotificationProviderTypeTelegram    = NotificationProviderType(AccessProviderTypeTelegram)
+	NotificationProviderTypeTelegramBot = NotificationProviderType(AccessProviderTypeTelegramBot)
 	NotificationProviderTypeWebhook     = NotificationProviderType(AccessProviderTypeWebhook)
 	NotificationProviderTypeWeComBot    = NotificationProviderType(AccessProviderTypeWeComBot)
 )

internal/notify/providers.go

@@ -10,7 +10,7 @@ import (
 	pEmail "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/email"
 	pLarkBot "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/larkbot"
 	pMattermost "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/mattermost"
-	pTelegram "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/telegram"
+	pTelegramBot "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/telegrambot"
 	pWebhook "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/webhook"
 	pWeComBot "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/wecombot"
 	httputil "github.com/usual2970/certimate/internal/pkg/utils/http"
@@ -87,14 +87,14 @@ func createNotifierProvider(options *notifierProviderOptions) (notifier.Notifier
 			})
 		}
 
-	case domain.NotificationProviderTypeTelegram:
+	case domain.NotificationProviderTypeTelegramBot:
 		{
-			access := domain.AccessConfigForTelegram{}
+			access := domain.AccessConfigForTelegramBot{}
 			if err := maputil.Populate(options.ProviderAccessConfig, &access); err != nil {
 				return nil, fmt.Errorf("failed to populate provider access config: %w", err)
 			}
 
-			return pTelegram.NewNotifier(&pTelegram.NotifierConfig{
+			return pTelegramBot.NewNotifier(&pTelegramBot.NotifierConfig{
 				BotToken: access.BotToken,
 				ChatId:   maputil.GetOrDefaultInt64(options.ProviderExtendedConfig, "chatId", access.DefaultChatId),
 			})

internal/notify/providers_deprecated.go

@@ -14,7 +14,7 @@ import (
 	pPushover "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/pushover"
 	pPushPlus "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/pushplus"
 	pServerChan "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/serverchan"
-	pTelegram "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/telegram"
+	pTelegram "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/telegrambot"
 	pWebhook "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/webhook"
 	pWeCom "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/wecombot"
 	maputil "github.com/usual2970/certimate/internal/pkg/utils/map"
@@ -52,9 +52,9 @@ func createNotifierProviderUseGlobalSettings(channel domain.NotifyChannelType, c
 
 	case domain.NotifyChannelTypeGotify:
 		return pGotify.NewNotifier(&pGotify.NotifierConfig{
-			Url:      maputil.GetString(channelConfig, "url"),
-			Token:    maputil.GetString(channelConfig, "token"),
-			Priority: maputil.GetOrDefaultInt64(channelConfig, "priority", 1),
+			ServerUrl: maputil.GetString(channelConfig, "url"),
+			Token:     maputil.GetString(channelConfig, "token"),
+			Priority:  maputil.GetOrDefaultInt64(channelConfig, "priority", 1),
 		})
 
 	case domain.NotifyChannelTypeLark:
@@ -83,7 +83,7 @@ func createNotifierProviderUseGlobalSettings(channel domain.NotifyChannelType, c
 
 	case domain.NotifyChannelTypeServerChan:
 		return pServerChan.NewNotifier(&pServerChan.NotifierConfig{
-			Url: maputil.GetString(channelConfig, "url"),
+			ServerUrl: maputil.GetString(channelConfig, "url"),
 		})
 
 	case domain.NotifyChannelTypeTelegram:

internal/pkg/core/deployer/providers/webhook/webhook.go

@@ -159,9 +159,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE
 
 	// 生成请求
 	// 其中 GET 请求需转换为查询参数
-	req := d.httpClient.R().
-		SetContext(ctx).
-		SetHeaderMultiValues(webhookHeaders)
+	req := d.httpClient.R().SetHeaderMultiValues(webhookHeaders)
 	req.URL = webhookUrl.String()
 	req.Method = webhookMethod
 	if webhookMethod == http.MethodGet {

internal/pkg/core/notifier/providers/bark/bark.go

@@ -2,10 +2,11 @@ package bark
 
 import (
 	"context"
+	"fmt"
 	"log/slog"
+	"net/http"
 
-	"github.com/nikoksr/notify"
-	"github.com/nikoksr/notify/service/bark"
+	"github.com/go-resty/resty/v2"
 
 	"github.com/usual2970/certimate/internal/pkg/core/notifier"
 )
@@ -19,8 +20,9 @@ type NotifierConfig struct {
 }
 
 type NotifierProvider struct {
-	config *NotifierConfig
-	logger *slog.Logger
+	config     *NotifierConfig
+	logger     *slog.Logger
+	httpClient *resty.Client
 }
 
 var _ notifier.Notifier = (*NotifierProvider)(nil)
@@ -30,9 +32,12 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
 		panic("config is nil")
 	}
 
+	client := resty.New()
+
 	return &NotifierProvider{
-		config: config,
-		logger: slog.Default(),
+		config:     config,
+		logger:     slog.Default(),
+		httpClient: client,
 	}, nil
 }
 
@@ -46,16 +51,25 @@ func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
 }
 
 func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (res *notifier.NotifyResult, err error) {
-	var srv notify.Notifier
-	if n.config.ServerUrl == "" {
-		srv = bark.New(n.config.DeviceKey)
-	} else {
-		srv = bark.NewWithServers(n.config.DeviceKey, n.config.ServerUrl)
+	const defaultServerURL = "https://api.day.app/"
+	serverUrl := defaultServerURL
+	if n.config.ServerUrl != "" {
+		serverUrl = n.config.ServerUrl
 	}
 
-	err = srv.Send(ctx, subject, message)
+	// REF: https://bark.day.app/#/tutorial
+	req := n.httpClient.R().
+		SetHeader("Content-Type", "application/json").
+		SetBody(map[string]any{
+			"title":      subject,
+			"body":       message,
+			"device_key": n.config.DeviceKey,
+		})
+	resp, err := req.Execute(http.MethodPost, serverUrl)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("bark api error: failed to send request: %w", err)
+	} else if resp.IsError() {
+		return nil, fmt.Errorf("bark api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
 	}
 
 	return &notifier.NotifyResult{}, nil

internal/pkg/core/notifier/providers/dingtalkbot/dingtalkbot.go

@@ -6,7 +6,7 @@ import (
 	"log/slog"
 	"net/url"
 
-	"github.com/nikoksr/notify/service/dingding"
+	"github.com/blinkbean/dingtalk"
 
 	"github.com/usual2970/certimate/internal/pkg/core/notifier"
 )
@@ -48,17 +48,18 @@ func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
 func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (res *notifier.NotifyResult, err error) {
 	webhookUrl, err := url.Parse(n.config.WebhookUrl)
 	if err != nil {
-		return nil, fmt.Errorf("invalid webhook url: %w", err)
+		return nil, fmt.Errorf("dingtalk api error: invalid webhook url: %w", err)
 	}
 
-	srv := dingding.New(&dingding.Config{
-		Token:  webhookUrl.Query().Get("access_token"),
-		Secret: n.config.Secret,
-	})
+	var bot *dingtalk.DingTalk
+	if n.config.Secret == "" {
+		bot = dingtalk.InitDingTalk([]string{webhookUrl.Query().Get("access_token")}, "")
+	} else {
+		bot = dingtalk.InitDingTalkWithSecret(webhookUrl.Query().Get("access_token"), n.config.Secret)
+	}
 
-	err = srv.Send(ctx, subject, message)
-	if err != nil {
-		return nil, err
+	if err := bot.SendTextMessage(subject + "\n" + message); err != nil {
+		return nil, fmt.Errorf("dingtalk api error: %w", err)
 	}
 
 	return &notifier.NotifyResult{}, nil

internal/pkg/core/notifier/providers/gotify/gotify.go

@@ -1,20 +1,20 @@
 package gotify
 
 import (
-	"bytes"
 	"context"
-	"encoding/json"
 	"fmt"
-	"io"
 	"log/slog"
 	"net/http"
+	"strings"
+
+	"github.com/go-resty/resty/v2"
 
 	"github.com/usual2970/certimate/internal/pkg/core/notifier"
 )
 
 type NotifierConfig struct {
 	// Gotify 服务地址。
-	Url string `json:"url"`
+	ServerUrl string `json:"serverUrl"`
 	// Gotify Token。
 	Token string `json:"token"`
 	// Gotify 消息优先级。
@@ -24,7 +24,7 @@ type NotifierConfig struct {
 type NotifierProvider struct {
 	config     *NotifierConfig
 	logger     *slog.Logger
-	httpClient *http.Client
+	httpClient *resty.Client
 }
 
 var _ notifier.Notifier = (*NotifierProvider)(nil)
@@ -34,10 +34,12 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
 		panic("config is nil")
 	}
 
+	client := resty.New()
+
 	return &NotifierProvider{
 		config:     config,
 		logger:     slog.Default(),
-		httpClient: http.DefaultClient,
+		httpClient: client,
 	}, nil
 }
 
@@ -51,45 +53,22 @@ func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
 }
 
 func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (res *notifier.NotifyResult, err error) {
-	reqBody := &struct {
-		Title    string `json:"title"`
-		Message  string `json:"message"`
-		Priority int64  `json:"priority"`
-	}{
-		Title:    subject,
-		Message:  message,
-		Priority: n.config.Priority,
-	}
+	serverUrl := strings.TrimRight(n.config.ServerUrl, "/")
 
-	body, err := json.Marshal(reqBody)
-	if err != nil {
-		return nil, fmt.Errorf("gotify api error: failed to encode message body: %w", err)
-	}
-
-	req, err := http.NewRequestWithContext(
-		ctx,
-		http.MethodPost,
-		fmt.Sprintf("%s/message", n.config.Url),
-		bytes.NewReader(body),
-	)
-	if err != nil {
-		return nil, fmt.Errorf("gotify api error: failed to create new request: %w", err)
-	}
-
-	req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", n.config.Token))
-	req.Header.Set("Content-Type", "application/json; charset=utf-8")
-
-	resp, err := n.httpClient.Do(req)
+	// REF: https://gotify.net/api-docs#/message/createMessage
+	req := n.httpClient.R().
+		SetHeader("Content-Type", "application/json").
+		SetHeader("Authorization", "Bearer "+n.config.Token).
+		SetBody(map[string]any{
+			"title":    subject,
+			"message":  message,
+			"priority": n.config.Priority,
+		})
+	resp, err := req.Execute(http.MethodPost, fmt.Sprintf("%s/message", serverUrl))
 	if err != nil {
 		return nil, fmt.Errorf("gotify api error: failed to send request: %w", err)
-	}
-	defer resp.Body.Close()
-
-	result, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, fmt.Errorf("gotify api error: failed to read response: %w", err)
-	} else if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("gotify api error: unexpected status code: %d, resp: %s", resp.StatusCode, string(result))
+	} else if resp.IsError() {
+		return nil, fmt.Errorf("gotify api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
 	}
 
 	return &notifier.NotifyResult{}, nil

internal/pkg/core/notifier/providers/gotify/gotify_test.go

@@ -48,9 +48,9 @@ func TestNotify(t *testing.T) {
 		}, "\n"))
 
 		notifier, err := provider.NewNotifier(&provider.NotifierConfig{
-			Url:      fUrl,
-			Token:    fToken,
-			Priority: fPriority,
+			ServerUrl: fUrl,
+			Token:     fToken,
+			Priority:  fPriority,
 		})
 		if err != nil {
 			t.Errorf("err: %+v", err)

internal/pkg/core/notifier/providers/larkbot/larkbot.go

@@ -2,9 +2,10 @@ package larkbot
 
 import (
 	"context"
+	"fmt"
 	"log/slog"
 
-	"github.com/nikoksr/notify/service/lark"
+	"github.com/go-lark/lark"
 
 	"github.com/usual2970/certimate/internal/pkg/core/notifier"
 )
@@ -42,11 +43,17 @@ func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
 }
 
 func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (res *notifier.NotifyResult, err error) {
-	srv := lark.NewWebhookService(n.config.WebhookUrl)
-
-	err = srv.Send(ctx, subject, message)
+	bot := lark.NewNotificationBot(n.config.WebhookUrl)
+	content := lark.NewPostBuilder().
+		Title(subject).
+		TextTag(message, 1, false).
+		Render()
+	msg := lark.NewMsgBuffer(lark.MsgPost).Post(content)
+	resp, err := bot.PostNotificationV2(msg.Build())
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("lark api error: %w", err)
+	} else if resp.Code != 0 {
+		return nil, fmt.Errorf("lark api error: code='%d', message='%s'", resp.Code, resp.Msg)
 	}
 
 	return &notifier.NotifyResult{}, nil

internal/pkg/core/notifier/providers/mattermost/mattermost.go

@@ -1,15 +1,14 @@
 package mattermost
 
 import (
-	"bytes"
 	"context"
-	"encoding/json"
-	"io"
+	"fmt"
 	"log/slog"
 	"net/http"
 	"strings"
 
-	"github.com/nikoksr/notify/service/mattermost"
+	"github.com/go-resty/resty/v2"
+
 	"github.com/usual2970/certimate/internal/pkg/core/notifier"
 )
 
@@ -25,8 +24,9 @@ type NotifierConfig struct {
 }
 
 type NotifierProvider struct {
-	config *NotifierConfig
-	logger *slog.Logger
+	config     *NotifierConfig
+	logger     *slog.Logger
+	httpClient *resty.Client
 }
 
 var _ notifier.Notifier = (*NotifierProvider)(nil)
@@ -36,9 +36,12 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
 		panic("config is nil")
 	}
 
+	client := resty.New()
+
 	return &NotifierProvider{
-		config: config,
-		logger: slog.Default(),
+		config:     config,
+		logger:     slog.Default(),
+		httpClient: client,
 	}, nil
 }
 
@@ -52,17 +55,29 @@ func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
 }
 
 func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (res *notifier.NotifyResult, err error) {
-	srv := mattermost.New(strings.TrimRight(n.config.ServerUrl, "/"))
+	serverUrl := strings.TrimRight(n.config.ServerUrl, "/")
 
-	if err := srv.LoginWithCredentials(ctx, n.config.Username, n.config.Password); err != nil {
-		return nil, err
+	// REF: https://developers.mattermost.com/api-documentation/#/operations/Login
+	loginReq := n.httpClient.R().
+		SetHeader("Content-Type", "application/json").
+		SetBody(map[string]any{
+			"login_id": n.config.Username,
+			"password": n.config.Password,
+		})
+	loginResp, err := loginReq.Execute(http.MethodPost, fmt.Sprintf("%s/api/v4/users/login", serverUrl))
+	if err != nil {
+		return nil, fmt.Errorf("mattermost api error: failed to send request: %w", err)
+	} else if loginResp.IsError() {
+		return nil, fmt.Errorf("mattermost api error: unexpected status code: %d, resp: %s", loginResp.StatusCode(), loginResp.String())
+	} else if loginResp.Header().Get("Token") == "" {
+		return nil, fmt.Errorf("mattermost api error: received empty login token")
 	}
 
-	srv.AddReceivers(n.config.ChannelId)
-
-	// 复写消息样式
-	srv.PreSend(func(req *http.Request) error {
-		m := map[string]interface{}{
+	// REF: https://developers.mattermost.com/api-documentation/#/operations/CreatePost
+	postReq := n.httpClient.R().
+		SetHeader("Content-Type", "application/json").
+		SetHeader("Authorization", "Bearer "+loginResp.Header().Get("Token")).
+		SetBody(map[string]any{
 			"channel_id": n.config.ChannelId,
 			"props": map[string]interface{}{
 				"attachments": []map[string]interface{}{
@@ -72,20 +87,12 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
 					},
 				},
 			},
-		}
-
-		if body, err := json.Marshal(m); err != nil {
-			return err
-		} else {
-			req.ContentLength = int64(len(body))
-			req.Body = io.NopCloser(bytes.NewReader(body))
-		}
-
-		return nil
-	})
-
-	if err = srv.Send(ctx, subject, message); err != nil {
-		return nil, err
+		})
+	postResp, err := postReq.Execute(http.MethodPost, fmt.Sprintf("%s/api/v4/posts", serverUrl))
+	if err != nil {
+		return nil, fmt.Errorf("mattermost api error: failed to send request: %w", err)
+	} else if postResp.IsError() {
+		return nil, fmt.Errorf("mattermost api error: unexpected status code: %d, resp: %s", postResp.StatusCode(), postResp.String())
 	}
 
 	return &notifier.NotifyResult{}, nil

internal/pkg/core/notifier/providers/pushover/pushover.go

@@ -1,14 +1,13 @@
 package pushover
 
 import (
-	"bytes"
 	"context"
-	"encoding/json"
 	"fmt"
-	"io"
 	"log/slog"
 	"net/http"
 
+	"github.com/go-resty/resty/v2"
+
 	"github.com/usual2970/certimate/internal/pkg/core/notifier"
 )
 
@@ -22,7 +21,7 @@ type NotifierConfig struct {
 type NotifierProvider struct {
 	config     *NotifierConfig
 	logger     *slog.Logger
-	httpClient *http.Client
+	httpClient *resty.Client
 }
 
 var _ notifier.Notifier = (*NotifierProvider)(nil)
@@ -32,10 +31,12 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
 		panic("config is nil")
 	}
 
+	client := resty.New()
+
 	return &NotifierProvider{
 		config:     config,
 		logger:     slog.Default(),
-		httpClient: http.DefaultClient,
+		httpClient: client,
 	}, nil
 }
 
@@ -50,46 +51,19 @@ func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
 
 func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (res *notifier.NotifyResult, err error) {
 	// REF: https://pushover.net/api
-	reqBody := &struct {
-		Token   string `json:"token"`
-		User    string `json:"user"`
-		Title   string `json:"title"`
-		Message string `json:"message"`
-	}{
-		Token:   n.config.Token,
-		User:    n.config.User,
-		Title:   subject,
-		Message: message,
-	}
-
-	body, err := json.Marshal(reqBody)
-	if err != nil {
-		return nil, fmt.Errorf("pushover api error: failed to encode message body: %w", err)
-	}
-
-	req, err := http.NewRequestWithContext(
-		ctx,
-		http.MethodPost,
-		"https://api.pushover.net/1/messages.json",
-		bytes.NewReader(body),
-	)
-	if err != nil {
-		return nil, fmt.Errorf("pushover api error: failed to create new request: %w", err)
-	}
-
-	req.Header.Set("Content-Type", "application/json; charset=utf-8")
-
-	resp, err := n.httpClient.Do(req)
+	req := n.httpClient.R().
+		SetHeader("Content-Type", "application/json").
+		SetBody(map[string]any{
+			"title":   subject,
+			"message": message,
+			"token":   n.config.Token,
+			"user":    n.config.User,
+		})
+	resp, err := req.Execute(http.MethodPost, "https://api.pushover.net/1/messages.json")
 	if err != nil {
 		return nil, fmt.Errorf("pushover api error: failed to send request: %w", err)
-	}
-	defer resp.Body.Close()
-
-	result, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, fmt.Errorf("pushover api error: failed to read response: %w", err)
-	} else if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("pushover api error: unexpected status code: %d, resp: %s", resp.StatusCode, string(result))
+	} else if resp.IsError() {
+		return nil, fmt.Errorf("pushover api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
 	}
 
 	return &notifier.NotifyResult{}, nil

internal/pkg/core/notifier/providers/pushplus/pushplus.go

@@ -1,14 +1,14 @@
 package pushplus
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
-	"io"
 	"log/slog"
 	"net/http"
 
+	"github.com/go-resty/resty/v2"
+
 	"github.com/usual2970/certimate/internal/pkg/core/notifier"
 )
 
@@ -20,7 +20,7 @@ type NotifierConfig struct {
 type NotifierProvider struct {
 	config     *NotifierConfig
 	logger     *slog.Logger
-	httpClient *http.Client
+	httpClient *resty.Client
 }
 
 var _ notifier.Notifier = (*NotifierProvider)(nil)
@@ -30,10 +30,12 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
 		panic("config is nil")
 	}
 
+	client := resty.New()
+
 	return &NotifierProvider{
 		config:     config,
 		logger:     slog.Default(),
-		httpClient: http.DefaultClient,
+		httpClient: client,
 	}, nil
 }
 
@@ -47,55 +49,29 @@ func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
 }
 
 func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (res *notifier.NotifyResult, err error) {
-	// REF: https://pushplus.plus/doc/guide/api.html
-	reqBody := &struct {
-		Token   string `json:"token"`
-		Title   string `json:"title"`
-		Content string `json:"content"`
-	}{
-		Token:   n.config.Token,
-		Title:   subject,
-		Content: message,
-	}
-
-	body, err := json.Marshal(reqBody)
-	if err != nil {
-		return nil, fmt.Errorf("pushplus api error: failed to encode message body: %w", err)
-	}
-
-	req, err := http.NewRequestWithContext(
-		ctx,
-		http.MethodPost,
-		"https://www.pushplus.plus/send",
-		bytes.NewReader(body),
-	)
-	if err != nil {
-		return nil, fmt.Errorf("pushplus api error: failed to create new request: %w", err)
-	}
-
-	req.Header.Set("Content-Type", "application/json; charset=utf-8")
-
-	resp, err := n.httpClient.Do(req)
+	// REF: https://pushplus.plus/doc/guide/api.html#%E4%B8%80%E3%80%81%E5%8F%91%E9%80%81%E6%B6%88%E6%81%AF%E6%8E%A5%E5%8F%A3
+	req := n.httpClient.R().
+		SetHeader("Content-Type", "application/json").
+		SetBody(map[string]any{
+			"title":   subject,
+			"content": message,
+			"token":   n.config.Token,
+		})
+	resp, err := req.Execute(http.MethodPost, "https://www.pushplus.plus/send")
 	if err != nil {
 		return nil, fmt.Errorf("pushplus api error: failed to send request: %w", err)
-	}
-	defer resp.Body.Close()
-
-	result, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, fmt.Errorf("pushplus api error: failed to read response: %w", err)
-	} else if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("pushplus api error: unexpected status code: %d, resp: %s", resp.StatusCode, string(result))
+	} else if resp.IsError() {
+		return nil, fmt.Errorf("pushplus api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
 	}
 
 	var errorResponse struct {
-		Code int    `json:"code"`
-		Msg  string `json:"msg"`
+		Code    int    `json:"code"`
+		Message string `json:"msg"`
 	}
-	if err := json.Unmarshal(result, &errorResponse); err != nil {
-		return nil, fmt.Errorf("pushplus api error: failed to decode response: %w", err)
+	if err := json.Unmarshal(resp.Body(), &errorResponse); err != nil {
+		return nil, fmt.Errorf("pushplus api error: failed to unmarshal response: %w", err)
 	} else if errorResponse.Code != 200 {
-		return nil, fmt.Errorf("pushplus api error: unexpected response code: %d, msg: %s", errorResponse.Code, errorResponse.Msg)
+		return nil, fmt.Errorf("pushplus api error: code='%d', message='%s'", errorResponse.Code, errorResponse.Message)
 	}
 
 	return &notifier.NotifyResult{}, nil

internal/pkg/core/notifier/providers/serverchan/serverchan.go

@@ -2,22 +2,24 @@ package serverchan
 
 import (
 	"context"
+	"fmt"
 	"log/slog"
 	"net/http"
 
-	notifyHttp "github.com/nikoksr/notify/service/http"
+	"github.com/go-resty/resty/v2"
 
 	"github.com/usual2970/certimate/internal/pkg/core/notifier"
 )
 
 type NotifierConfig struct {
 	// ServerChan 服务地址。
-	Url string `json:"url"`
+	ServerUrl string `json:"serverUrl"`
 }
 
 type NotifierProvider struct {
-	config *NotifierConfig
-	logger *slog.Logger
+	config     *NotifierConfig
+	logger     *slog.Logger
+	httpClient *resty.Client
 }
 
 var _ notifier.Notifier = (*NotifierProvider)(nil)
@@ -27,9 +29,12 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
 		panic("config is nil")
 	}
 
+	client := resty.New()
+
 	return &NotifierProvider{
-		config: config,
-		logger: slog.Default(),
+		config:     config,
+		logger:     slog.Default(),
+		httpClient: client,
 	}, nil
 }
 
@@ -43,24 +48,18 @@ func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
 }
 
 func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (res *notifier.NotifyResult, err error) {
-	srv := notifyHttp.New()
-
-	srv.AddReceivers(&notifyHttp.Webhook{
-		URL:         n.config.Url,
-		Header:      http.Header{},
-		ContentType: "application/json",
-		Method:      http.MethodPost,
-		BuildPayload: func(subject, message string) (payload any) {
-			return map[string]string{
-				"text": subject,
-				"desp": message,
-			}
-		},
-	})
-
-	err = srv.Send(ctx, subject, message)
+	// REF: https://sct.ftqq.com/
+	req := n.httpClient.R().
+		SetHeader("Content-Type", "application/json").
+		SetBody(map[string]any{
+			"text": subject,
+			"desp": message,
+		})
+	resp, err := req.Execute(http.MethodPost, n.config.ServerUrl)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("serverchan api error: failed to send request: %w", err)
+	} else if resp.IsError() {
+		return nil, fmt.Errorf("serverchan api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
 	}
 
 	return &notifier.NotifyResult{}, nil

internal/pkg/core/notifier/providers/serverchan/serverchan_test.go

@@ -39,7 +39,7 @@ func TestNotify(t *testing.T) {
 		}, "\n"))
 
 		notifier, err := provider.NewNotifier(&provider.NotifierConfig{
-			Url: fUrl,
+			ServerUrl: fUrl,
 		})
 		if err != nil {
 			t.Errorf("err: %+v", err)

internal/pkg/core/notifier/providers/telegrambot/telegrambot.go

@@ -1,10 +1,12 @@
-package telegram
+package telegrambot
 
 import (
 	"context"
+	"fmt"
 	"log/slog"
+	"net/http"
 
-	"github.com/nikoksr/notify/service/telegram"
+	"github.com/go-resty/resty/v2"
 
 	"github.com/usual2970/certimate/internal/pkg/core/notifier"
 )
@@ -17,8 +19,9 @@ type NotifierConfig struct {
 }
 
 type NotifierProvider struct {
-	config *NotifierConfig
-	logger *slog.Logger
+	config     *NotifierConfig
+	logger     *slog.Logger
+	httpClient *resty.Client
 }
 
 var _ notifier.Notifier = (*NotifierProvider)(nil)
@@ -28,9 +31,12 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
 		panic("config is nil")
 	}
 
+	client := resty.New()
+
 	return &NotifierProvider{
-		config: config,
-		logger: slog.Default(),
+		config:     config,
+		logger:     slog.Default(),
+		httpClient: client,
 	}, nil
 }
 
@@ -44,16 +50,18 @@ func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
 }
 
 func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (res *notifier.NotifyResult, err error) {
-	srv, err := telegram.New(n.config.BotToken)
+	// REF: https://core.telegram.org/bots/api#sendmessage
+	req := n.httpClient.R().
+		SetHeader("Content-Type", "application/json").
+		SetBody(map[string]any{
+			"chat_id": n.config.ChatId,
+			"text":    subject + "\n" + message,
+		})
+	resp, err := req.Execute(http.MethodPost, fmt.Sprintf("https://api.telegram.org/bot%s/sendMessage", n.config.BotToken))
 	if err != nil {
-		return nil, err
-	}
-
-	srv.AddReceivers(n.config.ChatId)
-
-	err = srv.Send(ctx, subject, message)
-	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("telegram api error: failed to send request: %w", err)
+	} else if resp.IsError() {
+		return nil, fmt.Errorf("telegram api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
 	}
 
 	return &notifier.NotifyResult{}, nil

internal/pkg/core/notifier/providers/telegrambot/telegrambot_test.go

@@ -1,4 +1,4 @@
-package telegram_test
+package telegrambot_test
 
 import (
 	"context"
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	provider "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/telegram"
+	provider "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/telegrambot"
 )
 
 const (
@@ -21,7 +21,7 @@ var (
 )
 
 func init() {
-	argsPrefix := "CERTIMATE_NOTIFIER_TELEGRAM_"
+	argsPrefix := "CERTIMATE_NOTIFIER_TELEGRAMBOT_"
 
 	flag.StringVar(&fApiToken, argsPrefix+"APITOKEN", "", "")
 	flag.Int64Var(&fChartId, argsPrefix+"CHATID", 0, "")
@@ -30,9 +30,9 @@ func init() {
 /*
 Shell command to run this test:
 
-	go test -v ./telegram_test.go -args \
-	--CERTIMATE_NOTIFIER_TELEGRAM_APITOKEN="your-api-token" \
-	--CERTIMATE_NOTIFIER_TELEGRAM_CHATID=123456
+	go test -v ./telegrambot_test.go -args \
+	--CERTIMATE_NOTIFIER_TELEGRAMBOT_APITOKEN="your-api-token" \
+	--CERTIMATE_NOTIFIER_TELEGRAMBOT_CHATID=123456
 */
 func TestNotify(t *testing.T) {
 	flag.Parse()

internal/pkg/core/notifier/providers/webhook/webhook.go

@@ -139,9 +139,7 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
 
 	// 生成请求
 	// 其中 GET 请求需转换为查询参数
-	req := n.httpClient.R().
-		SetContext(ctx).
-		SetHeaderMultiValues(webhookHeaders)
+	req := n.httpClient.R().SetHeaderMultiValues(webhookHeaders)
 	req.URL = webhookUrl.String()
 	req.Method = webhookMethod
 	if webhookMethod == http.MethodGet {
@@ -160,12 +158,12 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
 	// 发送请求
 	resp, err := req.Send()
 	if err != nil {
-		return nil, fmt.Errorf("failed to send webhook request: %w", err)
+		return nil, fmt.Errorf("webhook error: failed to send request: %w", err)
 	} else if resp.IsError() {
-		return nil, fmt.Errorf("unexpected webhook response status code: %d", resp.StatusCode())
+		return nil, fmt.Errorf("webhook error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
 	}
 
-	n.logger.Debug("webhook responded", slog.Any("response", resp.String()))
+	n.logger.Debug("webhook responded", slog.String("response", resp.String()))
 
 	return &notifier.NotifyResult{}, nil
 }

internal/pkg/core/notifier/providers/wecombot/wecombot.go

@@ -2,10 +2,11 @@ package wecombot
 
 import (
 	"context"
+	"fmt"
 	"log/slog"
 	"net/http"
 
-	notifyHttp "github.com/nikoksr/notify/service/http"
+	"github.com/go-resty/resty/v2"
 
 	"github.com/usual2970/certimate/internal/pkg/core/notifier"
 )
@@ -16,8 +17,9 @@ type NotifierConfig struct {
 }
 
 type NotifierProvider struct {
-	config *NotifierConfig
-	logger *slog.Logger
+	config     *NotifierConfig
+	logger     *slog.Logger
+	httpClient *resty.Client
 }
 
 var _ notifier.Notifier = (*NotifierProvider)(nil)
@@ -27,8 +29,12 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
 		panic("config is nil")
 	}
 
+	client := resty.New()
+
 	return &NotifierProvider{
-		config: config,
+		config:     config,
+		logger:     slog.Default(),
+		httpClient: client,
 	}, nil
 }
 
@@ -42,26 +48,20 @@ func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
 }
 
 func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (res *notifier.NotifyResult, err error) {
-	srv := notifyHttp.New()
-
-	srv.AddReceivers(&notifyHttp.Webhook{
-		URL:         n.config.WebhookUrl,
-		Header:      http.Header{},
-		ContentType: "application/json",
-		Method:      http.MethodPost,
-		BuildPayload: func(subject, message string) (payload any) {
-			return map[string]any{
-				"msgtype": "text",
-				"text": map[string]string{
-					"content": subject + "\n\n" + message,
-				},
-			}
-		},
-	})
-
-	err = srv.Send(ctx, subject, message)
+	// REF: https://developer.work.weixin.qq.com/document/path/91770
+	req := n.httpClient.R().
+		SetHeader("Content-Type", "application/json").
+		SetBody(map[string]any{
+			"msgtype": "text",
+			"text": map[string]string{
+				"content": subject + "\n\n" + message,
+			},
+		})
+	resp, err := req.Execute(http.MethodPost, n.config.WebhookUrl)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("wecom api error: failed to send request: %w", err)
+	} else if resp.IsError() {
+		return nil, fmt.Errorf("wecom api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
 	}
 
 	return &notifier.NotifyResult{}, nil