refactor: modify directory structure

internal/pkg/core/notifier/notifier.go

@@ -1,28 +0,0 @@
-package notifier
-
-import (
-	"context"
-	"log/slog"
-)
-
-// 表示定义消息通知器的抽象类型接口。
-type Notifier interface {
-	WithLogger(logger *slog.Logger) Notifier
-
-	// 发送通知。
-	//
-	// 入参：
-	//   - ctx：上下文。
-	//   - subject：通知主题。
-	//   - message：通知内容。
-	//
-	// 出参：
-	//   - res：发送结果。
-	//   - err: 错误。
-	Notify(ctx context.Context, subject string, message string) (_res *NotifyResult, _err error)
-}
-
-// 表示通知发送结果的数据结构。
-type NotifyResult struct {
-	ExtendedData map[string]any `json:"extendedData,omitempty"`
-}

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

@@ -2,15 +2,16 @@ package bark
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log/slog"
 
 	"github.com/go-resty/resty/v2"
 
-	"github.com/usual2970/certimate/internal/pkg/core/notifier"
+	"github.com/usual2970/certimate/internal/pkg/core"
 )
 
-type NotifierConfig struct {
+type NotifierProviderConfig struct {
 	// Bark 服务地址。
 	// 零值时使用官方服务器。
 	ServerUrl string `json:"serverUrl"`
@@ -19,16 +20,16 @@ type NotifierConfig struct {
 }
 
 type NotifierProvider struct {
-	config     *NotifierConfig
+	config     *NotifierProviderConfig
 	logger     *slog.Logger
 	httpClient *resty.Client
 }
 
-var _ notifier.Notifier = (*NotifierProvider)(nil)
+var _ core.Notifier = (*NotifierProvider)(nil)
 
-func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
+func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
 	if config == nil {
-		panic("config is nil")
+		return nil, errors.New("the configuration of the notifier provider is nil")
 	}
 
 	client := resty.New()
@@ -40,16 +41,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
 	}, nil
 }
 
-func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
+func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
 	if logger == nil {
 		n.logger = slog.New(slog.DiscardHandler)
 	} else {
 		n.logger = logger
 	}
-	return n
 }
 
-func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) {
+func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
 	const defaultServerURL = "https://api.day.app/"
 	serverUrl := defaultServerURL
 	if n.config.ServerUrl != "" {
@@ -72,5 +72,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
 		return nil, fmt.Errorf("bark api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
 	}
 
-	return &notifier.NotifyResult{}, nil
+	return &core.NotifyResult{}, nil
 }

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

@@ -44,7 +44,7 @@ func TestNotify(t *testing.T) {
 			fmt.Sprintf("DEVICEKEY: %v", fDeviceKey),
 		}, "\n"))
 
-		notifier, err := provider.NewNotifier(&provider.NotifierConfig{
+		notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
 			ServerUrl: fServerUrl,
 			DeviceKey: fDeviceKey,
 		})

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

@@ -2,16 +2,17 @@ package dingtalkbot
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log/slog"
 	"net/url"
 
 	"github.com/blinkbean/dingtalk"
 
-	"github.com/usual2970/certimate/internal/pkg/core/notifier"
+	"github.com/usual2970/certimate/internal/pkg/core"
 )
 
-type NotifierConfig struct {
+type NotifierProviderConfig struct {
 	// 钉钉机器人的 Webhook 地址。
 	WebhookUrl string `json:"webhookUrl"`
 	// 钉钉机器人的 Secret。
@@ -19,15 +20,15 @@ type NotifierConfig struct {
 }
 
 type NotifierProvider struct {
-	config *NotifierConfig
+	config *NotifierProviderConfig
 	logger *slog.Logger
 }
 
-var _ notifier.Notifier = (*NotifierProvider)(nil)
+var _ core.Notifier = (*NotifierProvider)(nil)
 
-func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
+func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
 	if config == nil {
-		panic("config is nil")
+		return nil, errors.New("the configuration of the notifier provider is nil")
 	}
 
 	return &NotifierProvider{
@@ -36,16 +37,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
 	}, nil
 }
 
-func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
+func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
 	if logger == nil {
 		n.logger = slog.New(slog.DiscardHandler)
 	} else {
 		n.logger = logger
 	}
-	return n
 }
 
