附件内容优化

services/activity.go

@@ -242,9 +242,6 @@ func SendEmailFileToExpert(cont context.Context) (err error) {
 		}
 		//haveSuccess := utils.SendEmailHaveFile(title, content, fileName, touser)
 		sendResult := utils.SendEmailByHongze(title, content, touser, fileName, title+".xlsx")
-		//defer func() {
-		//	os.Remove(downLoadnFilePath)
-		//}()
 		if sendResult {
 			errFile = models.UPdateActivityIdToSendFile(v.ActivityId)
 			if errFile != nil {

services/user.go

@@ -635,14 +635,15 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 		return
 	}
 	var rep models.UserWhiteListRep
+	var repList []*models.UserWhiteList
 	for _, v := range list2 {
-		list1 = append(list1, v)
+		repList = append(list1, v)
 	}
-	rep.List = list1
+	rep.List = repList
 	//创建excel
 	dir, errFile := os.Executable()
 	exPath := filepath.Dir(dir)
-	downLoadnFilePath := exPath + "/" + time.Now().Format(utils.FormatDate) + "新增白名单" + ".xlsx"
+	downLoadnFilePath := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + utils.GetRandDigit(5) + ".xlsx"
 	xlsxFile := xlsx.NewFile()
 	if errFile != nil {
 		msg = "生成文件失败Err:" + errFile.Error()
@@ -735,18 +736,17 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 	title := time.Now().Format("2006-01-02") + "新增白名单用户"
 	content := time.Now().Format("2006-01-02") + "新增白名单用户"
 	fileName := downLoadnFilePath
+	var sendResult bool
 	if len(rep.List) > 0 {
-		go utils.SendEmailHaveFile(title, content, fileName, utils.EmaiWhiteUserList)
+		sendResult = utils.SendEmailByHongze(title, content, utils.EmaiWhiteUserList, fileName, title+".xlsx")
+		//sendResult = utils.SendEmailByHongze(title, content, "cxzhang@hzinsights.com", fileName, title+".xlsx")
 	}
-	//go utils.SendEmailHaveFile(title, content, fileName, "cxzhang@hzinsights.com")
-	//go utils.SendEmailHaveFile(title, content, fileName, "tshen@hzinsights.com")
-	//defer func() {
+	fmt.Println(sendResult)
 	os.Remove(downLoadnFilePath)
-	//}()
 	//创建冻结excel
 	dir, errFile = os.Executable()
 	exPath = filepath.Dir(dir)
-	downLoadnFilePaths := exPath + "/" + time.Now().Format(utils.FormatDate) + "删除白名单" + ".xlsx"
+	downLoadnFilePaths := exPath + "/" + time.Now().Format(utils.FormatDateTimeUnSpace) + utils.GetRandDigit(5) + ".xlsx"
 	xlsxFile = xlsx.NewFile()
 	if errFile != nil {
 		msg = "生成文件失败Err:" + errFile.Error()
@@ -852,59 +852,63 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 	title = time.Now().Format("2006-01-02") + "删除白名单用户"
 	content = time.Now().Format("2006-01-02") + "删除白名单用户"
 	fileName = downLoadnFilePaths
+	var sendResult2 bool
 	if len(listFrozen) > 0 {
-		go utils.SendEmailHaveFile(title, content, fileName, utils.EmaiWhiteUserList)
+		sendResult2 = utils.SendEmailByHongze(title, content, utils.EmaiWhiteUserList, fileName, title+".xlsx")
+		//sendResult2 = utils.SendEmailByHongze(title, content, "cxzhang@hzinsights.com", fileName, title+".xlsx")
 	}
-
-	//go utils.SendEmailHaveFile(title, content, fileName, "cxzhang@hzinsights.com")
-	time.Sleep(time.Duration(2) * time.Second) //延迟两秒，避免过多活动的时候邮件发送没有内容
-	//defer func() {
+	fmt.Println(sendResult2)
 	os.Remove(downLoadnFilePaths)
-	//}()
-	if len(list1) > 0 {
-		for _, v := range list1 {
-			item := new(models.WxUserWhite)
-			item.Mobile = v.Mobile
-			item.CountryCode = v.CountryCode
-			item.CreatedTime = time.Now()
-			item.CompanyName = v.CompanyName
-			item.PermissionName = v.Permission
-			item.UserCreatedTime = v.CreatedTime
-			item.RealName = v.RealName
-			item.SellerName = v.SellerName
-			item.Status = v.Status
-			_, err = models.AddWxUserWhite(item)
-			if err != nil {
-				msg = "获取失败，Err:" + err.Error()
-				return
+	if sendResult {
+		fmt.Println(len(list1))
+		if len(list1) > 0 {
+			for _, v := range list1 {
+				item := new(models.WxUserWhite)
+				item.Mobile = v.Mobile
+				item.CountryCode = v.CountryCode
+				item.CreatedTime = time.Now()
+				item.CompanyName = v.CompanyName
+				item.PermissionName = v.Permission
+				item.UserCreatedTime = v.CreatedTime
+				item.RealName = v.RealName
+				item.SellerName = v.SellerName
+				item.Status = v.Status
+				_, err = models.AddWxUserWhite(item)
+				if err != nil {
+					msg = "获取失败，Err:" + err.Error()
+					return
+				}
 			}
 		}
-	}
-	if len(list2) > 0 {
-		for _, v := range list2 {
-			item := new(models.WxUserWhite)
-			item.OutboundMobile = v.Mobile
-			item.OutboundCountryCode = v.CountryCode
-			item.CreatedTime = time.Now()
-			item.CompanyName = v.CompanyName
-			item.PermissionName = v.Permission
-			item.UserCreatedTime = v.CreatedTime
-			item.RealName = v.RealName
-			item.SellerName = v.SellerName
-			item.Status = v.Status
-			_, err = models.AddWxUserWhite(item)
-			if err != nil {
-				msg = "获取失败，Err:" + err.Error()
-				return
+		if len(list2) > 0 {
+			fmt.Println(len(list2))
+			for _, v := range list2 {
+				item := new(models.WxUserWhite)
+				item.OutboundMobile = v.Mobile
+				item.OutboundCountryCode = v.CountryCode
+				item.CreatedTime = time.Now()
+				item.CompanyName = v.CompanyName
+				item.PermissionName = v.Permission
+				item.UserCreatedTime = v.CreatedTime
+				item.RealName = v.RealName
+				item.SellerName = v.SellerName
+				item.Status = v.Status
+				_, err = models.AddWxUserWhite(item)
+				if err != nil {
+					msg = "获取失败，Err:" + err.Error()
+					return
+				}
 			}
 		}
 	}
 
-	for _, v := range listFrozen {
-		err = models.DeleteWxUserWhite(v)
-		if err != nil {
-			msg = "删除信息失败，Err:" + err.Error()
-			return
+	if sendResult2 {
+		for _, v := range listFrozen {
+			err = models.DeleteWxUserWhite(v)
+			if err != nil {
+				msg = "删除信息失败，Err:" + err.Error()
+				return
+			}
 		}
 	}
 	fmt.Println("发送附件完成", len(listFrozen))

utils/email.go

@@ -105,7 +105,7 @@ func SendEmailByHongze(title, content string, touser, attachPath, attachName str
 
 	m.SetHeader("From", "public@hzinsights.com")
 	m.SetHeader("To", arr...)
-	m.SetHeader("Subject", title+" "+GetRandStringNoSpecialChar(8))
+	m.SetHeader("Subject", title)
 	m.SetBody("text/html", content)
 
 	//body := new(bytes.Buffer)