Merge branch 'yx_1.1' into debug

services/wechat_send_category_template_msg.go

@@ -148,23 +148,28 @@ func SendWxCategoryMsgWithCygxActivityUpdateTime(activityId int, oldStr, newStr,
 	activityInfo.ActivityTypeName = strings.Replace(activityInfo.ActivityTypeName, "（C类）", "", -1)
 	if strType == "timeType" {
 		//first = "您有一场【" + activityInfo.ActivityTypeName + "】发生了时间变更"
-		keyword2 = "时间变更为-- " + newStr
+		//keyword2 = "时间变更为-- " + newStr
+		keyword2 = "时间变更为"
 	} else if strType == "expertType" {
 		//first = "您有一场【" + activityInfo.ActivityTypeName + "】发生了专家变更"
-		keyword2 = "专家变更为--" + newStr
+		//keyword2 = "专家变更为--" + newStr
+		keyword2 = "专家变更"
 	} else if strType == "addressType" {
 		//first = "您有一场【" + activityInfo.ActivityTypeName + "】发生了地址变更"
-		keyword2 = "地点变更为--" + newStr
+		//keyword2 = "地点变更为--" + newStr
+		keyword2 = "地点变更"
 	} else if strType == "participationCode" {
 		//first = "您有一场【" + activityInfo.ActivityTypeName + "】公布了拨入密码"
-		keyword2 = "拨入密码为--" + newStr
+		//keyword2 = "拨入密码为--" + newStr
+		keyword2 = "拨入密码"
 	} else if strType == "Theme" {
 		//first = "您有一场【" + activityInfo.ActivityTypeName + "】更新了活动主题"
 		newStr = strings.Replace(newStr, "</p><p>", "\n", -1)
 		newStr = html.EscapeString(newStr)
 		newStrHtml, _ := cygx.GetReportContentTextSub(newStr)
 		newStr = newStrHtml
-		keyword2 = "主题变更为--" + newStr
+		//keyword2 = "主题变更为--" + newStr
+		keyword2 = "主题变更"
 	}
 
 	keyword1 = activityInfo.ActivityName
@@ -173,7 +178,7 @@ func SendWxCategoryMsgWithCygxActivityUpdateTime(activityId int, oldStr, newStr,
 		openIdArr[i] = v.OpenId
 	}
 
-	keyword3 = time.Now().Format(utils.FormatDateTimeMinute2)
+	keyword3 = newStr
 
 	redirectUrl = utils.WX_MSG_PATH_ACTIVITY_DETAIL + strconv.Itoa(activityId) + "&IsSendWx=1"
 	sendInfo := new(SendWxCategoryTemplate)