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

models/article_celue_push.go

@@ -15,12 +15,12 @@ type CygxArticleCeluePush struct {
 
 func GetArticleCeluePushList() (item []*CygxArticleCeluePush, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT *  FROM	cygx_article_celue_push WHERE	is_handle = 0    GROUP BY article_id   `
+	sql := ` SELECT *  FROM	cygx_article_celue_push WHERE	is_handle = 0  AND create_time >DATE_SUB(NOW(), INTERVAL 10 MINUTE)  GROUP BY article_id   `
 	_, err = o.Raw(sql).QueryRows(&item)
 	return
 }
 
-//更改推送内容是否处理状态
+// 更改推送内容是否处理状态
 func UpdateCygxArticleCeluePush(articleId int) (err error) {
 	o := orm.NewOrm()
 	sql := `UPDATE cygx_article_celue_push SET is_handle=1 WHERE article_id=? `

services/article.go

@@ -688,8 +688,8 @@ func init122() {
 func HandleArticleListByApi(artcleId int) (err error) {
 	defer func() {
 		if err != nil {
-			go utils.SendAlarmMsg("处理同步策略平台数据失败"+"GetArticleListByApi ErrMsg:"+err.Error(), 2)
-			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "GetArticleListByApi ErrMsg:"+err.Error(), utils.EmailSendToUsers)
+			go utils.SendAlarmMsg("处理同步策略平台数据失败"+"GetArticleListByApi ErrMsg:"+err.Error()+"artcleId："+strconv.Itoa(artcleId), 2)
+			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "GetArticleListByApi ErrMsg:"+err.Error()+"artcleId："+strconv.Itoa(artcleId), utils.EmailSendToUsers)
 		}
 	}()
 	var clueApiUrl string