-func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) {
+func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
 	webhookUrl, err := url.Parse(n.config.WebhookUrl)
 	if err != nil {
 		return nil, fmt.Errorf("dingtalk api error: invalid webhook url: %w", err)
@@ -62,5 +62,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
 		return nil, fmt.Errorf("dingtalk api error: %w", err)
 	}
 
-	return &notifier.NotifyResult{}, nil
+	return &core.NotifyResult{}, nil
 }

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

@@ -44,7 +44,7 @@ func TestNotify(t *testing.T) {
 			fmt.Sprintf("SECRET: %v", fSecret),
 		}, "\n"))
 
-		notifier, err := provider.NewNotifier(&provider.NotifierConfig{
+		notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
 			WebhookUrl: fWebhookUrl,
 			Secret:     fSecret,
 		})

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

@@ -2,15 +2,16 @@ package discordbot
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log/slog"
 
 	"github.com/go-resty/resty/v2"
 
-	"github.com/usual2970/certimate/internal/pkg/core/notifier"
+	"github.com/usual2970/certimate/internal/pkg/core"
 )
 
-type NotifierConfig struct {
+type NotifierProviderConfig struct {
 	// Discord Bot API Token。
 	BotToken string `json:"botToken"`
 	// Discord Channel ID。
@@ -18,16 +19,16 @@ type NotifierConfig struct {
 }
 
 type NotifierProvider struct {
-	config     *NotifierConfig
+	config     *NotifierProviderConfig
 	logger     *slog.Logger
 	httpClient *resty.Client
 }
 
-var _ notifier.Notifier = (*NotifierProvider)(nil)
+var _ core.Notifier = (*NotifierProvider)(nil)
 
-func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
+func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
 	if config == nil {
-		panic("config is nil")
+		return nil, errors.New("the configuration of the notifier provider is nil")
 	}
 
 	client := resty.New()
@@ -39,16 +40,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
 	}, nil
 }
 
-func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
+func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
 	if logger == nil {
 		n.logger = slog.New(slog.DiscardHandler)
 	} else {
 		n.logger = logger
 	}
-	return n
 }
 
-func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) {
+func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
 	// REF: https://discord.com/developers/docs/resources/message#create-message
 	req := n.httpClient.R().
 		SetContext(ctx).
@@ -65,5 +65,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
 		return nil, fmt.Errorf("discord api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
 	}
 
-	return &notifier.NotifyResult{}, nil
+	return &core.NotifyResult{}, nil
 }

internal/pkg/core/notifier/providers/discordbot/discordbot_test.go

@@ -44,7 +44,7 @@ func TestNotify(t *testing.T) {
 			fmt.Sprintf("CHANNELID: %v", fChannelId),
 		}, "\n"))
 
-		notifier, err := provider.NewNotifier(&provider.NotifierConfig{
+		notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
 			BotToken:  fApiToken,
 			ChannelId: fChannelId,
 		})

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

@@ -3,6 +3,7 @@ package email
 import (
 	"context"
 	"crypto/tls"
+	"errors"
 	"log/slog"
 	"net"
 	"net/smtp"
@@ -10,10 +11,10 @@ import (
 
 	"github.com/domodwyer/mailyak/v3"
 
-	"github.com/usual2970/certimate/internal/pkg/core/notifier"
+	"github.com/usual2970/certimate/internal/pkg/core"
 )
 
-type NotifierConfig struct {
+type NotifierProviderConfig struct {
 	// SMTP 服务器地址。
 	SmtpHost string `json:"smtpHost"`
 	// SMTP 服务器端口。
@@ -34,15 +35,15 @@ type NotifierConfig struct {
 }
 
 type NotifierProvider struct {
-	config *NotifierConfig
+	config *NotifierProviderConfig
 	logger *slog.Logger
 }
 
-var _ notifier.Notifier = (*NotifierProvider)(nil)
+var _ core.Notifier = (*NotifierProvider)(nil)
 
-func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
+func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
 	if config == nil {
-		panic("config is nil")
+		return nil, errors.New("the configuration of the notifier provider is nil")
 	}
 
 	return &NotifierProvider{
@@ -51,16 +52,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
 	}, nil
 }
 
-func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
+func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
 	if logger == nil {
 		n.logger = slog.New(slog.DiscardHandler)
 	} else {
 		n.logger = logger
 	}
-	return n
 }
 
-func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) {
+func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
 	var smtpAuth smtp.Auth
 	if n.config.Username != "" || n.config.Password != "" {
 		smtpAuth = smtp.PlainAuth("", n.config.Username, n.config.Password, n.config.SmtpHost)
@@ -98,7 +98,7 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
 		return nil, err
 	}
 
-	return &notifier.NotifyResult{}, nil
+	return &core.NotifyResult{}, nil
 }
 
 func newTlsConfig() *tls.Config {

internal/pkg/core/notifier/providers/email/email_test.go

@@ -64,7 +64,7 @@ func TestNotify(t *testing.T) {
 			fmt.Sprintf("RECEIVERADDRESS: %v", fReceiverAddress),
 		}, "\n"))
 
