|
@@ -3,12 +3,14 @@ package services
|
|
import (
|
|
import (
|
|
"bytes"
|
|
"bytes"
|
|
"encoding/json"
|
|
"encoding/json"
|
|
|
|
+ "errors"
|
|
"fmt"
|
|
"fmt"
|
|
"hongze/hongze_public_api/models"
|
|
"hongze/hongze_public_api/models"
|
|
"hongze/hongze_public_api/services/alarm_msg"
|
|
"hongze/hongze_public_api/services/alarm_msg"
|
|
"hongze/hongze_public_api/utils"
|
|
"hongze/hongze_public_api/utils"
|
|
"io/ioutil"
|
|
"io/ioutil"
|
|
"net/http"
|
|
"net/http"
|
|
|
|
+ "strconv"
|
|
"strings"
|
|
"strings"
|
|
"time"
|
|
"time"
|
|
)
|
|
)
|
|
@@ -85,10 +87,18 @@ func SendWxTemplateMsg(sendInfo *models.SendWxTemplate) (err error) {
|
|
}
|
|
}
|
|
|
|
|
|
if sendInfo.RedirectUrl != "" {
|
|
if sendInfo.RedirectUrl != "" {
|
|
- if strings.Contains(sendInfo.RedirectUrl, "http") || strings.Contains(sendInfo.RedirectUrl, "https") {
|
|
+ if strings.Contains(sendInfo.RedirectUrl, "http") || strings.Contains(sendInfo.RedirectUrl, "https") || sendInfo.RedirectTarget == 0 {
|
|
sendMap["url"] = sendInfo.RedirectUrl
|
|
sendMap["url"] = sendInfo.RedirectUrl
|
|
} else {
|
|
} else {
|
|
- sendMap["miniprogram"] = sendInfo.RedirectUrl
|
|
+ var xcxAppId string
|
|
|
|
+ if sendInfo.RedirectTarget == 1 {
|
|
|
|
+ xcxAppId = utils.WxYbAppId
|
|
|
|
+ } else if sendInfo.RedirectTarget == 2 {
|
|
|
|
+ xcxAppId = utils.WxCrmAppId
|
|
|
|
+ } else {
|
|
|
|
+ err = errors.New("无效的微信小程序跳转方式:RedirectTarget" + strconv.Itoa(sendInfo.RedirectTarget))
|
|
|
|
+ }
|
|
|
|
+ sendMap["miniprogram"] = map[string]interface{}{"appid": xcxAppId, "pagepath": sendInfo.RedirectUrl}
|
|
}
|
|
}
|
|
uniqueCodeStr += sendInfo.RedirectUrl
|
|
uniqueCodeStr += sendInfo.RedirectUrl
|
|
}
|
|
}
|
|
@@ -98,8 +108,8 @@ func SendWxTemplateMsg(sendInfo *models.SendWxTemplate) (err error) {
|
|
uniqueCode := utils.MD5(uniqueCodeStr)
|
|
uniqueCode := utils.MD5(uniqueCodeStr)
|
|
|
|
|
|
err = sendTemplateMsg(sendUrl, sendMap, sendInfo.OpenIdArr, sendInfo.Resource, uniqueCode, sendInfo.SendType)
|
|
err = sendTemplateMsg(sendUrl, sendMap, sendInfo.OpenIdArr, sendInfo.Resource, uniqueCode, sendInfo.SendType)
|
|
- if err!=nil {
|
|
+ if err != nil {
|
|
- utils.FileLog.Info("send err:"+err.Error())
|
|
+ utils.FileLog.Info("send err:" + err.Error())
|
|
}
|
|
}
|
|
fmt.Println("send end")
|
|
fmt.Println("send end")
|
|
utils.FileLog.Info("send end")
|
|
utils.FileLog.Info("send end")
|