refactor: modify directory structure

This commit is contained in:
Fu Diwei
2025-06-17 14:01:34 +08:00
parent 299a722aa9
commit 30840bbba5
346 changed files with 5051 additions and 5086 deletions

View File

@@ -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 {

View File

@@ -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,