Merge branch 'yx_1.1' into debug

services/cygx/research_summary.go

@@ -368,7 +368,7 @@ func DoArticleOnenIdWxTemplateMsg(articleId int, source int) (err error) {
 								services.SendWxMsgWithCygxActivityAppointmentNew(first, keyword1, keyword2, keyword3, keyword4, openIditem, articleId)
 								mapOpenidPushed[openIditem.UserId] = openIditem.OpenId
 								// 研选发类目模板消息
-								go services.SendWxCategoryMsgWithCygxActivityAppointmentNew("您预约的调研，有新报告发布", "已发布", articleInfo.Title, articleInfo.PublishDate.Format(utils.FormatDateTimeMinute2), openIditem, articleId)
+								go services.SendWxCategoryMsgWithCygxActivityAppointmentNew("您预约的调研，有新报告发布", "已发布", utils.TruncateActivityNameString(articleInfo.Title), articleInfo.PublishDate.Format(utils.FormatDateTimeMinute2), openIditem, articleId)
 							}
 
 							//如果小助手勾选了对应的权限信息 就做正常推送
@@ -376,7 +376,7 @@ func DoArticleOnenIdWxTemplateMsg(articleId int, source int) (err error) {
 								services.SendWxMsgWithCygxActivityAppointmentNew(first, keyword1, keyword2, keyword3, keyword4, openIditem, articleId)
 								mapOpenidPushed[openIditem.UserId] = openIditem.OpenId
 								// 研选发类目模板消息
-								go services.SendWxCategoryMsgWithCygxActivityAppointmentNew("您预约的调研，有新报告发布", "已发布", articleInfo.Title, articleInfo.PublishDate.Format(utils.FormatDateTimeMinute2), openIditem, articleId)
+								go services.SendWxCategoryMsgWithCygxActivityAppointmentNew("您预约的调研，有新报告发布", "已发布", utils.TruncateActivityNameString(articleInfo.Title), articleInfo.PublishDate.Format(utils.FormatDateTimeMinute2), openIditem, articleId)
 							}
 						}
 					}

services/wechat_send_category_template_msg.go

@@ -266,7 +266,7 @@ func SendWxCategoryMsgWithCygxActivity(activityId int) (err error) {
 		return err
 	}
 	var keyword1, keyword2, keyword3, redirectUrl string
-	keyword1 = activityInfo.ActivityName
+	keyword1 = utils.TruncateActivityNameString(activityInfo.ActivityName)
 	keyword2 = "活动已取消"
 	keyword3 = time.Now().Format(utils.FormatDateTimeMinute)
 
@@ -355,7 +355,7 @@ func SendWxCategoryMsgWithCygxActivityUpdateLimitPeople(activityId int) (err err
 		}
 		openIdArr[i] = v.OpenId
 	}
-	keyword1 := activityInfo.ActivityName
+	keyword1 := utils.TruncateActivityNameString(activityInfo.ActivityName)
 	keyword2 := "活动名额增加"
 	keyword3 := "名额增至" + activityInfo.LimitPeopleNum + "人,欢迎报名"