-		notifier, err := provider.NewNotifier(&provider.NotifierConfig{
+		notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
 			SmtpHost:        fSmtpHost,
 			SmtpPort:        int32(fSmtpPort),
 			SmtpTls:         fSmtpTLS,

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

@@ -2,16 +2,17 @@ package gotify
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log/slog"
 	"strings"
 
 	"github.com/go-resty/resty/v2"
 
-	"github.com/usual2970/certimate/internal/pkg/core/notifier"
+	"github.com/usual2970/certimate/internal/pkg/core"
 )
 
-type NotifierConfig struct {
+type NotifierProviderConfig struct {
 	// Gotify 服务地址。
 	ServerUrl string `json:"serverUrl"`
 	// Gotify Token。
@@ -21,16 +22,16 @@ type NotifierConfig struct {
 }
 
 type NotifierProvider struct {
-	config     *NotifierConfig
+	config     *NotifierProviderConfig
 	logger     *slog.Logger
 	httpClient *resty.Client
 }
 
-var _ notifier.Notifier = (*NotifierProvider)(nil)
+var _ core.Notifier = (*NotifierProvider)(nil)
 
-func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
+func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
 	if config == nil {
-		panic("config is nil")
+		return nil, errors.New("the configuration of the notifier provider is nil")
 	}
 
 	client := resty.New()
@@ -42,16 +43,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
 	}, nil
 }
 
-func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
+func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
 	if logger == nil {
 		n.logger = slog.New(slog.DiscardHandler)
 	} else {
 		n.logger = logger
 	}
-	return n
 }
 
-func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) {
+func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
 	serverUrl := strings.TrimRight(n.config.ServerUrl, "/")
 
 	// REF: https://gotify.net/api-docs#/message/createMessage
@@ -72,5 +72,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
 		return nil, fmt.Errorf("gotify api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
 	}
 
-	return &notifier.NotifyResult{}, nil
+	return &core.NotifyResult{}, nil
 }

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

@@ -47,7 +47,7 @@ func TestNotify(t *testing.T) {
 			fmt.Sprintf("PRIORITY: %d", fPriority),
 		}, "\n"))
 
-		notifier, err := provider.NewNotifier(&provider.NotifierConfig{
+		notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
 			ServerUrl: fUrl,
 			Token:     fToken,
 			Priority:  fPriority,

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

@@ -2,29 +2,30 @@ package larkbot
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log/slog"
 
 	"github.com/go-lark/lark"
 
-	"github.com/usual2970/certimate/internal/pkg/core/notifier"
+	"github.com/usual2970/certimate/internal/pkg/core"
 )
 
-type NotifierConfig struct {
+type NotifierProviderConfig struct {
 	// 飞书机器人 Webhook 地址。
 	WebhookUrl string `json:"webhookUrl"`
 }
 
 type NotifierProvider struct {
-	config *NotifierConfig
+	config *NotifierProviderConfig
 	logger *slog.Logger
 }
 
-var _ notifier.Notifier = (*NotifierProvider)(nil)
+var _ core.Notifier = (*NotifierProvider)(nil)
 
-func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
+func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
 	if config == nil {
-		panic("config is nil")
+		return nil, errors.New("the configuration of the notifier provider is nil")
 	}
 
 	return &NotifierProvider{
@@ -33,16 +34,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
 	}, nil
 }
 
-func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
+func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
 	if logger == nil {
 		n.logger = slog.New(slog.DiscardHandler)
 	} else {
 		n.logger = logger
 	}
-	return n
 }
 
