Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into cygx_9.1

controllers/activity.go

@@ -3048,7 +3048,7 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 		return
 	}
 	var startSize int
-	pageSize = 8
+	pageSize = 20
 	var sortTime string
 	var pars []interface{}
 	//活动可见限制

controllers/home.go

@@ -301,27 +301,6 @@ Loop:
 		br.Msg = "获取帖子数据失败，Err:" + err.Error()
 		return
 	}
-	for k, v := range list {
-		item := list[k]
-		//如果文章一开始的内容是图片，优先展示第一张图片
-		imgurl, _ := services.FixArticleImgUrl(html.UnescapeString(list[k].Body))
-		newBody, _ := services.GetReportContentTextSub(item.Body)
-		list[k].Body = newBody
-		if imgurl != "" {
-			list[k].BodyHtml = imgurl
-		}
-		list[k].PublishDate = utils.StrTimeToTime(item.PublishDate).Format(utils.FormatDateTimeNoSecond) //时间字符串格式转时间格式
-		if strings.Contains(item.CategoryName, utils.CHART_PERMISSION_NAME_YANXUAN) {
-			list[k].IsResearch = true
-		}
-		if list[k].ArticleId < utils.SummaryArticleId {
-			list[k].HttpUrl = utils.StrategyPlatform + strconv.Itoa(v.ArticleId)
-			list[k].IsNeedJump = true
-		}
-		if item.Pv > 999 {
-			list[k].Pv = 999
-		}
-	}
 	list, err = services.HandleArticleCategoryImg(list)
 	if err != nil {
 		br.Msg = "获取信息失败"
@@ -329,7 +308,8 @@ Loop:
 		return
 	}
 	for _, v := range list {
-		v.Body = ""
+		v.Annotation, _ = services.GetReportContentTextSub(v.Annotation)
+		v.Body = v.Annotation
 	}
 	resp.List = list
 	resp.Paging = page

services/activity.go

@@ -160,6 +160,7 @@ func SendEmailFileToExpert(cont context.Context) (err error) {
 	}
 
 	for _, v := range listActivity {
+		time.Sleep(5 * time.Second) //延时五秒，避免邮件发送不成功
 		activityInfo, _ := models.GetAddActivityInfoById(v.ActivityId)
 		if activityInfo == nil {
 			msg = "活动不存在，Err:activityId：" + strconv.Itoa(v.ActivityId)