email

pkg/email/config/var.go

@@ -8,11 +8,11 @@ var (
 
 // Config 配置结构体 (建议从环境变量或配置文件中读取)
 type Config struct {
-	SMTPServer string `yaml:"smtpServer" json:"smtpServer" mapstructure:"smtpServer"`
-	SMTPPort   int    `yaml:"smtpPort" json:"smtpPort" mapstructure:"smtpPort"`
-	Email      string `yaml:"emailAddr" json:"emailAddr" mapstructure:"emailAddr"`
-	Token      string `yaml:"emailToken" json:"emailToken" mapstructure:"emailToken"`
-	Name       string `yaml:"emailAlias" json:"emailAlias" mapstructure:"emailAlias"`
+	Server string `yaml:"server" json:"server" mapstructure:"server"`
+	Port   int    `yaml:"port" json:"port" mapstructure:"port"`
+	Addr   string `yaml:"addr" json:"addr" mapstructure:"addr"`
+	Token  string `yaml:"token" json:"token" mapstructure:"token"`
+	Alias  string `yaml:"alias" json:"alias" mapstructure:"alias"`
 	Schema string `yaml:"schema" json:"schema" mapstructure:"schema"`
 }
 

pkg/email/email.go

@@ -59,7 +59,7 @@ func extractEmailReceiver(input string) (name, email string, err error) {
 
 func SendTLS(ctx context.Context, e *config.Email) error {
 	m := gomail.NewMessage()
-	m.SetAddressHeader("From", config.Cfg.Email, e.From)
+	m.SetAddressHeader("From", config.Cfg.Addr, e.From)
 	var toList []string
 	for _, r := range e.To {
 		toList = append(toList, m.FormatAddress(r.Email, r.DisplayName))
@@ -101,13 +101,13 @@ func SendTLS(ctx context.Context, e *config.Email) error {
 		}
 	}
 	d := gomail.NewDialer(
-		config.Cfg.SMTPServer,
-		config.Cfg.SMTPPort,
-		config.Cfg.Email,
+		config.Cfg.Server,
+		config.Cfg.Port,
+		config.Cfg.Addr,
 		config.Cfg.Token,
 	)
 	d.TLSConfig = &tls.Config{
-		ServerName:         config.Cfg.SMTPServer,
+		ServerName:         config.Cfg.Server,
 		MinVersion:         tls.VersionTLS12,
 		InsecureSkipVerify: false,
 	}
@@ -161,7 +161,7 @@ func (x *oEmail) SendTLS(ctx context.Context, in *Params) (err error) {
 		return xerror.Wrap(err, "render contentTpl")
 	}
 
-	from := fmt.Sprintf("%s<%s>", config.Cfg.Name, config.Cfg.Email)
+	from := fmt.Sprintf("%s<%s>", config.Cfg.Alias, config.Cfg.Addr)
 	email := models.Email{}
 	email.ID = xsfUtils.EmailID(ctx)
 	email.TplID = et.ID