-func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) {
+func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
 	bot := lark.NewNotificationBot(n.config.WebhookUrl)
 	content := lark.NewPostBuilder().
 		Title(subject).
@@ -56,5 +56,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
 		return nil, fmt.Errorf("lark api error: code='%d', message='%s'", resp.Code, resp.Msg)
 	}
 
-	return &notifier.NotifyResult{}, nil
+	return &core.NotifyResult{}, nil
 }

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

@@ -38,7 +38,7 @@ func TestNotify(t *testing.T) {
 			fmt.Sprintf("WEBHOOKURL: %v", fWebhookUrl),
 		}, "\n"))
 
-		notifier, err := provider.NewNotifier(&provider.NotifierConfig{
+		notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
 			WebhookUrl: fWebhookUrl,
 		})
 		if err != nil {

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

@@ -2,16 +2,17 @@ package mattermost
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log/slog"
 	"strings"
 
 	"github.com/go-resty/resty/v2"
 
-	"github.com/usual2970/certimate/internal/pkg/core/notifier"
+	"github.com/usual2970/certimate/internal/pkg/core"
 )
 
-type NotifierConfig struct {
+type NotifierProviderConfig struct {
 	// Mattermost 服务地址。
 	ServerUrl string `json:"serverUrl"`
 	// Mattermost 用户名。
@@ -23,16 +24,16 @@ type NotifierConfig struct {
 }
 
 type NotifierProvider struct {
-	config     *NotifierConfig
+	config     *NotifierProviderConfig
 	logger     *slog.Logger
 	httpClient *resty.Client
 }
 
-var _ notifier.Notifier = (*NotifierProvider)(nil)
+var _ core.Notifier = (*NotifierProvider)(nil)
 
-func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
+func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
 	if config == nil {
-		panic("config is nil")
+		return nil, errors.New("the configuration of the notifier provider is nil")
 	}
 
 	client := resty.New()
@@ -44,16 +45,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
 	}, nil
 }
 
-func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
+func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
 	if logger == nil {
 		n.logger = slog.New(slog.DiscardHandler)
 	} else {
 		n.logger = logger
 	}
-	return n
 }
 
-func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) {
+func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
 	serverUrl := strings.TrimRight(n.config.ServerUrl, "/")
 
 	// REF: https://developers.mattermost.com/api-documentation/#/operations/Login
@@ -98,5 +98,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
 		return nil, fmt.Errorf("mattermost api error: unexpected status code: %d, resp: %s", postResp.StatusCode(), postResp.String())
 	}
 
-	return &notifier.NotifyResult{}, nil
+	return &core.NotifyResult{}, nil
 }

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

@@ -52,7 +52,7 @@ func TestNotify(t *testing.T) {
 			fmt.Sprintf("PASSWORD: %v", fPassword),
 		}, "\n"))
 
-		notifier, err := provider.NewNotifier(&provider.NotifierConfig{
+		notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
 			ServerUrl: fServerUrl,
 			ChannelId: fChannelId,
 			Username:  fUsername,

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

@@ -2,15 +2,16 @@ package pushover
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log/slog"
 
 	"github.com/go-resty/resty/v2"
 
-	"github.com/usual2970/certimate/internal/pkg/core/notifier"
+	"github.com/usual2970/certimate/internal/pkg/core"
 )
 
-type NotifierConfig struct {
+type NotifierProviderConfig struct {
 	// Pushover API Token。
 	Token string `json:"token"`
 	// 用户或分组标识。
@@ -18,16 +19,16 @@ type NotifierConfig struct {
 }
 
 type NotifierProvider struct {
-	config     *NotifierConfig
+	config     *NotifierProviderConfig
 	logger     *slog.Logger
 	httpClient *resty.Client
 }
 
-var _ notifier.Notifier = (*NotifierProvider)(nil)
+var _ core.Notifier = (*NotifierProvider)(nil)
 
-func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
+func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
 	if config == nil {
-		panic("config is nil")
+		return nil, errors.New("the configuration of the notifier provider is nil")
 	}
 
 	client := resty.New()
@@ -39,16 +40,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
 	}, nil
 }
 
-func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
+func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
 	if logger == nil {
 		n.logger = slog.New(slog.DiscardHandler)
 	} else {
 		n.logger = logger
 	}
-	return n
 }
 
