Merge pull request #109 from ArtisanCloud/develop

feature:

- refact(base): refact base client new with error

Author: Matrix-X

go.mod

@@ -2,13 +2,12 @@ module github.com/ArtisanCloud/PowerWeChat/v2
 
 go 1.17
 
-//replace github.com/ArtisanCloud/PowerLibs/ => ../PowerLibs
-//
+//replace github.com/ArtisanCloud/PowerLibs/v2 => ../PowerLibs
 //replace github.com/ArtisanCloud/PowerSocialite/v2 => ../PowerSocialite
 
 require (
-	github.com/ArtisanCloud/PowerLibs/v2 v2.0.3
-	github.com/ArtisanCloud/PowerSocialite/v2 v2.0.1
+	github.com/ArtisanCloud/PowerLibs/v2 v2.0.6
+	github.com/ArtisanCloud/PowerSocialite/v2 v2.0.2
 	github.com/go-playground/assert/v2 v2.0.1
 	github.com/google/uuid v1.1.1
 	github.com/stretchr/testify v1.7.0
@@ -27,8 +26,6 @@ require (
 	github.com/json-iterator/go v1.1.11 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.1 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect

go.sum

@@ -1,8 +1,7 @@
-github.com/ArtisanCloud/PowerLibs/v2 v2.0.2/go.mod h1:geiRu1Fv9YnHR8qPfV0/eGA1duOwAafR46YzYHCfviY=
-github.com/ArtisanCloud/PowerLibs/v2 v2.0.3 h1:0lVlUuHmLIT0EfE26lROwjydb0D0lAUN6gx1jqQVOC8=
-github.com/ArtisanCloud/PowerLibs/v2 v2.0.3/go.mod h1:geiRu1Fv9YnHR8qPfV0/eGA1duOwAafR46YzYHCfviY=
-github.com/ArtisanCloud/PowerSocialite/v2 v2.0.1 h1:8wkgBfLKt0z4OXSYzlLDvwHIypOiUHg6m1dlT+zHZKg=
-github.com/ArtisanCloud/PowerSocialite/v2 v2.0.1/go.mod h1:1FXnZ2A4YfWsRxW+tBiWzO13O8hJ/lb7DX/u1vCB128=
+github.com/ArtisanCloud/PowerLibs/v2 v2.0.6 h1:4V+VhimrbpUTgXOZ+II3cxYIMsmYlYTwFfGLm67dFvY=
+github.com/ArtisanCloud/PowerLibs/v2 v2.0.6/go.mod h1:+rsjtjT33wiSlvYX4M9T59pZZasQNW96r7rNKB9izZs=
+github.com/ArtisanCloud/PowerSocialite/v2 v2.0.2 h1:IJ9Ag5K+HsTFsYBh+mdPHum45MxThiKesPr8kOES5QE=
+github.com/ArtisanCloud/PowerSocialite/v2 v2.0.2/go.mod h1:4SUtaWSeTCPq9szCXSTeSu0ltHuZpVzyMuNl+6zSEeo=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
@@ -67,6 +66,9 @@ github.com/guonaihong/gout v0.2.12/go.mod h1:25bJRA+9fErgSvEUF5UAazc9dME+VdkjrFu
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ=
@@ -151,7 +153,7 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e h1:gsTQYXdTw2Gq7RBsWvlQ91b+aEQ6bXFUngBGuR8sPpI=
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -237,3 +239,4 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
 gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gorm.io/gorm v1.23.6/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=

main.go

@@ -115,7 +115,7 @@ func main() {
 	configWecom := GetWorkConfig()
 	wecomApp, err := work.NewWork(configWecom)
 	if err != nil {
-		fmt.Println(err.Error())
+		panic(err.Error())
 	}
 	fmt2.Dump("wecom config:", wecomApp.GetConfig().All())
 

src/basicService/contentSecurity/client.go

@@ -8,13 +8,17 @@ type Client struct {
 	BaseUri string
 }
 
-func NewClient(app *kernel.ApplicationInterface) *Client {
+func NewClient(app *kernel.ApplicationInterface) (*Client, error) {
 
+	baseClient, err := kernel.NewBaseClient(app, nil)
+	if err != nil {
+		return nil, err
+	}
 	client := &Client{
-		BaseClient: kernel.NewBaseClient(app, nil),
+		BaseClient: baseClient,
 	}
 
 	client.BaseClient.HttpRequest.BaseURI = "https://api.weixin.qq.com/wxa/"
 
-	return client
+	return client, nil
 }

src/basicService/contentSecurity/provider.go

@@ -4,7 +4,7 @@ import (
 	"github.com/ArtisanCloud/PowerWeChat/v2/src/kernel"
 )
 
-func RegisterProvider(app kernel.ApplicationInterface) *Client {
+func RegisterProvider(app kernel.ApplicationInterface) (*Client, error) {
 
 	return NewClient(&app)
 

src/basicService/jssdk/client.go

@@ -24,15 +24,19 @@ type Client struct {
 	url            string
 }
 
-func NewClient(app *kernel.ApplicationInterface) *Client {
+func NewClient(app *kernel.ApplicationInterface) (*Client, error) {
+	baseClient, err := kernel.NewBaseClient(app, nil)
+	if err != nil {
+		return nil, err
+	}
 	client := &Client{
-		BaseClient:         kernel.NewBaseClient(app, nil),
+		BaseClient:         baseClient,
 		InteractsWithCache: &kernel.InteractsWithCache{},
 	}
 
 	client.TicketEndpoint = "https://api.weixin.qq.com/cgi-bin/ticket/getticket"
 
-	return client
+	return client, nil
 }
 
 func (comp *Client) BuildConfig(jsApiList []string, debug bool, beta bool, openTagList []string, url string) (interface{}, error) {

src/basicService/jssdk/provider.go

@@ -4,7 +4,7 @@ import (
 	"github.com/ArtisanCloud/PowerWeChat/v2/src/kernel"
 )
 
-func RegisterProvider(app kernel.ApplicationInterface) *Client {
+func RegisterProvider(app kernel.ApplicationInterface) (*Client, error) {
 
 	return NewClient(&app)
 

src/basicService/media/client.go

@@ -16,15 +16,19 @@ type Client struct {
 	AllowTypes []string
 }
 
-func NewClient(app kernel.ApplicationInterface) *Client {
+func NewClient(app kernel.ApplicationInterface) (*Client, error) {
+	baseClient, err := kernel.NewBaseClient(&app, nil)
+	if err != nil {
+		return nil, err
+	}
 	client := &Client{
-		BaseClient: kernel.NewBaseClient(&app, nil),
+		BaseClient: baseClient,
 
 		AllowTypes: []string{"image", "voice", "video", "thumb"},
 	}
 
 	client.BaseClient.HttpRequest.BaseURI = "https://api.weixin.qq.com/cgi-bin/"
-	return client
+	return client, nil
 }
 
 // 新增临时素材

src/basicService/qrCode/client.go

@@ -22,14 +22,17 @@ type Client struct {
 	*kernel.BaseClient
 }
 
-func NewClient(app *kernel.ApplicationInterface) *Client {
-
+func NewClient(app *kernel.ApplicationInterface) (*Client, error) {
+	baseClient, err := kernel.NewBaseClient(app, nil)
+	if err != nil {
+		return nil, err
+	}
 	client := &Client{
-		BaseClient: kernel.NewBaseClient(app, nil),
+		BaseClient: baseClient,
 	}
 
 	client.HttpRequest.BaseURI = "https://api.weixin.qq.com/cgi-bin/"
-	return client
+	return client, nil
 }
 
 // 生成永久二维码请求

src/basicService/qrCode/provider.go

@@ -4,7 +4,7 @@ import (
 	"github.com/ArtisanCloud/PowerWeChat/v2/src/kernel"
 )
 
-func RegisterProvider(app kernel.ApplicationInterface) *Client {
+func RegisterProvider(app kernel.ApplicationInterface) (*Client, error) {
 
 	return NewClient(&app)
 

src/basicService/subscribeMessage/provider.go

@@ -4,10 +4,14 @@ import (
 	"github.com/ArtisanCloud/PowerWeChat/v2/src/kernel"
 )
 
-func RegisterProvider(app kernel.ApplicationInterface) *Client {
+func RegisterProvider(app kernel.ApplicationInterface) (*Client, error) {
 
-	return &Client{
-		kernel.NewBaseClient(&app, nil),
+	baseClient, err := kernel.NewBaseClient(&app, nil)
+	if err != nil {
+		return nil, err
 	}
+	return &Client{
+		baseClient,
+	}, nil
 
 }

src/basicService/url/client.go

@@ -15,14 +15,18 @@ type Client struct {
 	BaseUri string
 }
 
-func NewClient(app *kernel.ApplicationInterface) *Client {
-
+func NewClient(app *kernel.ApplicationInterface) (*Client, error) {
+	baseClient, err := kernel.NewBaseClient(app, nil)
+	if err != nil {
+		return nil, err
+	}
 	client := &Client{
-		BaseClient: kernel.NewBaseClient(app, nil),
+		baseClient,
+		"",
 	}
 	client.BaseClient.HttpRequest.BaseURI = "https://api.weixin.qq.com/"
 
-	return client
+	return client, nil
 }
 
 // 短key托管

src/basicService/url/provider.go

@@ -4,7 +4,7 @@ import (
 	"github.com/ArtisanCloud/PowerWeChat/v2/src/kernel"
 )
 
-func RegisterProvider(app kernel.ApplicationInterface) *Client {
+func RegisterProvider(app kernel.ApplicationInterface) (*Client, error) {
 
 	return NewClient(&app)
 

src/kernel/accessToken.go

@@ -33,17 +33,21 @@ type AccessToken struct {
 	GetCredentials func() *object.StringMap
 }
 
-func NewAccessToken(app *ApplicationInterface) *AccessToken {
+func NewAccessToken(app *ApplicationInterface) (*AccessToken, error) {
 	config := (*app).GetContainer().GetConfig()
 
 	var cacheClient cache.CacheInterface = nil
 	if (*config)["cache"] != nil {
 		cacheClient = (*config)["cache"].(cache.CacheInterface)
 	}
 
+	httpRequest, err := request.NewHttpRequest(config)
+	if err != nil {
+		return nil, err
+	}
 	token := &AccessToken{
 		App:         app,
-		HttpRequest: request.NewHttpRequest(config),
+		HttpRequest: httpRequest,
 
 		RequestMethod:      "GET",
 		EndpointToGetToken: "",
@@ -54,7 +58,7 @@ func NewAccessToken(app *ApplicationInterface) *AccessToken {
 		InteractsWithCache: NewInteractsWithCache(cacheClient),
 	}
 
-	return token
+	return token, nil
 }
 
 func (accessToken *AccessToken) GetRefreshedToken() (*response2.ResponseGetToken, error) {

src/kernel/baseClient.go

@@ -27,15 +27,18 @@ type BaseClient struct {
 	Token *AccessToken
 }
 
-func NewBaseClient(app *ApplicationInterface, token *AccessToken) *BaseClient {
+func NewBaseClient(app *ApplicationInterface, token *AccessToken) (*BaseClient, error) {
 	config := (*app).GetContainer().GetConfig()
 
 	if token == nil {
 		token = (*app).GetAccessToken()
 	}
-
+	httpRequest, err := request.NewHttpRequest(config)
+	if err != nil {
+		return nil, err
+	}
 	client := &BaseClient{
-		HttpRequest: request.NewHttpRequest(config),
+		HttpRequest: httpRequest,
 		App:         app,
 		Token:       token,
 	}
@@ -48,7 +51,7 @@ func NewBaseClient(app *ApplicationInterface, token *AccessToken) *BaseClient {
 		}
 	}
 
-	return client
+	return client, nil
 
 }