fix：token刷新

controllers/wechat.go

@@ -59,26 +59,3 @@ func (this *WechatController) SendTemplateMsg() {
 	br.Msg = "推送成功"
 	return
 }
-
-// RefreshWxAccessToken
-// @Title 强制刷新token
-// @Description 推送模板消息
-// @Success 200 新增成功
-// @router /test/refresh [get]
-func (this *WechatController) RefreshWxAccessToken() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	token,err,errMsg:=services.RefreshWxAccessToken()
-	br.Data = token
-	if err != nil{
-		br.Msg = errMsg
-		br.ErrMsg = err.Error()
-	}
-	br.Ret = 200
-	br.Msg = "推送成功"
-	return
-}

routers/commentsRouter.go

@@ -34,13 +34,4 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["hongze/hongze_public_api/controllers:WechatController"] = append(beego.GlobalControllerRouter["hongze/hongze_public_api/controllers:WechatController"],
-        beego.ControllerComments{
-            Method: "RefreshWxAccessToken",
-            Router: `/test/refresh`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
 }

services/wechat_send_msg.go

@@ -175,25 +175,11 @@ func toSendTemplateMsg(wxAppId string, data []byte, resource string, sendType in
 	//获取accessToken
 	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
-		}
+
+	accessToken, err, errMsg = getWxAccessToken(wxAppId)
+	if err != nil {
+		utils.FileLog.Info(fmt.Sprintf("获取Token失败,err：%s,errMsg：%s",err.Error(), errMsg))
+		return
 	}
 
 	sendUrl := "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken
@@ -241,7 +227,7 @@ func toSendTemplateMsg(wxAppId string, data []byte, resource string, sendType in
 	//accessToken过期
 	if templateResponse.Errcode == 40001{
 		//强刷token并重新推送
-		accessToken,err,errMsg = refreshWxAccessToken()
+		accessToken,err,errMsg = refreshWxAccessToken(wxAppId)
 		if err != nil{
 			utils.FileLog.Info(fmt.Sprintf("refreshWxAccessToken Err:%s", err.Error()))
 			return err
@@ -298,8 +284,15 @@ func toSendTemplateMsg(wxAppId string, data []byte, resource string, sendType in
 }
 
 // getWxAccessToken 获取微信token
-func getWxAccessToken()(accessToken string,err error,errMsg string){
-	accessToken, err = utils.Rc.RedisString(utils.CACHE_WX_ACCESS_TOKEN_HZ)
+func getWxAccessToken(wxAppId string)(accessToken string,err error,errMsg string){
+	redisKey := getRedisKeyByAppid(wxAppId)
+	if redisKey == ``{
+		errMsg = "未配置缓存key"
+		err = errors.New(errMsg)
+		return
+	}
+
+	accessToken, err = utils.Rc.RedisString(redisKey)
 	//fmt.Println(err)
 	//fmt.Println(accessToken)
 	//if err != nil {
@@ -313,20 +306,33 @@ func getWxAccessToken()(accessToken string,err error,errMsg string){
 	}
 
 	//缓存中没有取到数据，那么需要去强制刷新新的accessToken
-	return refreshWxAccessToken()
+	return refreshWxAccessToken(wxAppId)
 }
 
-func RefreshWxAccessToken()(accessToken string,err error,errMsg string){
-	return refreshWxAccessToken()
-}
 // refreshWxAccessToken 强制刷新微信token
-func refreshWxAccessToken()(accessToken string,err error,errMsg string){
-	fmt.Println("强制刷新"+utils.WxAppId+"微信token")
-	if errMsg !=``{
-		utils.FileLog.Info(fmt.Sprintf("强制刷新%s微信token异常：%s", utils.WxAppId,errMsg))
+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))
+		}
+	}()
+	redisKey := getRedisKeyByAppid(wxAppId)
+	if redisKey == ``{
+		errMsg = "未配置缓存key"
+		err = errors.New(errMsg)
+		return
+	}
+
+	wxAppSecret, ok := utils.WxAppList[wxAppId]
+	if !ok {
+		err = errors.New("缺少密钥信息")
+		utils.FileLog.Info(fmt.Sprintf("获取Token失败, errMsg：%s",err.Error()))
+		return
 	}
+
 	//调用微信官方接口获取新的accessToken
-	wxAccessToken, tmpErr := models.GetWxToken(utils.WxAppId, utils.WxAppSecret)
+	wxAccessToken, tmpErr := models.GetWxToken(wxAppId, wxAppSecret)
 	if tmpErr != nil {
 		err = tmpErr
 		errMsg = "通过微信接口获取accessToken失败 Err:" + err.Error()
@@ -342,17 +348,19 @@ func refreshWxAccessToken()(accessToken string,err error,errMsg string){
 
 
 	accessToken = wxAccessToken.AccessToken
-	//更新mysql的accessToken
-	expiresIn := time.Now().Add(time.Duration(wxAccessToken.ExpiresIn) * time.Second).Unix()
-	err = models.ModifyAccessToken(wxAccessToken.AccessToken,expiresIn)
-	if err!=nil{
-		errMsg = "更新mysql中的accessToken失败 Err:" + err.Error()
-		return
+	//如果是弘则研究的appid，那么需要更新mysql的accessToken
+	if wxAppId == utils.WxAppId{
+		expiresIn := time.Now().Add(time.Duration(wxAccessToken.ExpiresIn) * time.Second).Unix()
+		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(utils.CACHE_WX_ACCESS_TOKEN_HZ,accessToken,redisTimeExpire)
+	err = utils.Rc.Put(redisKey,accessToken,redisTimeExpire)
 	if err!=nil{
 		errMsg = "更新redis中的accessToken失败 Err:" + err.Error()
 		return
@@ -386,4 +394,15 @@ func WxGetRedisAccessToken(wxAppId, wxAppSecret string) (accessToken string, err
 		return
 	}
 	return
+}
+
+// 根据微信appid获取对应的缓存key
+func getRedisKeyByAppid(wxAppId string) (redisKey string) {
+	switch wxAppId {
+	case utils.WxAppId:
+		redisKey = utils.CACHE_WX_ACCESS_TOKEN_HZ
+	case utils.AdminWxAppId:
+		redisKey = utils.HZ_ADMIN_WX_ACCESS_TOEKN+wxAppId
+	}
+	return redisKey
 }

services/wechat_send_msg_cygx.go

@@ -236,7 +236,7 @@ func getWxAccessTokenCygx()(accessToken string,err error,errMsg string){
 	return refreshWxAccessTokenCygx()
 }
 
-// refreshWxAccessToken 强制刷新微信token
+// refreshWxAccessTokenCygx 强制刷新微信token
 func refreshWxAccessTokenCygx()(accessToken string,err error,errMsg string){
 	fmt.Println("强制刷新"+utils.WxAppIdCygx+"微信token")
 	if errMsg !=``{

utils/config.go

@@ -108,6 +108,7 @@ func WxDebug() {
 
 	WxAppList = make(map[string]string)
 	WxAppList[AdminWxAppId] = AdminWxAppSecret
+	WxAppList[WxAppId] = WxAppSecret
 }
 
 //生产环境模板消息
@@ -123,6 +124,7 @@ func WxRelease() {
 
 	WxAppList = make(map[string]string)
 	WxAppList[AdminWxAppId] = AdminWxAppSecret
+	WxAppList[WxAppId] = WxAppSecret
 }