-func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) {
+func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
 	// REF: https://pushover.net/api
 	req := n.httpClient.R().
 		SetContext(ctx).
@@ -67,5 +67,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
 		return nil, fmt.Errorf("pushover api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
 	}
 
-	return &notifier.NotifyResult{}, nil
+	return &core.NotifyResult{}, nil
 }

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

@@ -42,7 +42,7 @@ func TestNotify(t *testing.T) {
 			fmt.Sprintf("TOKEN: %v", fToken),
 		}, "\n"))
 
-		notifier, err := provider.NewNotifier(&provider.NotifierConfig{
+		notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
 			Token: fToken,
 			User:  fUser,
 		})

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

@@ -3,30 +3,31 @@ package pushplus
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"log/slog"
 
 	"github.com/go-resty/resty/v2"
 
-	"github.com/usual2970/certimate/internal/pkg/core/notifier"
+	"github.com/usual2970/certimate/internal/pkg/core"
 )
 
-type NotifierConfig struct {
+type NotifierProviderConfig struct {
 	// PushPlus Token。
 	Token string `json:"token"`
 }
 
 type NotifierProvider struct {
-	config     *NotifierConfig
+	config     *NotifierProviderConfig
 	logger     *slog.Logger
 	httpClient *resty.Client
 }
 
-var _ notifier.Notifier = (*NotifierProvider)(nil)
+var _ core.Notifier = (*NotifierProvider)(nil)
 
-func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
+func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
 	if config == nil {
-		panic("config is nil")
+		return nil, errors.New("the configuration of the notifier provider is nil")
 	}
 
 	client := resty.New()
@@ -38,16 +39,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
 	}, nil
 }
 
-func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
+func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
 	if logger == nil {
 		n.logger = slog.New(slog.DiscardHandler)
 	} else {
 		n.logger = logger
 	}
-	return n
 }
 
-func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) {
+func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
 	// 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().
 		SetContext(ctx).
@@ -75,5 +75,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
 		return nil, fmt.Errorf("pushplus api error: code='%d', message='%s'", errorResponse.Code, errorResponse.Message)
 	}
 
-	return &notifier.NotifyResult{}, nil
+	return &core.NotifyResult{}, nil
 }

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

@@ -37,7 +37,7 @@ func TestNotify(t *testing.T) {
 			fmt.Sprintf("TOKEN: %v", fToken),
 		}, "\n"))
 
-		notifier, err := provider.NewNotifier(&provider.NotifierConfig{
+		notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
 			Token: fToken,
 		})
 		if err != nil {

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

@@ -2,30 +2,31 @@ package serverchan
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log/slog"
 
 	"github.com/go-resty/resty/v2"
 
-	"github.com/usual2970/certimate/internal/pkg/core/notifier"
+	"github.com/usual2970/certimate/internal/pkg/core"
 )
 
-type NotifierConfig struct {
+type NotifierProviderConfig struct {
 	// ServerChan 服务地址。
 	ServerUrl string `json:"serverUrl"`
 }
 
 type NotifierProvider struct {
-	config     *NotifierConfig
+	config     *NotifierProviderConfig
 	logger     *slog.Logger
 	httpClient *resty.Client
 }
 
-var _ notifier.Notifier = (*NotifierProvider)(nil)
+var _ core.Notifier = (*NotifierProvider)(nil)
 
-func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
+func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
 	if config == nil {
-		panic("config is nil")
+		return nil, errors.New("the configuration of the notifier provider is nil")
 	}
 
 	client := resty.New()
@@ -37,16 +38,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
 	}, nil
 }
 
-func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
+func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
 	if logger == nil {
 		n.logger = slog.New(slog.DiscardHandler)
 	} else {
 		n.logger = logger
 	}
-	return n
 }
 
-func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) {
+func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
 	// REF: https://sct.ftqq.com/
 	req := n.httpClient.R().
 		SetContext(ctx).
@@ -63,5 +63,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
 		return nil, fmt.Errorf("serverchan api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
 	}
 
-	return &notifier.NotifyResult{}, nil
+	return &core.NotifyResult{}, nil
 }

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

@@ -38,7 +38,7 @@ func TestNotify(t *testing.T) {
 			fmt.Sprintf("URL: %v", fUrl),
 		}, "\n"))
 
