feats: change error define

api/authorization/authorizer_info.go

@@ -14,17 +14,16 @@ package authorization
 
 import (
 	"encoding/json"
-	"errors"
 	"net/url"
 
 	"gitee.com/yansen_zh/wxcomponent/config"
-	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
+	"gitee.com/yansen_zh/wxcomponent/errors"
 	"gitee.com/yansen_zh/wxcomponent/utils/request"
 )
 
 // AuthorizerInfoResult 获取授权帐号信息结果
 type AuthorizerInfoResult struct {
-	wxerr.Error
+	errors.Error
 	AuthorizationInfo AuthorizationInfo `json:"authorization_info"`
 	AuthorizerInfo    AuthorizerInfo    `json:"authorizer_info"`
 }

api/authorization/authorizer_token.go

@@ -14,17 +14,16 @@ package authorization
 
 import (
 	"encoding/json"
-	"errors"
 	"net/url"
 
 	"gitee.com/yansen_zh/wxcomponent/config"
-	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
+	"gitee.com/yansen_zh/wxcomponent/errors"
 	"gitee.com/yansen_zh/wxcomponent/utils/request"
 )
 
 // AuthorizerTokenResult 获取/刷新接口调用令牌结果
 type AuthorizerTokenResult struct {
-	wxerr.Error
+	errors.Error
 	AuthorizerAccessToken  string `json:"authorizer_access_token"`
 	ExpiresIn              int    `json:"expires_in"`
 	AuthorizerRefreshToken string `json:"authorizer_refresh_token"`

api/authorization/component_token.go

@@ -16,13 +16,13 @@ import (
 	"encoding/json"
 
 	"gitee.com/yansen_zh/wxcomponent/config"
-	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
+	"gitee.com/yansen_zh/wxcomponent/errors"
 	"gitee.com/yansen_zh/wxcomponent/utils/request"
 )
 
 // ComponentTokenResult 获取令牌结果
 type ComponentTokenResult struct {
-	wxerr.Error
+	errors.Error
 	ComponentAccessToken string `json:"component_access_token"`
 	ExpiresIn            int    `json:"expires_in"`
 }

api/authorization/pre_auth_code.go

@@ -17,13 +17,13 @@ import (
 	"net/url"
 
 	"gitee.com/yansen_zh/wxcomponent/config"
-	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
+	"gitee.com/yansen_zh/wxcomponent/errors"
 	"gitee.com/yansen_zh/wxcomponent/utils/request"
 )
 
 // PreAuthCodeResult 获取预授权码结果
 type PreAuthCodeResult struct {
-	wxerr.Error
+	errors.Error
 	PreAuthCode string `json:"pre_auth_code"`
 	ExpiresIn   int    `json:"expires_in"`
 }

api/authorization/query_auth.go

@@ -14,17 +14,16 @@ package authorization
 
 import (
 	"encoding/json"
-	"errors"
 	"net/url"
 
 	"gitee.com/yansen_zh/wxcomponent/config"
-	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
+	"gitee.com/yansen_zh/wxcomponent/errors"
 	"gitee.com/yansen_zh/wxcomponent/utils/request"
 )
 
 // QueryAuthResult 获取授权信息结果
 type QueryAuthResult struct {
-	wxerr.Error
+	errors.Error
 	AuthorizationInfo AuthorizationInfo `json:"authorization_info"`
 }
 

api/authorizer/authorizer_list.go

@@ -17,13 +17,13 @@ import (
 	"net/url"
 
 	"gitee.com/yansen_zh/wxcomponent/config"
-	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
+	"gitee.com/yansen_zh/wxcomponent/errors"
 	"gitee.com/yansen_zh/wxcomponent/utils/request"
 )
 
 // AuthorizerListResult 拉取所有已授权的帐号信息结果
 type AuthorizerListResult struct {
-	wxerr.Error
+	errors.Error
 	TotalCount int                   `json:"total_count"`
 	List       []AuthorizerBasicInfo `json:"list"`
 }

api/authorizer/get_authorizer_option.go

@@ -14,17 +14,16 @@ package authorizer
 
 import (
 	"encoding/json"
-	"errors"
 	"net/url"
 
 	"gitee.com/yansen_zh/wxcomponent/config"
-	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
+	"gitee.com/yansen_zh/wxcomponent/errors"
 	"gitee.com/yansen_zh/wxcomponent/utils/request"
 )
 
 // GetAuthorizerOptionResult 获取授权方选项信息结果
 type GetAuthorizerOptionResult struct {
-	wxerr.Error
+	errors.Error
 	AuthorizerAppID string `json:"authorizer_appid"`
 	OptionName      string `json:"option_name"`
 	OptionValue     string `json:"option_value"`

api/mp/webpage/jsapi.go

@@ -15,20 +15,19 @@ package webpage
 import (
 	"crypto/sha1"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"net/url"
 	"strconv"
 	"time"
 
-	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
+	"gitee.com/yansen_zh/wxcomponent/errors"
 	"gitee.com/yansen_zh/wxcomponent/utils"
 	"gitee.com/yansen_zh/wxcomponent/utils/request"
 )
 
 // JsapiTicketResult 通过 access_token 获取 jsapi_ticket 结果
 type JsapiTicketResult struct {
-	wxerr.Error
+	errors.Error
 	Ticket    string `json:"ticket"`
 	ExpiresIn int    `json:"expires_in"`
 }

api/mp/webpage/webpage.go

@@ -16,12 +16,11 @@ package webpage
 
 import (
 	"encoding/json"
-	"errors"
 	"net/url"
 	"strings"
 
 	"gitee.com/yansen_zh/wxcomponent/config"
-	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
+	"gitee.com/yansen_zh/wxcomponent/errors"
 	"gitee.com/yansen_zh/wxcomponent/utils/request"
 )
 
@@ -41,7 +40,7 @@ func GetOAuthCodeLink(appID, redirectURI, state string, scopes ...string) string
 
 // MpOAuthAccessTokenResult 网页授权, 通过 code 换取 access_token 返回值
 type MpOAuthAccessTokenResult struct {
-	wxerr.Error
+	errors.Error
 	// AccessToken 接口调用凭证
 	AccessToken string `json:"access_token"`
 	// ExpiresIn access_token 接口调用凭证超时时间，单位（秒）

authorization.go

@@ -57,7 +57,7 @@ func CreateAuthLink(client, url, appID string) (string, error) {
 }
 
 // RefreshAuthorizerInfo 刷新授权对象信息
-func RefreshAuthorizerInfo(authCode string, authorizer config.AuthorizerConfig) error {
+func RefreshAuthorizerInfo(authCode string) error {
 	res, err := authorization.GetQueryAuth(authCode)
 	if err != nil {
 		return err
@@ -74,8 +74,8 @@ func RefreshAuthorizerInfo(authCode string, authorizer config.AuthorizerConfig)
 		}
 	}
 
-	authorizer.RefreshFuncInfo(appID, funcLst)
-	if err := authorizer.RefreshToken(appID, authInfo.AuthorizerAccessToken, authInfo.AuthorizerRefreshToken, expire); err != nil {
+	config.GetAuthorizer().RefreshFuncInfo(appID, funcLst)
+	if err := config.GetAuthorizer().RefreshToken(appID, authInfo.AuthorizerAccessToken, authInfo.AuthorizerRefreshToken, expire); err != nil {
 		return err
 	}
 
@@ -83,15 +83,15 @@ func RefreshAuthorizerInfo(authCode string, authorizer config.AuthorizerConfig)
 }
 
 // RefreshAuthorizerToken 刷新接口调用令牌
-func RefreshAuthorizerToken(appID string, authorizer config.AuthorizerConfig) error {
-	res, err := authorization.RefreshAuthorizerToken(appID, authorizer.GetRefreshToken(appID))
+func RefreshAuthorizerToken(appID string) error {
+	res, err := authorization.RefreshAuthorizerToken(appID, config.GetAuthorizer().GetRefreshToken(appID))
 	if err != nil {
 		return err
 	}
 
 	expire := utils.GetExpireTime(res.ExpiresIn)
 
-	if err := authorizer.RefreshToken(appID, res.AuthorizerAccessToken, res.AuthorizerRefreshToken, expire); err != nil {
+	if err := config.GetAuthorizer().RefreshToken(appID, res.AuthorizerAccessToken, res.AuthorizerRefreshToken, expire); err != nil {
 		return err
 	}
 

config/authorizer.go

@@ -1,3 +1,15 @@
+/**
+ * Copyright (c) 2022 Yansen Zhang
+ * wxcomponent is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ *          http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+**/
+
 package config
 
 import (
@@ -18,3 +30,5 @@ type AuthorizerConfig interface {
 	// RefreshFuncInfo 刷新权限集列表
 	RefreshFuncInfo(appID string, lst []int)
 }
+
+var authorizer AuthorizerConfig

config/index.go

@@ -18,8 +18,8 @@ import (
 )
 
 // Init 初始化平台实例
-func Init(config Config) error {
-	if config == nil {
+func Init(config Config, authorizerConfig AuthorizerConfig) error {
+	if config == nil || authorizerConfig == nil {
 		return errors.New("平台初始化参数不能为空")
 	}
 
@@ -32,6 +32,7 @@ func Init(config Config) error {
 	}
 
 	conf = config
+	authorizer = authorizerConfig
 	return nil
 }
 
@@ -40,6 +41,11 @@ func GetConfiger() Config {
 	return conf
 }
 
+// GetAuthorizer 获取授权对象配置
+func GetAuthorizer() AuthorizerConfig {
+	return authorizer
+}
+
 // GetAppID 获取平台 APPID
 func GetAppID() string {
 	return conf.GetAppID()

errors/error.go

@@ -20,6 +20,13 @@ type Error struct {
 	Message string `json:"errmsg"`
 }
 
-func (e Error) Error() string {
+func (e *Error) Error() string {
 	return fmt.Sprintf("[%d] - %s", e.Code, e.Message)
 }
+
+func New(msg string) error {
+	return &Error{
+		Code:    -100,
+		Message: msg,
+	}
+}

init.go

@@ -29,8 +29,8 @@ func InitLogger(logger log.Logger) {
 }
 
 // InitConfig 初始化配置
-func InitConfig(conf config.Config) error {
-	err := config.Init(conf)
+func InitConfig(conf config.Config, authConfig config.AuthorizerConfig) error {
+	err := config.Init(conf, authConfig)
 	if err != nil {
 		var e error
 		aesKey, e = base64.StdEncoding.DecodeString(conf.GetAppSecret() + "=")