From 46cb0a53e29b5ea0dda74562f088ba066a3ea50e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= Date: Thu, 30 Dec 2021 17:14:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BE=AE=E4=BF=A1=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cgi-bin.token.monitor.go | 42 +++++++++++-------- service/wechatoffice/cgi-bin.token.monitor.go | 42 +++++++++++-------- service/wechatoffice/getticket.monitor.go | 18 +++++--- service/wechatunion/cgi-bin.token.monitor.go | 42 +++++++++++-------- 4 files changed, 84 insertions(+), 60 deletions(-) diff --git a/service/wechatminiprogram/cgi-bin.token.monitor.go b/service/wechatminiprogram/cgi-bin.token.monitor.go index df760460..7643ac3b 100644 --- a/service/wechatminiprogram/cgi-bin.token.monitor.go +++ b/service/wechatminiprogram/cgi-bin.token.monitor.go @@ -9,24 +9,30 @@ var ( QdTypeRdb = "redis" ) -func (app *App) AuthGetAccessTokenMonitor(qdType string) error { - result := app.GetCallBackIp() - if len(result.Result.IpList) <= 0 { - switch qdType { - case QdTypeDb: - if app.Db == nil { - return errors.New("驱动没有初始化") - } - app.GetAccessTokenDb() - case QdTypeRdb: - if app.RDb == nil { - return errors.New("驱动没有初始化") - } - app.GetAccessTokenRDb() - return nil - default: - return errors.New("驱动类型不在范围内") +func (app *App) AuthGetAccessTokenMonitor(qdType string) (string, error) { + switch qdType { + case QdTypeDb: + if app.Db == nil { + return "", errors.New("驱动没有初始化") } + app.AccessToken = app.GetAccessTokenDb() + result := app.GetCallBackIp() + if len(result.Result.IpList) <= 0 { + return app.GetAccessTokenDb(), nil + } + return app.AccessToken, nil + case QdTypeRdb: + if app.RDb == nil { + return "", errors.New("驱动没有初始化") + } + app.AccessToken = app.GetAccessTokenRDb() + result := app.GetCallBackIp() + if len(result.Result.IpList) <= 0 { + return app.GetAccessTokenRDb(), nil + } + return app.AccessToken, nil + default: + return "", errors.New("驱动类型不在范围内") } - return nil + return "", nil } diff --git a/service/wechatoffice/cgi-bin.token.monitor.go b/service/wechatoffice/cgi-bin.token.monitor.go index bf60c7bf..6520bcff 100644 --- a/service/wechatoffice/cgi-bin.token.monitor.go +++ b/service/wechatoffice/cgi-bin.token.monitor.go @@ -9,24 +9,30 @@ var ( QdTypeRdb = "redis" ) -func (app *App) AuthGetAccessTokenMonitor(qdType string) error { - result := app.GetCallBackIp() - if len(result.Result.IpList) <= 0 { - switch qdType { - case QdTypeDb: - if app.Db == nil { - return errors.New("驱动没有初始化") - } - app.GetAccessTokenDb() - case QdTypeRdb: - if app.RDb == nil { - return errors.New("驱动没有初始化") - } - app.GetAccessTokenRDb() - return nil - default: - return errors.New("驱动类型不在范围内") +func (app *App) AuthGetAccessTokenMonitor(qdType string) (string, error) { + switch qdType { + case QdTypeDb: + if app.Db == nil { + return "", errors.New("驱动没有初始化") } + app.AccessToken = app.GetAccessTokenDb() + result := app.GetCallBackIp() + if len(result.Result.IpList) <= 0 { + return app.GetAccessTokenDb(), nil + } + return app.AccessToken, nil + case QdTypeRdb: + if app.RDb == nil { + return "", errors.New("驱动没有初始化") + } + app.AccessToken = app.GetAccessTokenRDb() + result := app.GetCallBackIp() + if len(result.Result.IpList) <= 0 { + return app.GetAccessTokenRDb(), nil + } + return app.AccessToken, nil + default: + return "", errors.New("驱动类型不在范围内") } - return nil + return "", nil } diff --git a/service/wechatoffice/getticket.monitor.go b/service/wechatoffice/getticket.monitor.go index bb99c1c0..57acf665 100644 --- a/service/wechatoffice/getticket.monitor.go +++ b/service/wechatoffice/getticket.monitor.go @@ -3,15 +3,21 @@ package wechatoffice import "errors" // AuthGetJsapiTicketMonitor 监控api_ticket -func (app *App) AuthGetJsapiTicketMonitor(qdType string) error { +func (app *App) AuthGetJsapiTicketMonitor(qdType string) (string, error) { switch qdType { case QdTypeDb: - app.GetJsapiTicketDb() - return nil + if app.Db == nil { + return "", errors.New("驱动没有初始化") + } + app.AccessToken = app.GetAccessTokenDb() + return app.GetJsapiTicketDb(), nil case QdTypeRdb: - app.GetJsapiTicketRDb() - return nil + if app.RDb == nil { + return "", errors.New("驱动没有初始化") + } + app.AccessToken = app.GetAccessTokenRDb() + return app.GetJsapiTicketRDb(), nil default: - return errors.New("驱动类型不在范围内") + return "", errors.New("驱动类型不在范围内") } } diff --git a/service/wechatunion/cgi-bin.token.monitor.go b/service/wechatunion/cgi-bin.token.monitor.go index 22b557db..4ee435e4 100644 --- a/service/wechatunion/cgi-bin.token.monitor.go +++ b/service/wechatunion/cgi-bin.token.monitor.go @@ -9,24 +9,30 @@ var ( QdTypeRdb = "redis" ) -func (app *App) AuthGetAccessTokenMonitor(qdType string) error { - result := app.GetCallBackIp() - if len(result.Result.IpList) <= 0 { - switch qdType { - case QdTypeDb: - if app.Db == nil { - return errors.New("驱动没有初始化") - } - app.GetAccessTokenDb() - case QdTypeRdb: - if app.RDb == nil { - return errors.New("驱动没有初始化") - } - app.GetAccessTokenRDb() - return nil - default: - return errors.New("驱动类型不在范围内") +func (app *App) AuthGetAccessTokenMonitor(qdType string) (string, error) { + switch qdType { + case QdTypeDb: + if app.Db == nil { + return "", errors.New("驱动没有初始化") } + app.AccessToken = app.GetAccessTokenDb() + result := app.GetCallBackIp() + if len(result.Result.IpList) <= 0 { + return app.GetAccessTokenDb(), nil + } + return app.AccessToken, nil + case QdTypeRdb: + if app.RDb == nil { + return "", errors.New("驱动没有初始化") + } + app.AccessToken = app.GetAccessTokenRDb() + result := app.GetCallBackIp() + if len(result.Result.IpList) <= 0 { + return app.GetAccessTokenRDb(), nil + } + return app.AccessToken, nil + default: + return "", errors.New("驱动类型不在范围内") } - return nil + return "", nil }