Merge branch 'feature/migrate_wecht_msg' into debug

models/tables/user_template_record/user_template_record.go

@@ -13,6 +13,7 @@ type UserTemplateRecord struct {
 	CreateTime string
 	SendStatus int
 	SendType   int
+	WxAppId    string
 }
 
 // AddUserTemplateRecord 添加记录

services/wechat.go

@@ -140,7 +140,8 @@ func WxGetRedisAccessToken(wxAppId, wxAppSecret string) (accessToken string, err
 			err = errors.New("获取access_token 失败 errcode:" + token.Errmsg + " ;errmsg:" + token.Errmsg)
 			return "", err
 		}
-		err = utils.Rc.Put(utils.HZ_ADMIN_WX_ACCESS_TOEKN+wxAppId, token.AccessToken, 110 * time.Minute)
+		redisTimeExpire := time.Duration(token.ExpiresIn - 600) * time.Second
+		err = utils.Rc.Put(utils.HZ_ADMIN_WX_ACCESS_TOEKN+wxAppId, token.AccessToken, redisTimeExpire)
 		if err != nil {
 			err = errors.New("保存access_token失败 " + err.Error())
 			return accessToken, err

services/wechat_send_msg.go

@@ -13,7 +13,7 @@ import (
 	"time"
 )
 
-func sendTemplateMsg(sendUrl string, sendMap map[string]interface{}, items []*admin.OpenIdList, resource string, sendType int) (err error) {
+func sendTemplateMsg(wxAppId string,sendUrl string, sendMap map[string]interface{}, items []*admin.OpenIdList, resource string, sendType int) (err error) {
 	for _, v := range items {
 		sendMap["touser"] = v.OpenId
 		data, err := json.Marshal(sendMap)
@@ -22,7 +22,7 @@ func sendTemplateMsg(sendUrl string, sendMap map[string]interface{}, items []*ad
 			utils.FileLog.Info(fmt.Sprintf("SendTemplateMsgOne Marshal Err:%s", err.Error()))
 			return err
 		}
-		err = toSendTemplateMsg(sendUrl, data, resource, sendType, v)
+		err = toSendTemplateMsg(wxAppId, sendUrl, data, resource, sendType, v)
 		if err != nil {
 			fmt.Println("send err:", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("ToSendTemplateMsg Err:%s", err.Error()))
@@ -31,7 +31,7 @@ func sendTemplateMsg(sendUrl string, sendMap map[string]interface{}, items []*ad
 	return
 }
 
-func toSendTemplateMsg(sendUrl string, data []byte, resource string, sendType int, dataItem *admin.OpenIdList) (err error) {
+func toSendTemplateMsg(wxAppId string,sendUrl string, data []byte, resource string, sendType int, dataItem *admin.OpenIdList) (err error) {
 	utils.FileLog.Info("Send:" + string(data))
 	client := http.Client{}
 	resp, err := client.Post(sendUrl, "application/json", bytes.NewBuffer(data))
@@ -68,6 +68,7 @@ func toSendTemplateMsg(sendUrl string, data []byte, resource string, sendType in
 			CreateTime: time.Now().Format(utils.FormatDateTime),
 			SendStatus: sendStatus,
 			SendType:   sendType,
+			WxAppId: wxAppId,
 		}
 		go func() {
 			err = user_template_record.AddUserTemplateRecord(tr)
@@ -161,7 +162,7 @@ func SendCompanyApplyWxTemplateMsg(mobile, redirectUrl, wxAppPath string, wxMsgM
 		if wxAppPath != "" {
 			sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxAppId2, "pagepath": wxAppPath}
 		}
-		sendTemplateMsg(sendUrl, sendMap, openIdList, mobile, utils.TEMPLATE_MSG_APPLY)
+		sendTemplateMsg(utils.AdminWxAppId, sendUrl, sendMap, openIdList, mobile, utils.TEMPLATE_MSG_APPLY)
 	}
 	utils.FileLog.Info("send end")
 	return
@@ -223,7 +224,7 @@ func SendWxMsgWithRoadshowDetailResult(first, keyword1, keyword2, remark, mobile
 		if wxAppPath != "" {
 			sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxAppId2, "pagepath": wxAppPath}
 		}
-		sendTemplateMsg(sendUrl, sendMap, openIdList, wxAppPath, utils.TEMPLATE_MSG_ACTIVITY_APPOINTMENT)
+		sendTemplateMsg(utils.AdminWxAppId, sendUrl, sendMap, openIdList, wxAppPath, utils.TEMPLATE_MSG_ACTIVITY_APPOINTMENT)
 	}
 	utils.FileLog.Info("send end")
 	return
@@ -285,7 +286,7 @@ func SendWxMsgWithRoadshowPending(first, keyword1, keyword2, keyword3, keyword4,
 		if wxAppPath != "" {
 			sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxAppId2, "pagepath": wxAppPath}
 		}
-		sendTemplateMsg(sendUrl, sendMap, openIdList, wxAppPath, utils.TEMPLATE_MSG_ACTIVITY_APPOINTMENT)
+		sendTemplateMsg(utils.AdminWxAppId, sendUrl, sendMap, openIdList, wxAppPath, utils.TEMPLATE_MSG_ACTIVITY_APPOINTMENT)
 	}
 	utils.FileLog.Info("send end")
 	return
@@ -341,7 +342,7 @@ func SendWxMsgWithRoadshowDeleteNotice(first, keyword1, keyword2, remark, wxAppP
 			sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxAppId2, "pagepath": wxAppPath}
 		}
 		sendMap["data"] = sendData
-		sendTemplateMsg(sendUrl, sendMap, openIdList, wxAppPath, utils.TEMPLATE_MSG_ACTIVITY_APPOINTMENT)
+		sendTemplateMsg(utils.AdminWxAppId, sendUrl, sendMap, openIdList, wxAppPath, utils.TEMPLATE_MSG_ACTIVITY_APPOINTMENT)
 	}
 	utils.FileLog.Info("send end")
 	return
@@ -404,7 +405,7 @@ func SendSealFinishedWxTemplateMsg(mobile string, companyName string, sealId int
 		// TODO 随手办公小程序的跳转地址
 		wxAppPath := fmt.Sprintf("pages-approve/seal/detail?SealId=%d", sealId)
 		sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxAppId2, "pagepath": wxAppPath}
-		err = sendTemplateMsg(sendUrl, sendMap, openIdList, wxAppPath, utils.TEMPLATE_MSG_SEAL_FINISHED)
+		err = sendTemplateMsg(utils.AdminWxAppId, sendUrl, sendMap, openIdList, wxAppPath, utils.TEMPLATE_MSG_SEAL_FINISHED)
 	}
 	utils.FileLog.Info("send end")
 	return
@@ -457,6 +458,6 @@ func SendYbQuestionDistributeWxMsg(questionId, adminId int, openid, questionTitl
 	if wxAppPath != "" {
 		sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxYbAppId, "pagepath": wxAppPath}
 	}
-	err = sendTemplateMsg(sendUrl, sendMap, openIdList, wxAppPath, utils.TEMPLATE_MSG_YB_COMMUNITY_QUESTION)
+	err = sendTemplateMsg(utils.AdminWxAppId, sendUrl, sendMap, openIdList, wxAppPath, utils.TEMPLATE_MSG_YB_COMMUNITY_QUESTION)
 	return
 }