Merge branch 'feature/migrate_wechat_msg' of hongze/hongze_public_api into master

controllers/wechat.go

@@ -5,6 +5,7 @@ import (
 	"hongze/hongze_public_api/models"
 	"hongze/hongze_public_api/services"
 	"hongze/hongze_public_api/services/alarm_msg"
+	"hongze/hongze_public_api/utils"
 )
 
 //发送模板消息
@@ -40,7 +41,9 @@ func (this *WechatController) SendTemplateMsg() {
 		br.Msg = "openid为空"
 		return
 	}
-
+	if sendItem.WxAppId == "" {
+		sendItem.WxAppId = utils.WxAppId   //默认是弘则研究公众号的appId
+	}
 	go func() {
 		if 	sendItem.RedirectTarget == 3 {
 			err = services.SendWxTemplateMsgCygx(sendItem)

models/user_template_record.go

@@ -16,6 +16,7 @@ type UserTemplateRecord struct {
 	SendStatus int
 	SendType   int
 	UniqueCode string
+	WxAppId    string
 }
 
 //添加banner

models/wechat.go

@@ -3,8 +3,6 @@ package models
 import (
 	"encoding/json"
 	"fmt"
-	"time"
-
 	"hongze/hongze_public_api/utils"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -17,51 +15,6 @@ type WxToken struct {
 	Id          int64
 }
 
-func GetWxAccessToken() (accessTokenStr string, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM wx_token LIMIT 1`
-	wxToken := new(WxToken)
-	err = o.Raw(sql).QueryRow(&wxToken)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		utils.FileLog.Info("Get wxToken Err:", err.Error())
-		return
-	}
-	//Token不存在
-	if wxToken == nil {
-		fmt.Println("wxToken is empty")
-		accessToken, err := GetWxToken()
-		if err != nil {
-			return "", err
-		}
-		if accessToken.AccessToken != "" {
-			expiresIn := time.Now().Add(time.Duration(accessToken.ExpiresIn) * time.Second).Unix()
-			addSql := "insert into wx_token (access_token,expires_in) values (?,?)"
-			_, err = o.Raw(addSql, accessToken.AccessToken, expiresIn).Exec()
-			accessTokenStr = accessToken.AccessToken
-		}
-		return accessTokenStr, err
-	} else {
-		//判断token是否过期
-		if time.Now().Unix() > wxToken.ExpiresIn {
-			accessToken, err := GetWxToken()
-			if err != nil {
-				return "", err
-			}
-			if accessToken.AccessToken != "" {
-				expiresIn := time.Now().Add(time.Duration(accessToken.ExpiresIn) * time.Second).Unix()
-				updateSql := "update wx_token set access_token = ?,expires_in = ? "
-				_, err = o.Raw(updateSql, accessToken.AccessToken, expiresIn).Exec()
-				accessTokenStr = accessToken.AccessToken
-				fmt.Println("更新 TOKEN:", err)
-			}
-			return accessTokenStr, err
-		} else {
-			return wxToken.AccessToken, nil
-		}
-	}
-	return
-}
-
 type WxAccessToken struct {
 	AccessToken string `json:"access_token"`
 	ExpiresIn   int    `json:"expires_in"`
@@ -69,8 +22,8 @@ type WxAccessToken struct {
 	Errmsg      string `json:"errmsg"`
 }
 
-func GetWxToken() (item *WxAccessToken, err error) {
-	getUrl := "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + utils.WxAppId + "&secret=" + utils.WxAppSecret
+func GetWxToken(wxAppId,wxAppSecret string) (item *WxAccessToken, err error) {
+	getUrl := "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + wxAppId + "&secret=" + wxAppSecret
 	result, err := http.Get(getUrl)
 	if err != nil {
 		utils.FileLog.Info("GetWxToken Err:", err.Error())

models/wechat_send_msg.go

@@ -206,11 +206,14 @@ func GetUserRecordListByMobile(platform int, bindAccount string) (items []*OpenI
 }
 
 type SendWxTemplate struct {
+	WxAppId        string   `description:"公众号appId"`
 	First          string   `description:"模板消息first字段"`
 	Keyword1       string   `description:"模板消息keyword1字段"`
 	Keyword2       string   `description:"模板消息keyword2字段"`
 	Keyword3       string   `description:"模板消息keyword3字段"`
 	Keyword4       string   `description:"模板消息keyword4字段"`
+	Productname    string   `description:"模板消息productname字段"`
+	Date           string   `description:"模板消息date字段"`
 	Remark         string   `description:"模板消息remark字段"`
 	TemplateId     string   `description:"模板id"`
 	RedirectUrl    string   `description:"跳转地址"`

services/wechat_send_msg.go

@@ -44,6 +44,9 @@ func SendWxTemplateMsg(sendInfo *models.SendWxTemplate) (err error) {
 	sendMap := make(map[string]interface{})
 	sendData := make(map[string]interface{})
 	var uniqueCodeStr string
+	if sendInfo.WxAppId != "" {
+		uniqueCodeStr += sendInfo.WxAppId
+	}
 	if sendInfo.First != "" {
 		sendData["first"] = map[string]interface{}{"value": sendInfo.First, "color": "#173177"}
 		uniqueCodeStr += sendInfo.First
@@ -68,7 +71,14 @@ func SendWxTemplateMsg(sendInfo *models.SendWxTemplate) (err error) {
 		sendData["keyword4"] = map[string]interface{}{"value": sendInfo.Keyword4, "color": "#173177"}
 		uniqueCodeStr += sendInfo.Keyword4
 	}
-
+	if sendInfo.Productname != "" {
+		sendData["productname"] = map[string]interface{}{"value": sendInfo.Productname, "color": "#173177"}
+		uniqueCodeStr += sendInfo.Productname
+	}
+	if sendInfo.Date != "" {
+		sendData["date"] = map[string]interface{}{"value": sendInfo.Date, "color": "#173177"}
+		uniqueCodeStr += sendInfo.Date
+	}
 	if sendInfo.Remark != "" {
 		sendData["remark"] = map[string]interface{}{"value": sendInfo.Remark, "color": "#173177"}
 		uniqueCodeStr += sendInfo.Remark
@@ -103,7 +113,7 @@ func SendWxTemplateMsg(sendInfo *models.SendWxTemplate) (err error) {
 
 	uniqueCode := utils.MD5(uniqueCodeStr)
 
-	err = sendTemplateMsg(sendMap, sendInfo.OpenIdArr, sendInfo.Resource, uniqueCode, sendInfo.SendType)
+	err = sendTemplateMsg(sendInfo.WxAppId, sendMap, sendInfo.OpenIdArr, sendInfo.Resource, uniqueCode, sendInfo.SendType)
 	if err != nil {
 		utils.FileLog.Info("send err:" + err.Error())
 	}
@@ -113,7 +123,7 @@ func SendWxTemplateMsg(sendInfo *models.SendWxTemplate) (err error) {
 }
 
 // sendTemplateMsg 整理openid以及以往历史推送记录，移除已经推送的记录，并开始依次推送
-func sendTemplateMsg(sendMap map[string]interface{}, openIdArr []string, resource, uniqueCode string, sendType int) (err error) {
+func sendTemplateMsg(wxAppId string, sendMap map[string]interface{}, openIdArr []string, resource, uniqueCode string, sendType int) (err error) {
 	existList, err := models.GetTemplateRecordByUniqueCode(uniqueCode)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		utils.FileLog.Info(fmt.Sprintf("GetTemplateRecordByUniqueCode Err:%s", err.Error()))
@@ -128,7 +138,7 @@ func sendTemplateMsg(sendMap map[string]interface{}, openIdArr []string, resourc
 				utils.FileLog.Info(fmt.Sprintf("SendTemplateMsgOne Marshal Err:%s", err.Error()))
 				return err
 			}
-			err = toSendTemplateMsg(data, resource, sendType, openId, uniqueCode)
+			err = toSendTemplateMsg(wxAppId, data, resource, sendType, openId, uniqueCode)
 			if err != nil {
 				fmt.Println("send err:", err.Error())
 				utils.FileLog.Info(fmt.Sprintf("ToSendTemplateMsg Err:%s", err.Error()))
@@ -148,7 +158,7 @@ func sendTemplateMsg(sendMap map[string]interface{}, openIdArr []string, resourc
 					utils.FileLog.Info(fmt.Sprintf("SendTemplateMsgOne Marshal Err:%s", err.Error()))
 					return err
 				}
-				err = toSendTemplateMsg( data, resource, sendType, openId, uniqueCode)
+				err = toSendTemplateMsg(wxAppId, data, resource, sendType, openId, uniqueCode)
 				if err != nil {
 					fmt.Println("send err:", err.Error())
 					utils.FileLog.Info(fmt.Sprintf("ToSendTemplateMsg Err:%s", err.Error()))
@@ -160,14 +170,32 @@ func sendTemplateMsg(sendMap map[string]interface{}, openIdArr []string, resourc
 }
 
 // toSendTemplateMsg 实际推送微信
-func toSendTemplateMsg(data []byte, resource string, sendType int, openId, uniqueCode string) (err error) {
+func toSendTemplateMsg(wxAppId string, data []byte, resource string, sendType int, openId, uniqueCode string) (err error) {
 	utils.FileLog.Info("Send:" + string(data))
 	//获取accessToken
-	accessToken, err,errMsg := getWxAccessToken()
-	if err != nil {
-		utils.FileLog.Info(fmt.Sprintf("获取Token失败,err：%s,errMsg：%s",err.Error(), errMsg))
-		return
+	var accessToken string
+	var errMsg string
+	if wxAppId == utils.WxAppId {
+		accessToken, err, errMsg = getWxAccessToken()
+		if err != nil {
+			utils.FileLog.Info(fmt.Sprintf("获取Token失败,err：%s,errMsg：%s",err.Error(), errMsg))
+			return
+		}
+	}else{
+		var wxAppSecret string
+		var ok bool
+		if wxAppSecret, ok = utils.WxAppList[wxAppId]; !ok {
+			err = errors.New("缺少密钥信息")
+			utils.FileLog.Info(fmt.Sprintf("获取Token失败, errMsg：%s",err.Error()))
+			return
+		}
+		accessToken, err = WxGetRedisAccessToken(wxAppId, wxAppSecret)
+		if err != nil {
+			utils.FileLog.Info(fmt.Sprintf("获取Token失败, errMsg：%s",err.Error()))
+			return
+		}
 	}
+
 	sendUrl := "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken
 
 	client := http.Client{}
@@ -201,6 +229,7 @@ func toSendTemplateMsg(data []byte, resource string, sendType int, openId, uniqu
 		}
 		tr.UniqueCode = uniqueCode
 		tr.SendType = sendType
+		tr.WxAppId = wxAppId
 		go func() {
 			err = models.AddUserTemplateRecord(tr)
 			if err != nil {
@@ -217,7 +246,7 @@ func toSendTemplateMsg(data []byte, resource string, sendType int, openId, uniqu
 			utils.FileLog.Info(fmt.Sprintf("refreshWxAccessToken Err:%s", err.Error()))
 			return err
 		}
-		return toSendTemplateMsg(data, resource, sendType, openId, uniqueCode)
+		return toSendTemplateMsg(wxAppId,data, resource, sendType, openId, uniqueCode)
 	}
 
 	//模板消息发送超过当日10万次限制错误处理
@@ -262,7 +291,7 @@ func toSendTemplateMsg(data []byte, resource string, sendType int, openId, uniqu
 			go alarm_msg.SendAlarmMsg("异常已解决,自动清理限制接口，调用成功", 3)
 			//go utils.SendEmail("异常已解决:", "自动清理限制接口，调用成功", utils.EmailSendToUsers)
 			//重新推送一次
-			toSendTemplateMsg(data, resource, sendType, openId, uniqueCode)
+			toSendTemplateMsg(wxAppId, data, resource, sendType, openId, uniqueCode)
 		}
 	}
 	return
@@ -291,7 +320,7 @@ func getWxAccessToken()(accessToken string,err error,errMsg string){
 func refreshWxAccessToken()(accessToken string,err error,errMsg string){
 	fmt.Println("强制刷新微信token")
 	//调用微信官方接口获取新的accessToken
-	wxAccessToken, tmpErr := models.GetWxToken()
+	wxAccessToken, tmpErr := models.GetWxToken(utils.WxAppId, utils.WxAppSecret)
 	if tmpErr != nil {
 		err = tmpErr
 		errMsg = "通过微信接口获取accessToken失败 Err:" + err.Error()
@@ -323,5 +352,32 @@ func refreshWxAccessToken()(accessToken string,err error,errMsg string){
 		return
 	}
 
+	return
+}
+
+// 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)
+	if err != nil {
+		err = nil
+		token, tErr := models.GetWxToken(wxAppId, wxAppSecret)
+		if tErr != nil {
+			return "", tErr
+		}
+		if token.Errmsg != "" {
+			err = errors.New("获取access_token 失败 errcode:" + token.Errmsg + " ;errmsg:" + token.Errmsg)
+			return "", err
+		}
+		//更新redis的accessToken（过期时间提前十分钟）
+		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
+		}
+		accessToken = token.AccessToken
+		return
+	}
 	return
 }

utils/config.go

@@ -21,8 +21,18 @@ var (
 	WxId                string //微信原始ID
 	WxAppId             string
 	WxAppSecret         string
+
+
+	//内部员工公众号（弘则部门）
+	AdminWxAppId                    string
+	AdminWxAppSecret                string
+
+	//微信列表
+	WxAppList           map[string]string
+
 	WxAppIdCygx             string
 	WxAppSecretCygx         string
+
 )
 
 // LibreOfficePath LibreOfficePath的地址
@@ -91,6 +101,13 @@ func WxDebug() {
 	WxAppId = "wx9b5d7291e581233a"
 	WxAppSecret = "f4d52e34021eee262dce9682b31f8861"
 	WxId = "gh_5dc508325c6f"
+
+	//内部员工公众号（弘则部门）
+	AdminWxAppId = "wx1392111da5426e9e"
+	AdminWxAppSecret = "30eceb7cf29bf2f046031155ab55d7b4"
+
+	WxAppList = make(map[string]string)
+	WxAppList[AdminWxAppId] = AdminWxAppSecret
 }
 
 //生产环境模板消息
@@ -98,6 +115,14 @@ func WxRelease() {
 	WxAppId = "wx4a844c734d8c8e56"
 	WxAppSecret = "26c586e7ccb3c575433f0f37797b3eeb"
 	WxId = "gh_b67e0049fb8c"
+
+
+	//内部员工公众号（弘则部门）
+	AdminWxAppId = "wx1392111da5426e9e"
+	AdminWxAppSecret = "30eceb7cf29bf2f046031155ab55d7b4"
+
+	WxAppList = make(map[string]string)
+	WxAppList[AdminWxAppId] = AdminWxAppSecret
 }
 
 

utils/constants.go

@@ -45,5 +45,6 @@ const (
 // 缓存key
 const (
 	CACHE_WX_ACCESS_TOKEN_HZ         = "wx:accesstoken:hzyj"                  //弘则研究公众号 微信accessToken
+	HZ_ADMIN_WX_ACCESS_TOEKN         = "hz_admin:wx:access_token:"
 	CACHE_WX_ACCESS_TOKEN_CYGX         = "xygxxzs_wxtoken"                  //查研观向小助手公众号 微信accessToken
 )