update service wechat

service/wechatminiprogram/cgi-bin.token.db.go

@@ -29,19 +29,19 @@ func (app *App) GetAccessTokenDb() string {
 	if wat.AccessToken != "" {
 		return wat.AccessToken
 	} else {
-		token, _ := app.AuthGetAccessToken()
-		if token.AccessToken == "" {
+		token := app.AuthGetAccessToken()
+		if token.AuthGetAccessTokenResponse.AccessToken == "" {
 			return ""
 		} else {
 			// 创建
 			app.Db.Create(&WechatAccessTokenDbModel{
 				AppID:       app.AppId,
 				AppSecret:   app.AppSecret,
-				AccessToken: token.AccessToken,
-				ExpiresIn:   token.ExpiresIn,
+				AccessToken: token.AuthGetAccessTokenResponse.AccessToken,
+				ExpiresIn:   token.AuthGetAccessTokenResponse.ExpiresIn,
 				ExpiresTime: gotime.Current().AfterSeconds(7000).Format(),
 			})
-			return token.AccessToken
+			return token.AuthGetAccessTokenResponse.AccessToken
 		}
 	}
 }

service/wechatminiprogram/cgi-bin.token.go

@@ -5,22 +5,31 @@ import (
 	"fmt"
 )
 
-// AuthGetAccessTokenResult 返回参数
-type AuthGetAccessTokenResult struct {
+// AuthGetAccessTokenResponse 返回参数
+type AuthGetAccessTokenResponse struct {
 	AccessToken string `json:"access_token"` // 获取到的凭证
 	ExpiresIn   int    `json:"expires_in"`   // 凭证有效时间，单位：秒。目前是7200秒之内的值
 	Errcode     int    `json:"errcode"`      // 错误码
 	Errmsg      string `json:"errmsg"`       // 错误信息
 }
 
-func (app *App) AuthGetAccessToken() (result AuthGetAccessTokenResult, err error) {
+// NewAuthGetAccessTokenResult 构造函数
+func NewAuthGetAccessTokenResult(result AuthGetAccessTokenResponse, byte []byte, err error) *Result {
+	return &Result{
+		AuthGetAccessTokenResponse: result,
+		Byte:                       byte,
+		Err:                        err,
+	}
+}
+
+// AuthGetAccessToken
+// 接口调用凭证
+// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/access-token/auth.getAccessToken.html
+func (app *App) AuthGetAccessToken() *Result {
 	// request
 	body, err := app.request(fmt.Sprintf("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s", app.AppId, app.AppSecret), map[string]interface{}{}, "GET")
-	if err != nil {
-		return
-	}
-	if err = json.Unmarshal(body, &result); err != nil {
-		return
-	}
-	return
+	// 定义
+	var response AuthGetAccessTokenResponse
+	err = json.Unmarshal(body, &response)
+	return NewAuthGetAccessTokenResult(response, body, err)
 }

service/wechatminiprogram/cgi-bin.token.monitor.go

@@ -0,0 +1,49 @@
+package wechatminiprogram
+
+import (
+	"errors"
+	"fmt"
+	"gopkg.in/dtapps/go-library.v3/utils/goredis"
+	"gopkg.in/dtapps/go-library.v3/utils/gotime"
+)
+
+var (
+	qdTypeDb  = "DB"
+	qdTypeRdb = "redis"
+)
+
+func (app *App) AuthGetAccessTokenMonitor(qdType string) error {
+	result := app.GetCallBackIp()
+	if len(result.GetCallBackIpResponse.IpList) <= 0 {
+		switch qdType {
+		case qdTypeDb:
+			token := app.AuthGetAccessToken()
+			if token.AuthGetAccessTokenResponse.AccessToken == "" {
+				return errors.New("获取AccessToken失败")
+			} else {
+				app.Db.Create(&WechatAccessTokenDbModel{
+					AppID:       app.AppId,
+					AppSecret:   app.AppSecret,
+					AccessToken: token.AuthGetAccessTokenResponse.AccessToken,
+					ExpiresIn:   token.AuthGetAccessTokenResponse.ExpiresIn,
+					ExpiresTime: gotime.Current().AfterSeconds(7000).Format(),
+				})
+				return nil
+			}
+		case qdTypeRdb:
+			cacheName := fmt.Sprintf("wechat_access_token:%v", app.AppId)
+			redis := goredis.App{
+				Rdb: app.RDb,
+			}
+			token := app.AuthGetAccessToken()
+			if token.AuthGetAccessTokenResponse.AccessToken == "" {
+				return errors.New("获取AccessToken失败")
+			}
+			redis.NewStringOperation().Set(cacheName, token.AuthGetAccessTokenResponse.AccessToken, goredis.WithExpire(7000))
+			return nil
+		default:
+			return errors.New("驱动类型不在范围内")
+		}
+	}
+	return nil
+}

service/wechatminiprogram/cgi-bin.token.rdb.go

@@ -12,8 +12,8 @@ func (app *App) GetAccessTokenRDb() string {
 	}
 	newCache := redis.NewSimpleStringCache(redis.NewStringOperation(), 7000)
 	newCache.DBGetter = func() string {
-		token, _ := app.AuthGetAccessToken()
-		return token.AccessToken
+		token := app.AuthGetAccessToken()
+		return token.AuthGetAccessTokenResponse.AccessToken
 	}
 	return newCache.GetCache(cacheName)
 }

service/wechatminiprogram/getcallbackip_test.go

@@ -0,0 +1,13 @@
+package wechatminiprogram
+
+import (
+	"testing"
+)
+
+func TestApp_GetCallBackIp(t *testing.T) {
+	t.Log(app)
+	result := app.GetCallBackIp()
+	t.Logf("Response：%s", result.GetCallBackIpResponse)
+	t.Logf("Err：%s", result.Err)
+	t.Logf("Byte：%v", result.Byte)
+}

service/wechatminiprogram/result.go

@@ -2,7 +2,8 @@ package wechatminiprogram
 
 // Result 接口
 type Result struct {
-	Byte                  []byte // 内容
-	Err                   error  // 错误
-	GetCallBackIpResponse        // IP即微信调用开发者服务器所使用的出口IP
+	Byte                       []byte // 内容
+	Err                        error  // 错误
+	AuthGetAccessTokenResponse        // 接口调用凭证
+	GetCallBackIpResponse             // IP即微信调用开发者服务器所使用的出口IP
 }

service/wechatmp/cgi-bin.token.go

@@ -1,26 +0,0 @@
-package wechatmp
-
-import (
-	"encoding/json"
-	"fmt"
-)
-
-// AuthGetAccessTokenResult 返回参数
-type AuthGetAccessTokenResult struct {
-	AccessToken string `json:"access_token"` // 获取到的凭证
-	ExpiresIn   int    `json:"expires_in"`   // 凭证有效时间，单位：秒。目前是7200秒之内的值
-	Errcode     int    `json:"errcode"`      // 错误码
-	Errmsg      string `json:"errmsg"`       // 错误信息
-}
-
-func (app *App) AuthGetAccessToken() (result AuthGetAccessTokenResult, err error) {
-	// request
-	body, err := app.request(fmt.Sprintf("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s", app.AppId, app.AppSecret), map[string]interface{}{}, "GET")
-	if err != nil {
-		return
-	}
-	if err = json.Unmarshal(body, &result); err != nil {
-		return
-	}
-	return
-}

service/wechatoffice/cgi-bin.token.db.go

@@ -29,19 +29,19 @@ func (app *App) GetAccessTokenDb() string {
 	if wat.AccessToken != "" {
 		return wat.AccessToken
 	} else {
-		token, _ := app.AuthGetAccessToken()
-		if token.AccessToken == "" {
+		token := app.AuthGetAccessToken()
+		if token.AuthGetAccessTokenResponse.AccessToken == "" {
 			return ""
 		} else {
 			// 创建
 			app.Db.Create(&WechatAccessTokenDbModel{
 				AppID:       app.AppId,
 				AppSecret:   app.AppSecret,
-				AccessToken: token.AccessToken,
-				ExpiresIn:   token.ExpiresIn,
+				AccessToken: token.AuthGetAccessTokenResponse.AccessToken,
+				ExpiresIn:   token.AuthGetAccessTokenResponse.ExpiresIn,
 				ExpiresTime: gotime.Current().AfterSeconds(7000).Format(),
 			})
-			return token.AccessToken
+			return token.AuthGetAccessTokenResponse.AccessToken
 		}
 	}
 }

service/wechatoffice/cgi-bin.token.go

@@ -5,22 +5,31 @@ import (
 	"fmt"
 )
 
-// AuthGetAccessTokenResult 返回参数
-type AuthGetAccessTokenResult struct {
+// AuthGetAccessTokenResponse 返回参数
+type AuthGetAccessTokenResponse struct {
 	AccessToken string `json:"access_token"` // 获取到的凭证
 	ExpiresIn   int    `json:"expires_in"`   // 凭证有效时间，单位：秒。目前是7200秒之内的值
 	Errcode     int    `json:"errcode"`      // 错误码
 	Errmsg      string `json:"errmsg"`       // 错误信息
 }
 
-func (app *App) AuthGetAccessToken() (result AuthGetAccessTokenResult, err error) {
+// NewAuthGetAccessTokenResult 构造函数
+func NewAuthGetAccessTokenResult(result AuthGetAccessTokenResponse, byte []byte, err error) *Result {
+	return &Result{
+		AuthGetAccessTokenResponse: result,
+		Byte:                       byte,
+		Err:                        err,
+	}
+}
+
+// AuthGetAccessToken
+// 接口调用凭证
+// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/access-token/auth.getAccessToken.html
+func (app *App) AuthGetAccessToken() *Result {
 	// request
 	body, err := app.request(fmt.Sprintf("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s", app.AppId, app.AppSecret), map[string]interface{}{}, "GET")
-	if err != nil {
-		return
-	}
-	if err = json.Unmarshal(body, &result); err != nil {
-		return
-	}
-	return
+	// 定义
+	var response AuthGetAccessTokenResponse
+	err = json.Unmarshal(body, &response)
+	return NewAuthGetAccessTokenResult(response, body, err)
 }

service/wechatoffice/cgi-bin.token.monitor.go

@@ -0,0 +1,49 @@
+package wechatoffice
+
+import (
+	"errors"
+	"fmt"
+	"gopkg.in/dtapps/go-library.v3/utils/goredis"
+	"gopkg.in/dtapps/go-library.v3/utils/gotime"
+)
+
+var (
+	qdTypeDb  = "DB"
+	qdTypeRdb = "redis"
+)
+
+func (app *App) AuthGetAccessTokenMonitor(qdType string) error {
+	result := app.GetCallBackIp()
+	if len(result.GetCallBackIpResponse.IpList) <= 0 {
+		switch qdType {
+		case qdTypeDb:
+			token := app.AuthGetAccessToken()
+			if token.AuthGetAccessTokenResponse.AccessToken == "" {
+				return errors.New("获取AccessToken失败")
+			} else {
+				app.Db.Create(&WechatAccessTokenDbModel{
+					AppID:       app.AppId,
+					AppSecret:   app.AppSecret,
+					AccessToken: token.AuthGetAccessTokenResponse.AccessToken,
+					ExpiresIn:   token.AuthGetAccessTokenResponse.ExpiresIn,
+					ExpiresTime: gotime.Current().AfterSeconds(7000).Format(),
+				})
+				return nil
+			}
+		case qdTypeRdb:
+			cacheName := fmt.Sprintf("wechat_access_token:%v", app.AppId)
+			redis := goredis.App{
+				Rdb: app.RDb,
+			}
+			token := app.AuthGetAccessToken()
+			if token.AuthGetAccessTokenResponse.AccessToken == "" {
+				return errors.New("获取AccessToken失败")
+			}
+			redis.NewStringOperation().Set(cacheName, token.AuthGetAccessTokenResponse.AccessToken, goredis.WithExpire(7000))
+			return nil
+		default:
+			return errors.New("驱动类型不在范围内")
+		}
+	}
+	return nil
+}

service/wechatoffice/cgi-bin.token.rdb.go

@@ -12,8 +12,8 @@ func (app *App) GetAccessTokenRDb() string {
 	}
 	newCache := redis.NewSimpleStringCache(redis.NewStringOperation(), 7000)
 	newCache.DBGetter = func() string {
-		token, _ := app.AuthGetAccessToken()
-		return token.AccessToken
+		token := app.AuthGetAccessToken()
+		return token.AuthGetAccessTokenResponse.AccessToken
 	}
 	return newCache.GetCache(cacheName)
 }

service/wechatoffice/getcallbackip_test.go

@@ -0,0 +1,13 @@
+package wechatoffice
+
+import (
+	"testing"
+)
+
+func TestApp_GetCallBackIp(t *testing.T) {
+	t.Log(app)
+	result := app.GetCallBackIp()
+	t.Logf("Response：%s", result.GetCallBackIpResponse)
+	t.Logf("Err：%s", result.Err)
+	t.Logf("Byte：%v", result.Byte)
+}

service/wechatoffice/result.go

@@ -2,7 +2,8 @@ package wechatoffice
 
 // Result 接口
 type Result struct {
-	Byte                  []byte // 内容
-	Err                   error  // 错误
-	GetCallBackIpResponse        // IP即微信调用开发者服务器所使用的出口IP
+	Byte                       []byte // 内容
+	Err                        error  // 错误
+	AuthGetAccessTokenResponse        // 接口调用凭证
+	GetCallBackIpResponse             // IP即微信调用开发者服务器所使用的出口IP
 }

service/wechatunion/cgi-bin.token.db.go

@@ -30,18 +30,18 @@ func (app *App) GetAccessTokenDb() string {
 		return wat.AccessToken
 	} else {
 		token := app.AuthGetAccessToken()
-		if token.Result.AccessToken == "" {
+		if token.AuthGetAccessTokenResponse.AccessToken == "" {
 			return ""
 		} else {
 			// 创建
 			app.Db.Create(&WechatAccessTokenDbModel{
 				AppID:       app.AppId,
 				AppSecret:   app.AppSecret,
-				AccessToken: token.Result.AccessToken,
-				ExpiresIn:   token.Result.ExpiresIn,
+				AccessToken: token.AuthGetAccessTokenResponse.AccessToken,
+				ExpiresIn:   token.AuthGetAccessTokenResponse.ExpiresIn,
 				ExpiresTime: gotime.Current().AfterSeconds(7000).Format(),
 			})
-			return token.Result.AccessToken
+			return token.AuthGetAccessTokenResponse.AccessToken
 		}
 	}
 }

service/wechatunion/cgi-bin.token.monitor.go

@@ -0,0 +1,49 @@
+package wechatunion
+
+import (
+	"errors"
+	"fmt"
+	"gopkg.in/dtapps/go-library.v3/utils/goredis"
+	"gopkg.in/dtapps/go-library.v3/utils/gotime"
+)
+
+var (
+	qdTypeDb  = "DB"
+	qdTypeRdb = "redis"
+)
+
+func (app *App) AuthGetAccessTokenMonitor(qdType string) error {
+	result := app.GetCallBackIp()
+	if len(result.GetCallBackIpResponse.IpList) <= 0 {
+		switch qdType {
+		case qdTypeDb:
+			token := app.AuthGetAccessToken()
+			if token.AuthGetAccessTokenResponse.AccessToken == "" {
+				return errors.New("获取AccessToken失败")
+			} else {
+				app.Db.Create(&WechatAccessTokenDbModel{
+					AppID:       app.AppId,
+					AppSecret:   app.AppSecret,
+					AccessToken: token.AuthGetAccessTokenResponse.AccessToken,
+					ExpiresIn:   token.AuthGetAccessTokenResponse.ExpiresIn,
+					ExpiresTime: gotime.Current().AfterSeconds(7000).Format(),
+				})
+				return nil
+			}
+		case qdTypeRdb:
+			cacheName := fmt.Sprintf("wechat_access_token:%v", app.AppId)
+			redis := goredis.App{
+				Rdb: app.RDb,
+			}
+			token := app.AuthGetAccessToken()
+			if token.AuthGetAccessTokenResponse.AccessToken == "" {
+				return errors.New("获取AccessToken失败")
+			}
+			redis.NewStringOperation().Set(cacheName, token.AuthGetAccessTokenResponse.AccessToken, goredis.WithExpire(7000))
+			return nil
+		default:
+			return errors.New("驱动类型不在范围内")
+		}
+	}
+	return nil
+}

service/wechatunion/cgi-bin.token.rdb.go

@@ -13,7 +13,7 @@ func (app *App) GetAccessTokenRDb() string {
 	newCache := redis.NewSimpleStringCache(redis.NewStringOperation(), 7000)
 	newCache.DBGetter = func() string {
 		token := app.AuthGetAccessToken()
-		return token.Result.AccessToken
+		return token.AuthGetAccessTokenResponse.AccessToken
 	}
 	return newCache.GetCache(cacheName)
 }