Merge branch 'yx_1.1' into debug

services/wechat_send_msg_cygx.go

@@ -364,6 +364,16 @@ func SendWxCategoryTemplateMsgCygx(sendInfo *models.SendWxCategoryTemplate) (err
 		sendMap["template_id"] = sendInfo.TemplateId
 		uniqueCodeStr += sendInfo.TemplateId
 	}
+
+	if sendInfo.RedirectUrl != "" {
+		if strings.Contains(sendInfo.RedirectUrl, "http") || strings.Contains(sendInfo.RedirectUrl, "https") || sendInfo.RedirectTarget == 0 {
+			sendMap["url"] = sendInfo.RedirectUrl
+		} else {
+			sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxMfyxAppId, "pagepath": sendInfo.RedirectUrl}
+		}
+		uniqueCodeStr += sendInfo.RedirectUrl
+	}
+
 	uniqueCode := utils.MD5(uniqueCodeStr)
 
 	err = sendTemplateMsgCygx(sendMap, sendInfo.OpenIdArr, sendInfo.Resource, uniqueCode, sendInfo.SendType)