From 4f873277993bb29b65bc07d89003b950b99ca4a8 Mon Sep 17 00:00:00 2001 From: Matrix-X Date: Sat, 14 Sep 2024 21:59:36 +0800 Subject: [PATCH] refatct(kernal): change *kernel.ApplicationInterface to kernel.ApplicationInterface; fix wecom miniprogram GetComponent with logger --- src/kernel/accessToken.go | 10 +++++----- src/miniProgram/auth/accessToken.go | 4 ++-- src/miniProgram/auth/provider.go | 2 +- src/officialAccount/auth/accessToken.go | 4 ++-- src/officialAccount/auth/provider.go | 2 +- src/openPlatform/auth/accessToken.go | 6 +++--- src/openPlatform/auth/provider.go | 2 +- src/openPlatform/authorizer/auth/accessToken.go | 4 ++-- src/work/auth/accessToken.go | 4 ++-- src/work/miniProgram/application.go | 3 +++ 10 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/kernel/accessToken.go b/src/kernel/accessToken.go index 67ed541d..afc20731 100644 --- a/src/kernel/accessToken.go +++ b/src/kernel/accessToken.go @@ -20,7 +20,7 @@ import ( ) type AccessToken struct { - App *ApplicationInterface + App ApplicationInterface HttpHelper *helper.RequestHelper @@ -43,8 +43,8 @@ type AccessToken struct { GetMiddlewareOfLog func(logger contract2.LoggerInterface) contract3.RequestMiddleware } -func NewAccessToken(app *ApplicationInterface) (*AccessToken, error) { - config := (*app).GetConfig() +func NewAccessToken(app ApplicationInterface) (*AccessToken, error) { + config := (app).GetConfig() baseURI := config.GetString("http.base_uri", "/") var cacheClient cache.CacheInterface = nil @@ -340,8 +340,8 @@ func (accessToken *AccessToken) RegisterHttpMiddlewares() { // log logMiddleware := accessToken.GetMiddlewareOfLog - config := (*accessToken.App).GetConfig() - logger := (*accessToken.App).GetComponent("Logger").(contract2.LoggerInterface) + config := (accessToken.App).GetConfig() + logger := (accessToken.App).GetComponent("Logger").(contract2.LoggerInterface) accessToken.HttpHelper.WithMiddleware( logMiddleware(logger), helper.HttpDebugMiddleware(config.GetBool("http_debug", false)), diff --git a/src/miniProgram/auth/accessToken.go b/src/miniProgram/auth/accessToken.go index eac59e2a..ff30a1f3 100644 --- a/src/miniProgram/auth/accessToken.go +++ b/src/miniProgram/auth/accessToken.go @@ -11,7 +11,7 @@ type AccessToken struct { *kernel.AccessToken } -func NewAccessToken(app *kernel.ApplicationInterface) (*AccessToken, error) { +func NewAccessToken(app kernel.ApplicationInterface) (*AccessToken, error) { kernelToken, err := kernel.NewAccessToken(app) token := &AccessToken{ kernelToken, @@ -26,7 +26,7 @@ func NewAccessToken(app *kernel.ApplicationInterface) (*AccessToken, error) { // Override GetCredentials func (accessToken *AccessToken) OverrideGetCredentials() { - config := (*accessToken.App).GetConfig() + config := (accessToken.App).GetConfig() accessToken.GetCredentials = func() *object.StringMap { return &object.StringMap{ diff --git a/src/miniProgram/auth/provider.go b/src/miniProgram/auth/provider.go index 8e8a1979..f2570653 100644 --- a/src/miniProgram/auth/provider.go +++ b/src/miniProgram/auth/provider.go @@ -6,7 +6,7 @@ import ( func RegisterProvider(app kernel.ApplicationInterface) (*AccessToken, error) { - return NewAccessToken(&app) + return NewAccessToken(app) } diff --git a/src/officialAccount/auth/accessToken.go b/src/officialAccount/auth/accessToken.go index 6466390f..b568514a 100644 --- a/src/officialAccount/auth/accessToken.go +++ b/src/officialAccount/auth/accessToken.go @@ -12,7 +12,7 @@ type AccessToken struct { } // https://developers.weixin.qq.com/doc/offiaccount/Basic_Information/Get_access_token.html -func NewAccessToken(app *kernel.ApplicationInterface) (*AccessToken, error) { +func NewAccessToken(app kernel.ApplicationInterface) (*AccessToken, error) { kernelToken, err := kernel.NewAccessToken(app) if err != nil { return nil, err @@ -30,7 +30,7 @@ func NewAccessToken(app *kernel.ApplicationInterface) (*AccessToken, error) { // Override GetCredentials func (accessToken *AccessToken) OverrideGetCredentials() { - config := (*accessToken.App).GetContainer().GetConfig() + config := (accessToken.App).GetContainer().GetConfig() accessToken.GetCredentials = func() *object.StringMap { return &object.StringMap{ "grant_type": "client_credential", diff --git a/src/officialAccount/auth/provider.go b/src/officialAccount/auth/provider.go index c1802375..c8be6d58 100644 --- a/src/officialAccount/auth/provider.go +++ b/src/officialAccount/auth/provider.go @@ -6,6 +6,6 @@ import ( func RegisterProvider(app kernel.ApplicationInterface) (*AccessToken, error) { - return NewAccessToken(&app) + return NewAccessToken(app) } diff --git a/src/openPlatform/auth/accessToken.go b/src/openPlatform/auth/accessToken.go index f5ef07e9..70ddebba 100644 --- a/src/openPlatform/auth/accessToken.go +++ b/src/openPlatform/auth/accessToken.go @@ -13,7 +13,7 @@ type AccessToken struct { } // https://developers.weixin.qq.com/doc/oplatform/Third-party_Platforms/2.0/api/ThirdParty/token/component_access_token.html -func NewAccessToken(app *kernel.ApplicationInterface) (*AccessToken, error) { +func NewAccessToken(app kernel.ApplicationInterface) (*AccessToken, error) { kernelToken, err := kernel.NewAccessToken(app) kernelToken.RequestMethod = http.MethodPost @@ -37,8 +37,8 @@ func NewAccessToken(app *kernel.ApplicationInterface) (*AccessToken, error) { func (accessToken *AccessToken) OverrideGetCredentials() { accessToken.GetCredentials = func() *object.StringMap { - config := (*accessToken.App).GetContainer().GetConfig() - verifyTicket := (*accessToken.App).GetComponent("VerifyTicket").(*VerifyTicket) + config := (accessToken.App).GetContainer().GetConfig() + verifyTicket := (accessToken.App).GetComponent("VerifyTicket").(*VerifyTicket) ticket, _ := verifyTicket.GetTicket() return &object.StringMap{ diff --git a/src/openPlatform/auth/provider.go b/src/openPlatform/auth/provider.go index cf641b44..239ff19a 100644 --- a/src/openPlatform/auth/provider.go +++ b/src/openPlatform/auth/provider.go @@ -7,7 +7,7 @@ import ( func RegisterProvider(app kernel.ApplicationInterface) (*VerifyTicket, *AccessToken, error) { ticket, err := NewVerifyTicket(&app) - accessToken, err := NewAccessToken(&app) + accessToken, err := NewAccessToken(app) return ticket, accessToken, err diff --git a/src/openPlatform/authorizer/auth/accessToken.go b/src/openPlatform/authorizer/auth/accessToken.go index 071c3acb..3a744071 100644 --- a/src/openPlatform/authorizer/auth/accessToken.go +++ b/src/openPlatform/authorizer/auth/accessToken.go @@ -19,7 +19,7 @@ type AccessToken struct { // https://developers.weixin.qq.com/doc/offiaccount/Basic_Information/Get_access_token.html func NewAccessToken(app kernel.ApplicationInterface, component kernel.ApplicationInterface) (*AccessToken, error) { - kernelToken, err := kernel.NewAccessToken(&app) + kernelToken, err := kernel.NewAccessToken(app) kernelToken.RequestMethod = http.MethodPost kernelToken.QueryName = "access_token" @@ -46,7 +46,7 @@ func (accessToken *AccessToken) OverrideGetCredentials() { accessToken.GetCredentials = func() *object.StringMap { - config := (*accessToken.App).GetContainer().GetConfig() + config := (accessToken.App).GetContainer().GetConfig() componentConfig := accessToken.Component.GetContainer().GetConfig() return &object.StringMap{ "component_appid": (*componentConfig)["app_id"].(string), diff --git a/src/work/auth/accessToken.go b/src/work/auth/accessToken.go index 86296618..399a2af0 100644 --- a/src/work/auth/accessToken.go +++ b/src/work/auth/accessToken.go @@ -13,7 +13,7 @@ type AccessToken struct { // https://developer.work.weixin.qq.com/document/path/91039 func NewAccessToken(app kernel.ApplicationInterface) (*AccessToken, error) { - kernelToken, err := kernel.NewAccessToken(&app) + kernelToken, err := kernel.NewAccessToken(app) if err != nil { return nil, err } @@ -30,7 +30,7 @@ func NewAccessToken(app kernel.ApplicationInterface) (*AccessToken, error) { // Override GetCredentials func (accessToken *AccessToken) OverrideGetCredentials() { - config := (*accessToken.App).GetConfig() + config := (accessToken.App).GetConfig() corpID := config.GetString("corp_id", "") secret := config.GetString("secret", "") accessToken.GetCredentials = func() *object.StringMap { diff --git a/src/work/miniProgram/application.go b/src/work/miniProgram/application.go index c8ed208b..83439e20 100644 --- a/src/work/miniProgram/application.go +++ b/src/work/miniProgram/application.go @@ -10,6 +10,7 @@ import ( ) type Application struct { + kernel.ApplicationInterface *miniProgram.MiniProgram AccessToken *auth.AccessToken @@ -86,6 +87,8 @@ func (app *Application) GetComponent(name string) interface{} { return app.Auth case "Config": return app.Config + case "Logger": + return app.Logger default: return nil