Parcourir la source

增加参数:env

wulei il y a 1 an
Parent
commit
5b81fe35f2
3 fichiers modifiés avec 8 ajouts et 6 suppressions
  1. 1 1
      mail/api.go
  2. 5 3
      mail/client.go
  3. 2 2
      mail/client_test.go

+ 1 - 1
mail/api.go

@@ -32,7 +32,7 @@ func (mail *MailClient) SendCustomWarning(subject, content string) (err error) {
 
 func (mail *MailClient) send(e Email) (err error) {
 	now := time.Now().Format("2006-01-02 15:04:05")
-	e.Subject = fmt.Sprintf("AppName: %s Title: %s Time: %s", mail.AppName, e.Subject, now)
+	e.Subject = fmt.Sprintf("Title: %s AppName: %s Env: %s Time: %s", e.Subject, mail.AppName, mail.Env, now)
 	// 按需要的格式设置邮件内容
 	message := []byte("From: " + e.From + "\r\n" +
 		"To: " + e.To + "\r\n" +

+ 5 - 3
mail/client.go

@@ -2,17 +2,19 @@ package mail
 
 type MailClient struct {
 	AppName string
+	Env     string
 	Server  string
 	Port    string
 }
 
-func CreateDefaultMailApiClient(appName string) *MailClient {
-	return createMailApiClient(appName, SMTP_SERVER, SMTP_PORT)
+func CreateDefaultMailApiClient(appName, env string) *MailClient {
+	return createMailApiClient(appName, env, SMTP_SERVER, SMTP_PORT)
 }
 
-func createMailApiClient(appName, server, port string) *MailClient {
+func createMailApiClient(appName, env, server, port string) *MailClient {
 	return &MailClient{
 		AppName: appName,
+		Env:     env,
 		Server:  server,
 		Port:    port,
 	}

+ 2 - 2
mail/client_test.go

@@ -5,8 +5,8 @@ import (
 )
 
 func TestCreateMailApiClient(t *testing.T) {
-	client := CreateDefaultMailApiClient()
-	err := client.SendSystemWarning("this is a test email!!!")
+	client := CreateDefaultMailApiClient("gt-common", "test")
+	err := client.SendPanicWarning("this is a test email!!!")
 
 	t.Log(err)
 }