Skip to content

Commit fc6695a

Browse files
author
Matrix-X
committed
refact(kernel): change *ApplicationInterfade to ApplicationInterface
1 parent dea63aa commit fc6695a

File tree

233 files changed

+367
-366
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

233 files changed

+367
-366
lines changed

‎src/basicService/contentSecurity/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ type Client struct {
88
BaseUri string
99
}
1010

11-
func NewClient(app *kernel.ApplicationInterface) (*Client, error) {
11+
func NewClient(app kernel.ApplicationInterface) (*Client, error) {
1212

1313
baseClient, err := kernel.NewBaseClient(app, nil)
1414
if err != nil {

‎src/basicService/contentSecurity/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ import (
66

77
func RegisterProvider(app kernel.ApplicationInterface) (*Client, error) {
88

9-
return NewClient(&app)
9+
return NewClient(app)
1010

1111
}

‎src/basicService/jssdk/client.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ type Client struct {
2727
GetAppID func() string
2828
}
2929

30-
func NewClient(app *kernel.ApplicationInterface) (*Client, error) {
30+
func NewClient(app kernel.ApplicationInterface) (*Client, error) {
3131

32-
config := (*app).GetContainer().GetConfig()
32+
config := app.GetContainer().GetConfig()
3333

3434
var cacheClient cache.CacheInterface = nil
3535
if (*config)["cache"] != nil {
@@ -179,12 +179,12 @@ func (comp *Client) GetUrl(externalRequest *http.Request) string {
179179

180180
func (comp *Client) OverrideGetAppID() {
181181
comp.GetAppID = func() string {
182-
config := (*comp.BaseClient.App).GetConfig()
182+
config := comp.BaseClient.App.GetConfig()
183183
return config.GetString("app_id", "")
184184
}
185185
}
186186

187187
func (comp *Client) getAgentID() string {
188-
config := (*comp.BaseClient.App).GetConfig()
188+
config := comp.BaseClient.App.GetConfig()
189189
return config.GetString("agent_id", "")
190190
}

‎src/basicService/jssdk/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ import (
66

77
func RegisterProvider(app kernel.ApplicationInterface) (*Client, error) {
88

9-
return NewClient(&app)
9+
return NewClient(app)
1010

1111
}

‎src/basicService/media/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ type Client struct {
1818
}
1919

2020
func NewClient(app kernel.ApplicationInterface) (*Client, error) {
21-
baseClient, err := kernel.NewBaseClient(&app, nil)
21+
baseClient, err := kernel.NewBaseClient(app, nil)
2222
if err != nil {
2323
return nil, err
2424
}

‎src/basicService/qrCode/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ type Client struct {
2323
BaseClient *kernel.BaseClient
2424
}
2525

26-
func NewClient(app *kernel.ApplicationInterface) (*Client, error) {
26+
func NewClient(app kernel.ApplicationInterface) (*Client, error) {
2727
baseClient, err := kernel.NewBaseClient(app, nil)
2828
if err != nil {
2929
return nil, err

‎src/basicService/qrCode/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ import (
66

77
func RegisterProvider(app kernel.ApplicationInterface) (*Client, error) {
88

9-
return NewClient(&app)
9+
return NewClient(app)
1010

1111
}

‎src/basicService/subscribeMessage/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
func RegisterProvider(app kernel.ApplicationInterface) (*Client, error) {
88

9-
baseClient, err := kernel.NewBaseClient(&app, nil)
9+
baseClient, err := kernel.NewBaseClient(app, nil)
1010
if err != nil {
1111
return nil, err
1212
}

‎src/basicService/url/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type Client struct {
1616
BaseUri string
1717
}
1818

19-
func NewClient(app *kernel.ApplicationInterface) (*Client, error) {
19+
func NewClient(app kernel.ApplicationInterface) (*Client, error) {
2020
baseClient, err := kernel.NewBaseClient(app, nil)
2121
if err != nil {
2222
return nil, err

‎src/basicService/url/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ import (
66

77
func RegisterProvider(app kernel.ApplicationInterface) (*Client, error) {
88

9-
return NewClient(&app)
9+
return NewClient(app)
1010

1111
}

‎src/kernel/baseClient.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ type BaseClient struct {
3232

3333
Signer *support.SHA256WithRSASigner
3434

35-
App *ApplicationInterface
35+
App ApplicationInterface
3636
Token *AccessToken
3737

3838
GetMiddlewareOfAccessToken contract.RequestMiddleware
@@ -50,8 +50,8 @@ type UploadContent struct {
5050
Value interface{}
5151
}
5252

53-
func NewBaseClient(app *ApplicationInterface, token *AccessToken) (*BaseClient, error) {
54-
config := (*app).GetConfig()
53+
func NewBaseClient(app ApplicationInterface, token *AccessToken) (*BaseClient, error) {
54+
config := app.GetConfig()
5555
baseURI := config.GetString("http.base_uri", "/")
5656
proxyURI := config.GetString("http.proxy_uri", "")
5757
timeout := config.GetFloat64("http.timeout", 5)
@@ -63,7 +63,7 @@ func NewBaseClient(app *ApplicationInterface, token *AccessToken) (*BaseClient,
6363
}
6464
}
6565
if token == nil {
66-
token = (*app).GetAccessToken()
66+
token = app.GetAccessToken()
6767
}
6868

6969
h, err := helper.NewRequestHelper(&helper.Config{
@@ -85,7 +85,7 @@ func NewBaseClient(app *ApplicationInterface, token *AccessToken) (*BaseClient,
8585
App: app,
8686
Token: token,
8787
}
88-
client.Logger = (*client.App).GetComponent("Logger").(contract2.LoggerInterface)
88+
client.Logger = client.App.GetComponent("Logger").(contract2.LoggerInterface)
8989

9090
// to be setup middleware here
9191
client.OverrideGetMiddlewares()
@@ -213,7 +213,7 @@ func (client *BaseClient) HttpUpload(ctx context.Context, url string, files *obj
213213
}
214214

215215
// set debug mode
216-
config := (*client.App).GetConfig()
216+
config := client.App.GetConfig()
217217
// 微信如果需要传debug模式
218218
debug := config.GetBool("debug", false)
219219
if debug {
@@ -255,7 +255,7 @@ func (client *BaseClient) Request(ctx context.Context, url string, method string
255255
}
256256
}
257257

258-
config := (*client.App).GetConfig()
258+
config := client.App.GetConfig()
259259
// 微信如果需要传debug模式
260260
debug := config.GetBool("debug", false)
261261
if debug {
@@ -330,7 +330,7 @@ func (client *BaseClient) RequestByEncodedData(ctx context.Context, url string,
330330
}
331331
}
332332

333-
config := (*client.App).GetConfig()
333+
config := client.App.GetConfig()
334334
// 微信如果需要传debug模式
335335
debug := config.GetBool("debug", false)
336336
if debug {
@@ -397,7 +397,7 @@ func (client *BaseClient) RegisterHttpMiddlewares() {
397397
// check invalid access token
398398
checkAccessTokenMiddleware := client.GetMiddlewareOfRefreshAccessToken
399399

400-
config := (*client.App).GetConfig()
400+
config := client.App.GetConfig()
401401
client.HttpHelper.WithMiddleware(
402402
accessTokenMiddleware,
403403
logMiddleware(client.Logger),
@@ -420,10 +420,10 @@ func (client *BaseClient) OverrideGetMiddlewareOfAccessToken() {
420420
// 前置中间件
421421
// fmt.Println("获取access token, 在请求前执行")
422422

423-
accessToken := (*client.App).GetAccessToken()
423+
accessToken := client.App.GetAccessToken()
424424

425425
if accessToken != nil {
426-
config := (*client.App).GetContainer().Config
426+
config := client.App.GetContainer().Config
427427
request, err = accessToken.ApplyToRequest(request, config)
428428
}
429429

@@ -448,7 +448,7 @@ func (client *BaseClient) OverrideGetMiddlewareOfLog() {
448448
client.GetMiddlewareOfLog = func(logger contract2.LoggerInterface) contract.RequestMiddleware {
449449
return func(handle contract.RequestHandle) contract.RequestHandle {
450450
return func(request *http.Request) (response *http.Response, err error) {
451-
config := (*client.App).GetConfig()
451+
config := client.App.GetConfig()
452452
defer func() {
453453
debug := config.GetBool("http_debug", false)
454454
if debug {

‎src/kernel/serverGuard.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ type ServerGuard struct {
4545
*support.ResponseCastable
4646

4747
alwaysValidate bool
48-
App *ApplicationInterface
48+
App ApplicationInterface
4949

5050
IsSafeMode func(request *http.Request) bool
5151
Validate func(request *http.Request) (*ServerGuard, error)
@@ -60,7 +60,7 @@ type ServerGuard struct {
6060
HandleEvent func(request *http.Request, closure func(event contract.EventInterface) interface{}) (*object.HashMap, error)
6161
}
6262

63-
func NewServerGuard(app *ApplicationInterface) *ServerGuard {
63+
func NewServerGuard(app ApplicationInterface) *ServerGuard {
6464
serverGuard := &ServerGuard{
6565
Observable: support.NewObservable(),
6666
App: app,
@@ -103,7 +103,7 @@ func (serverGuard *ServerGuard) OverrideNotify() {
103103
// 回调配置
104104
// https://developer.work.weixin.qq.com/document/path/90930
105105
func (serverGuard *ServerGuard) VerifyURL(request *http.Request) (httpRS *http.Response, err error) {
106-
logger := (*serverGuard.App).GetComponent("Logger").(*logger2.Logger)
106+
logger := serverGuard.App.GetComponent("Logger").(*logger2.Logger)
107107

108108
//_, err = serverGuard.Validate(request)
109109
//if err != nil {
@@ -124,7 +124,7 @@ func (serverGuard *ServerGuard) VerifyURL(request *http.Request) (httpRS *http.R
124124

125125
// https://developer.work.weixin.qq.com/document/path/90930
126126
func (serverGuard *ServerGuard) Serve(request *http.Request) (response *http.Response, err error) {
127-
logger := (*serverGuard.App).GetComponent("Logger").(*logger2.Logger)
127+
logger := serverGuard.App.GetComponent("Logger").(*logger2.Logger)
128128
logger.Info("Request received:",
129129
"method", request.Method,
130130
"uri", request.URL,
@@ -290,7 +290,7 @@ func (serverGuard *ServerGuard) OverrideResolve() {
290290

291291
func (serverGuard *ServerGuard) OverrideGetToken() {
292292
serverGuard.GetToken = func() string {
293-
config := (*serverGuard.App).GetConfig()
293+
config := serverGuard.App.GetConfig()
294294
token := config.Get("token", "").(string)
295295

296296
return token
@@ -388,7 +388,7 @@ func (serverGuard *ServerGuard) buildReply(request *http.Request, to string, fro
388388
response = transformedResponse.(string)
389389
if serverGuard.IsSafeMode(request) {
390390
// tbd log here
391-
encryptor := (*serverGuard.App).GetComponent("Encryptor").(*Encryptor)
391+
encryptor := serverGuard.App.GetComponent("Encryptor").(*Encryptor)
392392
encryptedResponse, err := encryptor.Encrypt(response, "", "")
393393
if err == nil {
394394
response = string(encryptedResponse)
@@ -483,7 +483,7 @@ func (serverGuard *ServerGuard) shouldReturnRawResponse(request *http.Request) b
483483
}
484484

485485
func (serverGuard *ServerGuard) DecryptEvent(request *http.Request, content string) (callbackHeader *models.CallbackMessageHeader, err error) {
486-
encryptor := (*serverGuard.App).GetComponent("Encryptor").(*Encryptor)
486+
encryptor := serverGuard.App.GetComponent("Encryptor").(*Encryptor)
487487
query := request.URL.Query()
488488
buf, cryptErr := encryptor.Decrypt(
489489
[]byte(content),
@@ -511,7 +511,7 @@ func (serverGuard *ServerGuard) DecryptEvent(request *http.Request, content stri
511511
}
512512

513513
func (serverGuard *ServerGuard) decryptEchoStr(request *http.Request, content string) (decryptMessage string, err error) {
514-
encryptor := (*serverGuard.App).GetComponent("Encryptor").(*Encryptor)
514+
encryptor := serverGuard.App.GetComponent("Encryptor").(*Encryptor)
515515
query := request.URL.Query()
516516
buf, cryptErr := encryptor.VerifyUrl(
517517
content,
@@ -527,7 +527,7 @@ func (serverGuard *ServerGuard) decryptEchoStr(request *http.Request, content st
527527
}
528528

529529
func (serverGuard *ServerGuard) decryptMessage(request *http.Request, content string) (callbackHeader *models.CallbackMessageHeader, decryptMessage interface{}, err error) {
530-
encryptor := (*serverGuard.App).GetComponent("Encryptor").(*Encryptor)
530+
encryptor := serverGuard.App.GetComponent("Encryptor").(*Encryptor)
531531
query := request.URL.Query()
532532
buf, cryptErr := encryptor.Decrypt(
533533
[]byte(content),

‎src/miniProgram/auth/client.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ type Client struct {
1414
BaseClient *kernel.BaseClient
1515
}
1616

17-
func NewClient(app *kernel.ApplicationInterface) (*Client, error) {
17+
func NewClient(app kernel.ApplicationInterface) (*Client, error) {
1818
baseClient, err := kernel.NewBaseClient(app, nil)
1919
if err != nil {
2020
return nil, err
@@ -30,7 +30,7 @@ func (comp *Client) Session(ctx context.Context, code string) (*response.Respons
3030

3131
result := &response.ResponseCode2Session{}
3232

33-
config := (*comp.BaseClient.App).GetConfig()
33+
config := comp.BaseClient.App.GetConfig()
3434

3535
params := &object.StringMap{
3636
"appid": config.GetString("app_id", ""),
@@ -50,7 +50,7 @@ func (comp *Client) CheckSession(ctx context.Context, openId string, sessionKey
5050

5151
result := &response.ResponseCode2Session{}
5252

53-
config := (*comp.BaseClient.App).GetConfig()
53+
config := comp.BaseClient.App.GetConfig()
5454

5555
sign, err := support.SignSHA256WithHMac([]byte(sessionKey), "")
5656
if err != nil {
@@ -74,7 +74,7 @@ func (comp *Client) ResetUserSessionKey(ctx context.Context, openId string, sess
7474

7575
result := &response2.ResponseMiniProgram{}
7676

77-
config := (*comp.BaseClient.App).GetConfig()
77+
config := comp.BaseClient.App.GetConfig()
7878

7979
sign, err := support.SignSHA256WithHMac([]byte(sessionKey), "")
8080
if err != nil {

‎src/miniProgram/auth/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ func RegisterProvider(app kernel.ApplicationInterface) (*AccessToken, error) {
1212

1313
func RegisterAuthProvider(app kernel.ApplicationInterface) (*Client, error) {
1414

15-
return NewClient(&app)
15+
return NewClient(app)
1616
}

‎src/miniProgram/b2b/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
)
66

77
func RegisterProvider(app kernel.ApplicationInterface) (*Client, error) {
8-
baseClient, err := kernel.NewBaseClient(&app, nil)
8+
baseClient, err := kernel.NewBaseClient(app, nil)
99
config := app.GetConfig()
1010
appKey := config.GetString("app_key", "")
1111
sandboxAppKey := config.GetString("sandbox_app_key", "")

‎src/miniProgram/base/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
)
66

77
func RegisterProvider(app kernel.ApplicationInterface) (*Client, error) {
8-
baseClient, err := kernel.NewBaseClient(&app, nil)
8+
baseClient, err := kernel.NewBaseClient(app, nil)
99
if err != nil {
1010
return nil, err
1111
}

‎src/miniProgram/customerServiceMessage/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
)
66

77
func RegisterProvider(app kernel.ApplicationInterface) (*Client, error) {
8-
baseClient, err := kernel.NewBaseClient(&app, nil)
8+
baseClient, err := kernel.NewBaseClient(app, nil)
99
if err != nil {
1010
return nil, err
1111
}

‎src/miniProgram/dataCube/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
func RegisterProvider(app kernel.ApplicationInterface) (*Client, error) {
88

9-
baseClient, err := kernel.NewBaseClient(&app, nil)
9+
baseClient, err := kernel.NewBaseClient(app, nil)
1010
if err != nil {
1111
return nil, err
1212
}

‎src/miniProgram/express/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
)
66

77
func RegisterProvider(app kernel.ApplicationInterface) (*Client, error) {
8-
baseClient, err := kernel.NewBaseClient(&app, nil)
8+
baseClient, err := kernel.NewBaseClient(app, nil)
99
if err != nil {
1010
return nil, err
1111
}

‎src/miniProgram/image/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
func RegisterProvider(app kernel.ApplicationInterface) (*Client, error) {
88

9-
baseClient, err := kernel.NewBaseClient(&app, nil)
9+
baseClient, err := kernel.NewBaseClient(app, nil)
1010
if err != nil {
1111
return nil, err
1212
}

‎src/miniProgram/immediateDelivery/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
)
66

77
func RegisterProvider(app kernel.ApplicationInterface) (*Client, error) {
8-
baseClient, err := kernel.NewBaseClient(&app, nil)
8+
baseClient, err := kernel.NewBaseClient(app, nil)
99
if err != nil {
1010
return nil, err
1111
}

‎src/miniProgram/industry/miniDrama/vod/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package vod
33
import "github.com/ArtisanCloud/PowerWeChat/v3/src/kernel"
44

55
func RegisterProvider(app kernel.ApplicationInterface) (*Client, error) {
6-
baseClient, err := kernel.NewBaseClient(&app, nil)
6+
baseClient, err := kernel.NewBaseClient(app, nil)
77
if err != nil {
88
return nil, err
99
}

0 commit comments

Comments
 (0)