update service wechat

master
李光春 2 years ago
parent ea77d83b1b
commit 6931102716

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

@ -5,7 +5,6 @@ import (
"fmt"
)
// AuthGetAccessTokenResponse 返回参数
type AuthGetAccessTokenResponse struct {
AccessToken string `json:"access_token"` // 获取到的凭证
ExpiresIn int `json:"expires_in"` // 凭证有效时间单位秒。目前是7200秒之内的值
@ -13,19 +12,20 @@ type AuthGetAccessTokenResponse struct {
Errmsg string `json:"errmsg"` // 错误信息
}
// NewAuthGetAccessTokenResult 构造函数
func NewAuthGetAccessTokenResult(result AuthGetAccessTokenResponse, byte []byte, err error) *Result {
return &Result{
AuthGetAccessTokenResponse: result,
Byte: byte,
Err: err,
}
type AuthGetAccessTokenResult struct {
Result AuthGetAccessTokenResponse // 结果
Byte []byte // 内容
Err error // 错误
}
func NewAuthGetAccessTokenResult(result AuthGetAccessTokenResponse, byte []byte, err error) *AuthGetAccessTokenResult {
return &AuthGetAccessTokenResult{Result: 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 {
func (app *App) AuthGetAccessToken() *AuthGetAccessTokenResult {
// 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")
// 定义

@ -14,21 +14,21 @@ var (
func (app *App) AuthGetAccessTokenMonitor(qdType string) error {
result := app.GetCallBackIp()
if len(result.GetCallBackIpResponse.IpList) <= 0 {
if len(result.Result.IpList) <= 0 {
switch qdType {
case qdTypeDb:
if app.Db == nil {
return errors.New("驱动没有初始化")
}
token := app.AuthGetAccessToken()
if token.AuthGetAccessTokenResponse.AccessToken == "" {
if token.Result.AccessToken == "" {
return errors.New("获取AccessToken失败")
} else {
app.Db.Create(&WechatAccessTokenDbModel{
AppID: app.AppId,
AppSecret: app.AppSecret,
AccessToken: token.AuthGetAccessTokenResponse.AccessToken,
ExpiresIn: token.AuthGetAccessTokenResponse.ExpiresIn,
AccessToken: token.Result.AccessToken,
ExpiresIn: token.Result.ExpiresIn,
ExpiresTime: gotime.Current().AfterSeconds(7000).Format(),
})
return nil
@ -42,10 +42,10 @@ func (app *App) AuthGetAccessTokenMonitor(qdType string) error {
Rdb: app.RDb,
}
token := app.AuthGetAccessToken()
if token.AuthGetAccessTokenResponse.AccessToken == "" {
if token.Result.AccessToken == "" {
return errors.New("获取AccessToken失败")
}
redis.NewStringOperation().Set(cacheName, token.AuthGetAccessTokenResponse.AccessToken, goredis.WithExpire(7000))
redis.NewStringOperation().Set(cacheName, token.Result.AccessToken, goredis.WithExpire(7000))
return nil
default:
return errors.New("驱动类型不在范围内")

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

@ -5,24 +5,24 @@ import (
"fmt"
)
// GetCallBackIpResponse 返回参数
type GetCallBackIpResponse struct {
IpList []string `json:"ip_list"`
}
// NewGetCallBackIpResult 构造函数
func NewGetCallBackIpResult(result GetCallBackIpResponse, byte []byte, err error) *Result {
return &Result{
GetCallBackIpResponse: result,
Byte: byte,
Err: err,
}
type GetCallBackIpResult struct {
Result GetCallBackIpResponse // 结果
Byte []byte // 内容
Err error // 错误
}
func NewGetCallBackIpResult(result GetCallBackIpResponse, byte []byte, err error) *GetCallBackIpResult {
return &GetCallBackIpResult{Result: result, Byte: byte, Err: err}
}
// GetCallBackIp 获取微信callback IP地址
// callback IP即微信调用开发者服务器所使用的出口IP。
// https://developers.weixin.qq.com/doc/offiaccount/Basic_Information/Get_the_WeChat_server_IP_address.html#2.%20%E8%8E%B7%E5%8F%96%E5%BE%AE%E4%BF%A1callback%20IP%E5%9C%B0%E5%9D%80
func (app *App) GetCallBackIp() *Result {
func (app *App) GetCallBackIp() *GetCallBackIpResult {
// 请求
body, err := app.request(fmt.Sprintf("https://api.weixin.qq.com/cgi-bin/getcallbackip?access_token=%s", app.AccessToken), map[string]interface{}{}, "GET")
// 定义

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

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

@ -5,7 +5,6 @@ import (
"fmt"
)
// AuthGetAccessTokenResponse 返回参数
type AuthGetAccessTokenResponse struct {
AccessToken string `json:"access_token"` // 获取到的凭证
ExpiresIn int `json:"expires_in"` // 凭证有效时间单位秒。目前是7200秒之内的值
@ -13,19 +12,20 @@ type AuthGetAccessTokenResponse struct {
Errmsg string `json:"errmsg"` // 错误信息
}
// NewAuthGetAccessTokenResult 构造函数
func NewAuthGetAccessTokenResult(result AuthGetAccessTokenResponse, byte []byte, err error) *Result {
return &Result{
AuthGetAccessTokenResponse: result,
Byte: byte,
Err: err,
}
type AuthGetAccessTokenResult struct {
Result AuthGetAccessTokenResponse // 结果
Byte []byte // 内容
Err error // 错误
}
func NewAuthGetAccessTokenResult(result AuthGetAccessTokenResponse, byte []byte, err error) *AuthGetAccessTokenResult {
return &AuthGetAccessTokenResult{Result: 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 {
func (app *App) AuthGetAccessToken() *AuthGetAccessTokenResult {
// 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")
// 定义

@ -14,21 +14,21 @@ var (
func (app *App) AuthGetAccessTokenMonitor(qdType string) error {
result := app.GetCallBackIp()
if len(result.GetCallBackIpResponse.IpList) <= 0 {
if len(result.Result.IpList) <= 0 {
switch qdType {
case qdTypeDb:
if app.Db == nil {
return errors.New("驱动没有初始化")
}
token := app.AuthGetAccessToken()
if token.AuthGetAccessTokenResponse.AccessToken == "" {
if token.Result.AccessToken == "" {
return errors.New("获取AccessToken失败")
} else {
app.Db.Create(&WechatAccessTokenDbModel{
AppID: app.AppId,
AppSecret: app.AppSecret,
AccessToken: token.AuthGetAccessTokenResponse.AccessToken,
ExpiresIn: token.AuthGetAccessTokenResponse.ExpiresIn,
AccessToken: token.Result.AccessToken,
ExpiresIn: token.Result.ExpiresIn,
ExpiresTime: gotime.Current().AfterSeconds(7000).Format(),
})
return nil
@ -42,10 +42,10 @@ func (app *App) AuthGetAccessTokenMonitor(qdType string) error {
Rdb: app.RDb,
}
token := app.AuthGetAccessToken()
if token.AuthGetAccessTokenResponse.AccessToken == "" {
if token.Result.AccessToken == "" {
return errors.New("获取AccessToken失败")
}
redis.NewStringOperation().Set(cacheName, token.AuthGetAccessTokenResponse.AccessToken, goredis.WithExpire(7000))
redis.NewStringOperation().Set(cacheName, token.Result.AccessToken, goredis.WithExpire(7000))
return nil
default:
return errors.New("驱动类型不在范围内")

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

@ -5,24 +5,24 @@ import (
"fmt"
)
// GetCallBackIpResponse 返回参数
type GetCallBackIpResponse struct {
IpList []string `json:"ip_list"`
}
// NewGetCallBackIpResult 构造函数
func NewGetCallBackIpResult(result GetCallBackIpResponse, byte []byte, err error) *Result {
return &Result{
GetCallBackIpResponse: result,
Byte: byte,
Err: err,
}
type GetCallBackIpResult struct {
Result GetCallBackIpResponse // 结果
Byte []byte // 内容
Err error // 错误
}
func NewGetCallBackIpResult(result GetCallBackIpResponse, byte []byte, err error) *GetCallBackIpResult {
return &GetCallBackIpResult{Result: result, Byte: byte, Err: err}
}
// GetCallBackIp 获取微信callback IP地址
// callback IP即微信调用开发者服务器所使用的出口IP。
// https://developers.weixin.qq.com/doc/offiaccount/Basic_Information/Get_the_WeChat_server_IP_address.html#2.%20%E8%8E%B7%E5%8F%96%E5%BE%AE%E4%BF%A1callback%20IP%E5%9C%B0%E5%9D%80
func (app *App) GetCallBackIp() *Result {
func (app *App) GetCallBackIp() *GetCallBackIpResult {
// 请求
body, err := app.request(fmt.Sprintf("https://api.weixin.qq.com/cgi-bin/getcallbackip?access_token=%s", app.AccessToken), map[string]interface{}{}, "GET")
// 定义

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

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

@ -14,21 +14,21 @@ var (
func (app *App) AuthGetAccessTokenMonitor(qdType string) error {
result := app.GetCallBackIp()
if len(result.GetCallBackIpResponse.IpList) <= 0 {
if len(result.Result.IpList) <= 0 {
switch qdType {
case qdTypeDb:
if app.Db == nil {
return errors.New("驱动没有初始化")
}
token := app.AuthGetAccessToken()
if token.AuthGetAccessTokenResponse.AccessToken == "" {
if token.Result.AccessToken == "" {
return errors.New("获取AccessToken失败")
} else {
app.Db.Create(&WechatAccessTokenDbModel{
AppID: app.AppId,
AppSecret: app.AppSecret,
AccessToken: token.AuthGetAccessTokenResponse.AccessToken,
ExpiresIn: token.AuthGetAccessTokenResponse.ExpiresIn,
AccessToken: token.Result.AccessToken,
ExpiresIn: token.Result.ExpiresIn,
ExpiresTime: gotime.Current().AfterSeconds(7000).Format(),
})
return nil
@ -42,10 +42,10 @@ func (app *App) AuthGetAccessTokenMonitor(qdType string) error {
Rdb: app.RDb,
}
token := app.AuthGetAccessToken()
if token.AuthGetAccessTokenResponse.AccessToken == "" {
if token.Result.AccessToken == "" {
return errors.New("获取AccessToken失败")
}
redis.NewStringOperation().Set(cacheName, token.AuthGetAccessTokenResponse.AccessToken, goredis.WithExpire(7000))
redis.NewStringOperation().Set(cacheName, token.Result.AccessToken, goredis.WithExpire(7000))
return nil
default:
return errors.New("驱动类型不在范围内")

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

@ -6,7 +6,6 @@ import (
"net/http"
)
// AuthGetAccessTokenResponse 返回参数
type AuthGetAccessTokenResponse struct {
AccessToken string `json:"access_token"` // 获取到的凭证
ExpiresIn int `json:"expires_in"` // 凭证有效时间单位秒。目前是7200秒之内的值
@ -14,19 +13,20 @@ type AuthGetAccessTokenResponse struct {
Errmsg string `json:"errmsg"` // 错误信息
}
// NewAuthGetAccessTokenResult 构造函数
func NewAuthGetAccessTokenResult(result AuthGetAccessTokenResponse, byte []byte, err error) *Result {
return &Result{
AuthGetAccessTokenResponse: result,
Byte: byte,
Err: err,
}
type AuthGetAccessTokenResult struct {
Result AuthGetAccessTokenResponse // 结果
Byte []byte // 内容
Err error // 错误
}
func NewAuthGetAccessTokenResult(result AuthGetAccessTokenResponse, byte []byte, err error) *AuthGetAccessTokenResult {
return &AuthGetAccessTokenResult{Result: 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 {
func (app *App) AuthGetAccessToken() *AuthGetAccessTokenResult {
// 请求
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{}{}, http.MethodGet)
// 定义

@ -5,24 +5,24 @@ import (
"fmt"
)
// GetCallBackIpResponse 返回参数
type GetCallBackIpResponse struct {
IpList []string `json:"ip_list"`
}
// NewGetCallBackIpResult 构造函数
func NewGetCallBackIpResult(result GetCallBackIpResponse, byte []byte, err error) *Result {
return &Result{
GetCallBackIpResponse: result,
Byte: byte,
Err: err,
}
type GetCallBackIpResult struct {
Result GetCallBackIpResponse // 结果
Byte []byte // 内容
Err error // 错误
}
func NewGetCallBackIpResult(result GetCallBackIpResponse, byte []byte, err error) *GetCallBackIpResult {
return &GetCallBackIpResult{Result: result, Byte: byte, Err: err}
}
// GetCallBackIp 获取微信callback IP地址
// callback IP即微信调用开发者服务器所使用的出口IP。
// https://developers.weixin.qq.com/doc/offiaccount/Basic_Information/Get_the_WeChat_server_IP_address.html#2.%20%E8%8E%B7%E5%8F%96%E5%BE%AE%E4%BF%A1callback%20IP%E5%9C%B0%E5%9D%80
func (app *App) GetCallBackIp() *Result {
func (app *App) GetCallBackIp() *GetCallBackIpResult {
// 请求
body, err := app.request(fmt.Sprintf("https://api.weixin.qq.com/cgi-bin/getcallbackip?access_token=%s", app.AccessToken), map[string]interface{}{}, "GET")
// 定义

@ -1,9 +0,0 @@
package wechatunion
// Result 接口
type Result struct {
Byte []byte // 内容
Err error // 错误
AuthGetAccessTokenResponse // 接口调用凭证
GetCallBackIpResponse // IP即微信调用开发者服务器所使用的出口IP
}
Loading…
Cancel
Save