fix：微信模板消息支持关键字5

models/wechat_send_msg.go

@@ -31,7 +31,7 @@ func GetOpenIdListByMobile(mobile string) (items []*OpenIdList, err error) {
 	return
 }
 
-//获取预约活动的用户的openID
+// 获取预约活动的用户的openID
 func GetActivityOpenIdList(activityId int) (items []*OpenIdList, err error) {
 	sql := `SELECT DISTINCT cr.open_id,u.user_id
 			FROM
@@ -43,7 +43,7 @@ func GetActivityOpenIdList(activityId int) (items []*OpenIdList, err error) {
 	return
 }
 
-//获取预约活动的用户的openID测试环境
+// 获取预约活动的用户的openID测试环境
 func GetActivityOpenIdListByDeBug(activityId int) (items []*OpenIdList, err error) {
 	sql := `SELECT
 			u.open_id,
@@ -63,7 +63,7 @@ func GetActivityOpenIdListByDeBug(activityId int) (items []*OpenIdList, err erro
 	return
 }
 
-//获取预约活动的用户的openID
+// 获取预约活动的用户的openID
 func GetActivitySpecialOpenIdList() (items []*OpenIdList, err error) {
 	sql := `SELECT DISTINCT cr.open_id,u.user_id
 			FROM
@@ -75,7 +75,7 @@ func GetActivitySpecialOpenIdList() (items []*OpenIdList, err error) {
 	return
 }
 
-//获取预约活动的用户的openID测试环境
+// 获取预约活动的用户的openID测试环境
 func GetActivitySpecialOpenIdListByDeBug() (items []*OpenIdList, err error) {
 	sql := `SELECT
 			u.open_id,
@@ -94,7 +94,7 @@ func GetActivitySpecialOpenIdListByDeBug() (items []*OpenIdList, err error) {
 	return
 }
 
-//获取关注作者的用户的openID
+// 获取关注作者的用户的openID
 func GetFollowDepartmentOpenIdList(departmentId int) (items []*OpenIdList, err error) {
 	sql := `SELECT cr.open_id,u.user_id
 			FROM
@@ -114,7 +114,7 @@ func GetFollowDepartmentOpenIdList(departmentId int) (items []*OpenIdList, err e
 	return
 }
 
-//获取关注作者的用户的openID测试环境
+// 获取关注作者的用户的openID测试环境
 func GetFollowDepartmentOpenIdListByDeBug(departmentId int) (items []*OpenIdList, err error) {
 	sql := `SELECT
 			u.open_id,
@@ -135,7 +135,7 @@ func GetFollowDepartmentOpenIdListByDeBug(departmentId int) (items []*OpenIdList
 	return
 }
 
-//获取关注产业的用户的openID
+// 获取关注产业的用户的openID
 func GetFollowindustrialOpenIdList(industrialManagementId int) (items []*OpenIdList, err error) {
 	sql := `SELECT cr.open_id,u.user_id
 			FROM
@@ -151,7 +151,7 @@ func GetFollowindustrialOpenIdList(industrialManagementId int) (items []*OpenIdL
 	return
 }
 
-//获取关注产业的用户的openID 测试环境
+// 获取关注产业的用户的openID 测试环境
 func GetFollowindustrialOpenIdListByDeBug(industrialManagementId int) (items []*OpenIdList, err error) {
 	sql := `SELECT
 			u.open_id,
@@ -190,7 +190,7 @@ func GetAdminOpenIdByMobile(mobile string) (items []*OpenIdList, err error) {
 	return
 }
 
-//根据手机号获取用户的openid查研观向小助手专用
+// 根据手机号获取用户的openid查研观向小助手专用
 func GetUserRecordListByMobile(platform int, bindAccount string) (items []*OpenIdList, err error) {
 	var sql string
 	if utils.RunMode == "release" {
@@ -212,6 +212,7 @@ type SendWxTemplate struct {
 	Keyword2       string   `description:"模板消息keyword2字段"`
 	Keyword3       string   `description:"模板消息keyword3字段"`
 	Keyword4       string   `description:"模板消息keyword4字段"`
+	Keyword5       string   `description:"模板消息keyword5字段"`
 	Productname    string   `description:"模板消息productname字段"`
 	Date           string   `description:"模板消息date字段"`
 	Remark         string   `description:"模板消息remark字段"`

services/wechat_send_msg.go

@@ -71,6 +71,11 @@ func SendWxTemplateMsg(sendInfo *models.SendWxTemplate) (err error) {
 		sendData["keyword4"] = map[string]interface{}{"value": sendInfo.Keyword4, "color": "#173177"}
 		uniqueCodeStr += sendInfo.Keyword4
 	}
+
+	if sendInfo.Keyword5 != "" {
+		sendData["keyword5"] = map[string]interface{}{"value": sendInfo.Keyword5, "color": "#173177"}
+		uniqueCodeStr += sendInfo.Keyword5
+	}
 	if sendInfo.Productname != "" {
 		sendData["productname"] = map[string]interface{}{"value": sendInfo.Productname, "color": "#173177"}
 		uniqueCodeStr += sendInfo.Productname
@@ -102,7 +107,7 @@ func SendWxTemplateMsg(sendInfo *models.SendWxTemplate) (err error) {
 				xcxAppId = utils.WxCygxAppId
 			} else {
 				err = errors.New("无效的微信小程序跳转方式:RedirectTarget" + strconv.Itoa(sendInfo.RedirectTarget))
-				return  err
+				return err
 			}
 			sendMap["miniprogram"] = map[string]interface{}{"appid": xcxAppId, "pagepath": sendInfo.RedirectUrl}
 		}
@@ -178,7 +183,7 @@ func toSendTemplateMsg(wxAppId string, data []byte, resource string, sendType in
 
 	accessToken, err, errMsg = getWxAccessToken(wxAppId)
 	if err != nil {
-		utils.FileLog.Info(fmt.Sprintf("获取Token失败,err：%s,errMsg：%s",err.Error(), errMsg))
+		utils.FileLog.Info(fmt.Sprintf("获取Token失败,err：%s,errMsg：%s", err.Error(), errMsg))
 		return
 	}
 
@@ -225,14 +230,14 @@ func toSendTemplateMsg(wxAppId string, data []byte, resource string, sendType in
 	}
 
 	//accessToken过期
-	if templateResponse.Errcode == 40001{
+	if templateResponse.Errcode == 40001 {
 		//强刷token并重新推送
-		accessToken,err,errMsg = refreshWxAccessToken(wxAppId)
-		if err != nil{
+		accessToken, err, errMsg = refreshWxAccessToken(wxAppId)
+		if err != nil {
 			utils.FileLog.Info(fmt.Sprintf("refreshWxAccessToken Err:%s", err.Error()))
 			return err
 		}
-		return toSendTemplateMsg(wxAppId,data, resource, sendType, openId, uniqueCode)
+		return toSendTemplateMsg(wxAppId, data, resource, sendType, openId, uniqueCode)
 	}
 
 	//模板消息发送超过当日10万次限制错误处理
@@ -284,9 +289,9 @@ func toSendTemplateMsg(wxAppId string, data []byte, resource string, sendType in
 }
 
 // getWxAccessToken 获取微信token
-func getWxAccessToken(wxAppId string)(accessToken string,err error,errMsg string){
+func getWxAccessToken(wxAppId string) (accessToken string, err error, errMsg string) {
 	redisKey := getRedisKeyByAppid(wxAppId)
-	if redisKey == ``{
+	if redisKey == `` {
 		errMsg = "未配置缓存key"
 		err = errors.New(errMsg)
 		return
@@ -301,7 +306,7 @@ func getWxAccessToken(wxAppId string)(accessToken string,err error,errMsg string
 	//	return
 	//}
 	//取到数据后就直接返回了，没有后续了
-	if accessToken != ""{
+	if accessToken != "" {
 		return
 	}
 
@@ -310,15 +315,15 @@ func getWxAccessToken(wxAppId string)(accessToken string,err error,errMsg string
 }
 
 // refreshWxAccessToken 强制刷新微信token
-func refreshWxAccessToken(wxAppId string)(accessToken string,err error,errMsg string){
-	fmt.Println("强制刷新"+wxAppId+"微信token")
+func refreshWxAccessToken(wxAppId string) (accessToken string, err error, errMsg string) {
+	fmt.Println("强制刷新" + wxAppId + "微信token")
 	defer func() {
-		if errMsg !=``{
-			utils.FileLog.Info(fmt.Sprintf("强制刷新%s微信token异常：%s", wxAppId,errMsg))
+		if errMsg != `` {
+			utils.FileLog.Info(fmt.Sprintf("强制刷新%s微信token异常：%s", wxAppId, errMsg))
 		}
 	}()
 	redisKey := getRedisKeyByAppid(wxAppId)
-	if redisKey == ``{
+	if redisKey == `` {
 		errMsg = "未配置缓存key"
 		err = errors.New(errMsg)
 		return
@@ -327,7 +332,7 @@ func refreshWxAccessToken(wxAppId string)(accessToken string,err error,errMsg st
 	wxAppSecret, ok := utils.WxAppList[wxAppId]
 	if !ok {
 		err = errors.New("缺少密钥信息")
-		utils.FileLog.Info(fmt.Sprintf("获取Token失败, errMsg：%s",err.Error()))
+		utils.FileLog.Info(fmt.Sprintf("获取Token失败, errMsg：%s", err.Error()))
 		return
 	}
 
@@ -346,22 +351,21 @@ func refreshWxAccessToken(wxAppId string)(accessToken string,err error,errMsg st
 		return
 	}
 
-
 	accessToken = wxAccessToken.AccessToken
 	//如果是弘则研究的appid，那么需要更新mysql的accessToken
-	if wxAppId == utils.WxAppId{
+	if wxAppId == utils.WxAppId {
 		expiresIn := time.Now().Add(time.Duration(wxAccessToken.ExpiresIn) * time.Second).Unix()
-		err = models.ModifyAccessToken(wxAccessToken.AccessToken,expiresIn)
-		if err!=nil{
+		err = models.ModifyAccessToken(wxAccessToken.AccessToken, expiresIn)
+		if err != nil {
 			errMsg = "更新mysql中的accessToken失败 Err:" + err.Error()
 			return
 		}
 	}
 
 	//更新redis的accessToken（过期时间提前十分钟）
-	redisTimeExpire := time.Duration(wxAccessToken.ExpiresIn - 600) * time.Second
-	err = utils.Rc.Put(redisKey,accessToken,redisTimeExpire)
-	if err!=nil{
+	redisTimeExpire := time.Duration(wxAccessToken.ExpiresIn-600) * time.Second
+	err = utils.Rc.Put(redisKey, accessToken, redisTimeExpire)
+	if err != nil {
 		errMsg = "更新redis中的accessToken失败 Err:" + err.Error()
 		return
 	}
@@ -372,7 +376,7 @@ func refreshWxAccessToken(wxAppId string)(accessToken string,err error,errMsg st
 // WxGetRedisAccessToken 从redis中获取token
 func WxGetRedisAccessToken(wxAppId, wxAppSecret string) (accessToken string, err error) {
 	//从redis中获取token校验验证码
-	accessToken, err = utils.Rc.RedisString(utils.HZ_ADMIN_WX_ACCESS_TOEKN+wxAppId)
+	accessToken, err = utils.Rc.RedisString(utils.HZ_ADMIN_WX_ACCESS_TOEKN + wxAppId)
 	if err != nil {
 		err = nil
 		token, tErr := models.GetWxToken(wxAppId, wxAppSecret)
@@ -384,7 +388,7 @@ func WxGetRedisAccessToken(wxAppId, wxAppSecret string) (accessToken string, err
 			return "", err
 		}
 		//更新redis的accessToken（过期时间提前十分钟）
-		redisTimeExpire := time.Duration(token.ExpiresIn - 600) * time.Second
+		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())
@@ -402,7 +406,7 @@ func getRedisKeyByAppid(wxAppId string) (redisKey string) {
 	case utils.WxAppId:
 		redisKey = utils.CACHE_WX_ACCESS_TOKEN_HZ
 	case utils.AdminWxAppId:
-		redisKey = utils.HZ_ADMIN_WX_ACCESS_TOEKN+wxAppId
+		redisKey = utils.HZ_ADMIN_WX_ACCESS_TOEKN + wxAppId
 	}
 	return redisKey
-}
+}