-		notifier, err := provider.NewNotifier(&provider.NotifierConfig{
+		notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
 			ServerUrl: fUrl,
 		})
 		if err != nil {

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

@@ -2,15 +2,16 @@ package discordbot
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log/slog"
 
 	"github.com/go-resty/resty/v2"
 
-	"github.com/usual2970/certimate/internal/pkg/core/notifier"
+	"github.com/usual2970/certimate/internal/pkg/core"
 )
 
-type NotifierConfig struct {
+type NotifierProviderConfig struct {
 	// Slack Bot API Token。
 	BotToken string `json:"botToken"`
 	// Slack Channel ID。
@@ -18,16 +19,16 @@ type NotifierConfig struct {
 }
 
 type NotifierProvider struct {
-	config     *NotifierConfig
+	config     *NotifierProviderConfig
 	logger     *slog.Logger
 	httpClient *resty.Client
 }
 
-var _ notifier.Notifier = (*NotifierProvider)(nil)
+var _ core.Notifier = (*NotifierProvider)(nil)
 
-func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
+func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
 	if config == nil {
-		panic("config is nil")
+		return nil, errors.New("the configuration of the notifier provider is nil")
 	}
 
 	client := resty.New()
@@ -39,16 +40,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
 	}, nil
 }
 
-func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
+func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
 	if logger == nil {
 		n.logger = slog.New(slog.DiscardHandler)
 	} else {
 		n.logger = logger
 	}
-	return n
 }
 
-func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) {
+func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
 	// REF: https://docs.slack.dev/messaging/sending-and-scheduling-messages#publishing
 	req := n.httpClient.R().
 		SetContext(ctx).
@@ -67,5 +67,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
 		return nil, fmt.Errorf("slack api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
 	}
 
-	return &notifier.NotifyResult{}, nil
+	return &core.NotifyResult{}, nil
 }

internal/pkg/core/notifier/providers/slackbot/slackbot_test.go

@@ -44,7 +44,7 @@ func TestNotify(t *testing.T) {
 			fmt.Sprintf("CHANNELID: %v", fChannelId),
 		}, "\n"))
 
-		notifier, err := provider.NewNotifier(&provider.NotifierConfig{
+		notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
 			BotToken:  fApiToken,
 			ChannelId: fChannelId,
 		})

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

@@ -2,15 +2,16 @@ package telegrambot
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log/slog"
 
 	"github.com/go-resty/resty/v2"
 
-	"github.com/usual2970/certimate/internal/pkg/core/notifier"
+	"github.com/usual2970/certimate/internal/pkg/core"
 )
 
-type NotifierConfig struct {
+type NotifierProviderConfig struct {
 	// Telegram Bot API Token。
 	BotToken string `json:"botToken"`
 	// Telegram Chat ID。
@@ -18,16 +19,16 @@ type NotifierConfig struct {
 }
 
 type NotifierProvider struct {
-	config     *NotifierConfig
+	config     *NotifierProviderConfig
 	logger     *slog.Logger
 	httpClient *resty.Client
 }
 
-var _ notifier.Notifier = (*NotifierProvider)(nil)
+var _ core.Notifier = (*NotifierProvider)(nil)
 
-func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
+func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
 	if config == nil {
-		panic("config is nil")
+		return nil, errors.New("the configuration of the notifier provider is nil")
 	}
 
 	client := resty.New()
@@ -39,16 +40,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
 	}, nil
 }
 
-func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
+func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
 	if logger == nil {
 		n.logger = slog.New(slog.DiscardHandler)
 	} else {
 		n.logger = logger
 	}
-	return n
 }
 
-func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) {
+func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
 	// REF: https://core.telegram.org/bots/api#sendmessage
 	req := n.httpClient.R().
 		SetContext(ctx).
@@ -65,5 +65,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
 		return nil, fmt.Errorf("telegram api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
 	}
 
-	return &notifier.NotifyResult{}, nil
+	return &core.NotifyResult{}, nil
 }

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

@@ -44,7 +44,7 @@ func TestNotify(t *testing.T) {
 			fmt.Sprintf("CHATID: %v", fChatId),
 		}, "\n"))
 
-		notifier, err := provider.NewNotifier(&provider.NotifierConfig{
+		notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
 			BotToken: fApiToken,
 			ChatId:   fChatId,
 		})

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

