|
@@ -4,10 +4,10 @@ import (
|
|
"bytes"
|
|
"bytes"
|
|
"encoding/json"
|
|
"encoding/json"
|
|
"errors"
|
|
"errors"
|
|
- "fmt"
|
|
|
|
"eta/eta_pub/models"
|
|
"eta/eta_pub/models"
|
|
"eta/eta_pub/services/alarm_msg"
|
|
"eta/eta_pub/services/alarm_msg"
|
|
"eta/eta_pub/utils"
|
|
"eta/eta_pub/utils"
|
|
|
|
+ "fmt"
|
|
"io/ioutil"
|
|
"io/ioutil"
|
|
"net/http"
|
|
"net/http"
|
|
"time"
|
|
"time"
|
|
@@ -148,7 +148,6 @@ func toSendCategoryTemplateMsgMfyx(data []byte, resource string, sendType int, o
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
// getWxMfyxAccessTokenCygx 获取微信token
|
|
// getWxMfyxAccessTokenCygx 获取微信token
|
|
func getWxMfyxAccessTokenCygx() (accessToken string, err error, errMsg string) {
|
|
func getWxMfyxAccessTokenCygx() (accessToken string, err error, errMsg string) {
|
|
var tokenKey string
|
|
var tokenKey string
|
|
@@ -209,7 +208,6 @@ func refreshWxMfyxAccessTokenCygx() (accessToken string, err error, errMsg strin
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
func TemplateList() (err error) {
|
|
func TemplateList() (err error) {
|
|
//utils.FileLog.Info("Send:" + string(data))
|
|
//utils.FileLog.Info("Send:" + string(data))
|
|
//获取accessToken
|
|
//获取accessToken
|
|
@@ -268,7 +266,9 @@ func SendWxCategoryTemplateMsgCygx(sendInfo *models.SendWxCategoryTemplate) (err
|
|
sendMap := make(map[string]interface{})
|
|
sendMap := make(map[string]interface{})
|
|
sendData := make(map[string]interface{})
|
|
sendData := make(map[string]interface{})
|
|
var uniqueCodeStr string
|
|
var uniqueCodeStr string
|
|
-
|
|
|
|
|
|
+ miniprogram := new(models.MiniprogramReq)
|
|
|
|
+ miniprogram.Pagepath = sendInfo.RedirectUrl
|
|
|
|
+ miniprogram.Appid = utils.WxMfyxAppId
|
|
templateItem, err := models.GetTemplateLibraryByTemplateId(sendInfo.TemplateId)
|
|
templateItem, err := models.GetTemplateLibraryByTemplateId(sendInfo.TemplateId)
|
|
if err != nil {
|
|
if err != nil {
|
|
utils.FileLog.Info(fmt.Sprintf("获取模板库失败,err:%s", err.Error()))
|
|
utils.FileLog.Info(fmt.Sprintf("获取模板库失败,err:%s", err.Error()))
|
|
@@ -288,6 +288,7 @@ func SendWxCategoryTemplateMsgCygx(sendInfo *models.SendWxCategoryTemplate) (err
|
|
sendMap["data"] = sendData
|
|
sendMap["data"] = sendData
|
|
if sendInfo.TemplateId != "" {
|
|
if sendInfo.TemplateId != "" {
|
|
sendMap["template_id"] = sendInfo.TemplateId
|
|
sendMap["template_id"] = sendInfo.TemplateId
|
|
|
|
+ sendMap["miniprogram"] = miniprogram
|
|
uniqueCodeStr += sendInfo.TemplateId
|
|
uniqueCodeStr += sendInfo.TemplateId
|
|
}
|
|
}
|
|
uniqueCode := utils.MD5(uniqueCodeStr)
|
|
uniqueCode := utils.MD5(uniqueCodeStr)
|