@@ -4,6 +4,7 @@ import (
 	"context"
 	"crypto/tls"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"log/slog"
 	"net/http"
@@ -13,10 +14,10 @@ import (
 
 	"github.com/go-resty/resty/v2"
 
-	"github.com/usual2970/certimate/internal/pkg/core/notifier"
+	"github.com/usual2970/certimate/internal/pkg/core"
 )
 
-type NotifierConfig struct {
+type NotifierProviderConfig struct {
 	// Webhook URL。
 	WebhookUrl string `json:"webhookUrl"`
 	// Webhook 回调数据（application/json 或 application/x-www-form-urlencoded 格式）。
@@ -31,16 +32,16 @@ type NotifierConfig struct {
 }
 
 type NotifierProvider struct {
-	config     *NotifierConfig
+	config     *NotifierProviderConfig
 	logger     *slog.Logger
 	httpClient *resty.Client
 }
 
-var _ notifier.Notifier = (*NotifierProvider)(nil)
+var _ core.Notifier = (*NotifierProvider)(nil)
 
-func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
+func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
 	if config == nil {
-		panic("config is nil")
+		return nil, errors.New("the configuration of the notifier provider is nil")
 	}
 
 	client := resty.New().
@@ -58,16 +59,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
 	}, nil
 }
 
-func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
+func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
 	if logger == nil {
 		n.logger = slog.New(slog.DiscardHandler)
 	} else {
 		n.logger = logger
 	}
-	return n
 }
 
-func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) {
+func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
 	// 处理 Webhook URL
 	webhookUrl, err := url.Parse(n.config.WebhookUrl)
 	if err != nil {
@@ -165,7 +165,7 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
 
 	n.logger.Debug("webhook responded", slog.String("response", resp.String()))
 
-	return &notifier.NotifyResult{}, nil
+	return &core.NotifyResult{}, nil
 }
 
 func replaceJsonValueRecursively(data interface{}, oldStr, newStr string) interface{} {

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

@@ -43,7 +43,7 @@ func TestNotify(t *testing.T) {
 			fmt.Sprintf("URL: %v", fWebhookUrl),
 		}, "\n"))
 
-		notifier, err := provider.NewNotifier(&provider.NotifierConfig{
+		notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
 			WebhookUrl: fWebhookUrl,
 			Method:     "POST",
 			Headers: map[string]string{

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

@@ -2,30 +2,31 @@ package wecombot
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log/slog"
 
 	"github.com/go-resty/resty/v2"
 
-	"github.com/usual2970/certimate/internal/pkg/core/notifier"
+	"github.com/usual2970/certimate/internal/pkg/core"
 )
 
-type NotifierConfig struct {
+type NotifierProviderConfig struct {
 	// 企业微信机器人 Webhook 地址。
 	WebhookUrl string `json:"webhookUrl"`
 }
 
 type NotifierProvider struct {
-	config     *NotifierConfig
+	config     *NotifierProviderConfig
 	logger     *slog.Logger
 	httpClient *resty.Client
 }
 
-var _ notifier.Notifier = (*NotifierProvider)(nil)
+var _ core.Notifier = (*NotifierProvider)(nil)
 
-func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
+func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
 	if config == nil {
-		panic("config is nil")
+		return nil, errors.New("the configuration of the notifier provider is nil")
 	}
 
 	client := resty.New()
@@ -37,16 +38,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
 	}, nil
 }
 
-func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier {
+func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
 	if logger == nil {
 		n.logger = slog.New(slog.DiscardHandler)
 	} else {
 		n.logger = logger
 	}
-	return n
 }
 
-func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) {
+func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
 	// REF: https://developer.work.weixin.qq.com/document/path/91770
 	req := n.httpClient.R().
 		SetContext(ctx).
@@ -65,5 +65,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
 		return nil, fmt.Errorf("wecom api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
 	}
 
-	return &notifier.NotifyResult{}, nil
+	return &core.NotifyResult{}, nil
 }

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

@@ -38,7 +38,7 @@ func TestNotify(t *testing.T) {
 			fmt.Sprintf("WEBHOOKURL: %v", fWebhookUrl),
 		}, "\n"))
 
-		notifier, err := provider.NewNotifier(&provider.NotifierConfig{
+		notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
 			WebhookUrl: fWebhookUrl,
 		})
 		if err != nil {