change package and add some apis

authorization/authorizer_info.go → api/authorization/authorizer_info.go

@@ -17,16 +17,11 @@ import (
 	"errors"
 	"net/url"
 
+	"gitee.com/yansen_zh/wxcomponent/config"
 	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
 	"gitee.com/yansen_zh/wxcomponent/utils/request"
 )
 
-// AuthorizerInfoParam 获取授权帐号信息参数
-type AuthorizerInfoParam struct {
-	ComponentAppId  string `json:"component_appid"`
-	AuthorizerAppId string `json:"authorizer_appid"`
-}
-
 // AuthorizerInfoResult 获取授权帐号信息结果
 type AuthorizerInfoResult struct {
 	wxerr.Error
@@ -39,21 +34,18 @@ const (
 )
 
 // GetAuthorizerInfo 获取授权帐号信息
-func GetAuthorizerInfo(componentAccessToken string, data AuthorizerInfoParam) (*AuthorizerInfoResult, error) {
-	if componentAccessToken == "" {
-		return nil, errors.New("获取授权帐号信息 第三方平台的 component_access_token 不能为空")
-	}
-
-	if data.ComponentAppId == "" {
-		return nil, errors.New("获取授权帐号信息 第三方平台的 appid 不能为空")
-	}
-
-	if data.AuthorizerAppId == "" {
+func GetAuthorizerInfo(authorizerAppID string) (*AuthorizerInfoResult, error) {
+	if authorizerAppID == "" {
 		return nil, errors.New("获取授权帐号信息 授权方 appid 不能为空")
 	}
 
 	queryParam := url.Values{}
-	queryParam.Set("component_access_token", componentAccessToken)
+	queryParam.Set("component_access_token", config.GetAccessToken())
+
+	data := map[string]string{
+		"component_appid":  config.GetAppID(),
+		"authorizer_appid": authorizerAppID,
+	}
 
 	resp, e2 := request.PostJSON(apiGetAuthorizerInfo, &queryParam, data)
 	if e2 != nil {

authorization/authorizer_token.go → api/authorization/authorizer_token.go

@@ -17,17 +17,11 @@ import (
 	"errors"
 	"net/url"
 
+	"gitee.com/yansen_zh/wxcomponent/config"
 	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
 	"gitee.com/yansen_zh/wxcomponent/utils/request"
 )
 
-// AuthorizerTokenParam 获取/刷新接口调用令牌参数
-type AuthorizerTokenParam struct {
-	ComponentAppId         string `json:"component_appid"`
-	AuthorizerAppId        string `json:"authorizer_appid"`
-	AuthorizerRefreshToken string `json:"authorizer_refresh_token"`
-}
-
 // AuthorizerTokenResult 获取/刷新接口调用令牌结果
 type AuthorizerTokenResult struct {
 	wxerr.Error
@@ -41,25 +35,23 @@ const (
 )
 
 // RefreshAuthorizerToken 获取/刷新接口调用令牌
-func RefreshAuthorizerToken(componentAccessToken string, data AuthorizerTokenParam) (*AuthorizerTokenResult, error) {
-	if componentAccessToken == "" {
-		return nil, errors.New("获取/刷新接口调用令牌 第三方平台的 component_access_token 不能为空")
-	}
-
-	if data.ComponentAppId == "" {
-		return nil, errors.New("获取/刷新接口调用令牌 第三方平台的 appid 不能为空")
-	}
-
-	if data.AuthorizerAppId == "" {
+func RefreshAuthorizerToken(authorizerAppID, authorizerRefreshToken string) (*AuthorizerTokenResult, error) {
+	if authorizerAppID == "" {
 		return nil, errors.New("获取/刷新接口调用令牌 授权方 appid 不能为空")
 	}
 
-	if data.AuthorizerRefreshToken == "" {
+	if authorizerRefreshToken == "" {
 		return nil, errors.New("获取/刷新接口调用令牌 刷新令牌 不能为空")
 	}
 
 	queryParam := url.Values{}
-	queryParam.Set("component_access_token", componentAccessToken)
+	queryParam.Set("component_access_token", config.GetAccessToken())
+
+	data := map[string]string{
+		"component_appid":          config.GetAppID(),
+		"authorizer_appid":         authorizerAppID,
+		"authorizer_refresh_token": authorizerRefreshToken,
+	}
 
 	resp, e2 := request.PostJSON(apiAuthorizerToken, &queryParam, data)
 	if e2 != nil {

authorization/bind_component.go → api/authorization/bind_component.go

@@ -17,7 +17,7 @@ import (
 	"net/url"
 	"strconv"
 
-	"gitee.com/yansen_zh/wxcomponent/utils/request"
+	"gitee.com/yansen_zh/wxcomponent/config"
 )
 
 // AuthLinkParam 构建授权链接入参
@@ -37,33 +37,30 @@ const (
 )
 
 // GetPCAuthLink 构建PC端授权链接
-func GetPCAuthLink(param AuthLinkParam) (*url.URL, error) {
-	return GetAuthLink("PC", param)
+func GetPCAuthLink(preAuthCode, redirectURI, bizAppID string, authType int) (string, error) {
+	return GetAuthLink("PC", preAuthCode, redirectURI, bizAppID, authType)
 }
 
 // GetH5AuthLink 构建H5端授权链接
-func GetH5AuthLink(param AuthLinkParam) (*url.URL, error) {
-	return GetAuthLink("H5", param)
+func GetH5AuthLink(preAuthCode, redirectURI, bizAppID string, authType int) (string, error) {
+	return GetAuthLink("H5", preAuthCode, redirectURI, bizAppID, authType)
 }
 
 // GetAuthLink 构建授权链接
-func GetAuthLink(client string, param AuthLinkParam) (*url.URL, error) {
+// redirectURI 回调地址必须是未经过处理的原始URL字符串
+func GetAuthLink(client, preAuthCode, redirectURI, bizAppID string, authType int) (string, error) {
 	isH5 := client == "H5"
 
-	if param.ComponentAppId == "" {
-		return nil, errors.New("构建授权链接 第三方平台的 appid 不能为空")
+	if preAuthCode == "" {
+		return "", errors.New("构建授权链接 预授权码 不能为空")
 	}
 
-	if param.PreAuthCode == "" {
-		return nil, errors.New("构建授权链接 预授权码 不能为空")
+	if redirectURI == "" {
+		return "", errors.New("构建授权链接 回调 URI 不能为空")
 	}
 
-	if param.RedirectUri == "" {
-		return nil, errors.New("构建授权链接 回调 URI 不能为空")
-	}
-
-	if param.AuthType < 1 || param.AuthType > 3 {
-		param.AuthType = 3
+	if authType < 1 || authType > 3 {
+		authType = 3
 	}
 
 	queryParams := url.Values{}
@@ -71,28 +68,26 @@ func GetAuthLink(client string, param AuthLinkParam) (*url.URL, error) {
 		queryParams.Set("action", "bindcomponent")
 		queryParams.Set("no_scan", "1")
 	}
-	queryParams.Set("component_appid", param.ComponentAppId)
-	queryParams.Set("pre_auth_code", param.PreAuthCode)
-	queryParams.Set("redirect_uri", param.RedirectUri)
+	queryParams.Set("component_appid", config.GetAppID())
+	queryParams.Set("pre_auth_code", preAuthCode)
+	queryParams.Set("redirect_uri", redirectURI)
 	// auth_type、biz_appid 两个字段互斥
-	if param.BizAppId != "" {
-		queryParams.Set("biz_appid", param.BizAppId)
+	if bizAppID != "" {
+		queryParams.Set("biz_appid", bizAppID)
 	} else {
-		queryParams.Set("auth_type", strconv.Itoa(param.AuthType))
+		queryParams.Set("auth_type", strconv.Itoa(authType))
 	}
 
-	apiUrl := componentloginpage
+	link := componentloginpage
 	if isH5 {
-		apiUrl = bindcomponent
-	}
-	u, err := request.ParseURL(apiUrl, &queryParams)
-	if err != nil {
-		return nil, err
+		link = bindcomponent
 	}
 
+	link += "?" + queryParams.Encode()
+
 	if isH5 {
-		u.Fragment = "wechat_redirect"
+		link += "#wechat_redirect"
 	}
 
-	return u, nil
+	return link, nil
 }

authorization/component_token.go → api/authorization/component_token.go

@@ -14,19 +14,12 @@ package authorization
 
 import (
 	"encoding/json"
-	"errors"
 
+	"gitee.com/yansen_zh/wxcomponent/config"
 	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
 	"gitee.com/yansen_zh/wxcomponent/utils/request"
 )
 
-// ComponentTokenParam 获取令牌参数
-type ComponentTokenParam struct {
-	ComponentAppId        string `json:"component_appid"`
-	ComponentAppSecret    string `json:"component_appsecret"`
-	ComponentVerifyTicket string `json:"component_verify_ticket"`
-}
-
 // ComponentTokenResult 获取令牌结果
 type ComponentTokenResult struct {
 	wxerr.Error
@@ -39,17 +32,11 @@ const (
 )
 
 // GetComponentToken 获取令牌
-func GetComponentToken(data ComponentTokenParam) (*ComponentTokenResult, error) {
-	if data.ComponentAppId == "" {
-		return nil, errors.New("获取令牌 第三方平台的 appid 不能为空")
-	}
-
-	if data.ComponentAppSecret == "" {
-		return nil, errors.New("获取令牌 第三方平台的 appsecret 不能为空")
-	}
-
-	if data.ComponentVerifyTicket == "" {
-		return nil, errors.New("获取令牌 推送 ticket 不能为空")
+func GetComponentToken() (*ComponentTokenResult, error) {
+	data := map[string]string{
+		"component_appid":         config.GetAppID(),
+		"component_appsecret":     config.GetAppSecret(),
+		"component_verify_ticket": config.GetVerifyTicket(),
 	}
 
 	resp, e2 := request.PostJSON(apiComponentToken, nil, data)

authorization/pre_auth_code.go → api/authorization/pre_auth_code.go

@@ -14,18 +14,13 @@ 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/utils/request"
 )
 
-// PreAuthCodeParam 获取预授权码参数
-type PreAuthCodeParam struct {
-	ComponentAppId string `json:"component_appid"`
-}
-
 // PreAuthCodeResult 获取预授权码结果
 type PreAuthCodeResult struct {
 	wxerr.Error
@@ -38,18 +33,14 @@ const (
 )
 
 // CreatePreAuthCode 获取预授权码
-func CreatePreAuthCode(componentAccessToken string, data PreAuthCodeParam) (*PreAuthCodeResult, error) {
-	if componentAccessToken == "" {
-		return nil, errors.New("获取预授权码 第三方平台的 component_access_token 不能为空")
-	}
+func CreatePreAuthCode() (*PreAuthCodeResult, error) {
+	queryParam := url.Values{}
+	queryParam.Set("component_access_token", config.GetAccessToken())
 
-	if data.ComponentAppId == "" {
-		return nil, errors.New("获取预授权码 第三方平台的 appid 不能为空")
+	data := map[string]string{
+		"component_appid": config.GetAppID(),
 	}
 
-	queryParam := url.Values{}
-	queryParam.Set("component_access_token", componentAccessToken)
-
 	resp, e2 := request.PostJSON(apiCreatePreauthcode, &queryParam, data)
 	if e2 != nil {
 		return nil, e2

api/authorization/push_ticket.go

@@ -0,0 +1,34 @@
+/**
+ * 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 authorization
+
+import (
+	"gitee.com/yansen_zh/wxcomponent/config"
+	"gitee.com/yansen_zh/wxcomponent/utils/request"
+)
+
+const (
+	apiStartPushTicket = "https://apies.weixin.qq.com/cgi-bin/component/api_start_push_ticket"
+)
+
+// StartPushTicket 启动 ticket 推送服务
+func StartPushTicket() error {
+	data := map[string]string{
+		"component_appid":  config.GetAppID(),
+		"component_secret": config.GetAppSecret(),
+	}
+
+	_, err := request.PostJSON(apiStartPushTicket, nil, data)
+
+	return err
+}

authorization/query_auth.go → api/authorization/query_auth.go

@@ -17,16 +17,11 @@ import (
 	"errors"
 	"net/url"
 
+	"gitee.com/yansen_zh/wxcomponent/config"
 	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
 	"gitee.com/yansen_zh/wxcomponent/utils/request"
 )
 
-// QueryAuthParam 获取授权信息参数
-type QueryAuthParam struct {
-	ComponentAppId    string `json:"component_appid"`
-	AuthorizationCode string `json:"authorization_code"`
-}
-
 // QueryAuthResult 获取授权信息结果
 type QueryAuthResult struct {
 	wxerr.Error
@@ -38,21 +33,18 @@ const (
 )
 
 // GetQueryAuth 获取授权信息
-func GetQueryAuth(componentAccessToken string, data QueryAuthParam) (*QueryAuthResult, error) {
-	if componentAccessToken == "" {
-		return nil, errors.New("获取授权信息 第三方平台的 component_access_token 不能为空")
-	}
-
-	if data.ComponentAppId == "" {
-		return nil, errors.New("获取授权信息 第三方平台的 appid 不能为空")
-	}
-
-	if data.AuthorizationCode == "" {
+func GetQueryAuth(authorizationCode string) (*QueryAuthResult, error) {
+	if authorizationCode == "" {
 		return nil, errors.New("获取授权信息 授权码 不能为空")
 	}
 
 	queryParam := url.Values{}
-	queryParam.Set("component_access_token", componentAccessToken)
+	queryParam.Set("component_access_token", config.GetAccessToken())
+
+	data := map[string]string{
+		"component_appid":    config.GetAppID(),
+		"authorization_code": authorizationCode,
+	}
 
 	resp, e2 := request.PostJSON(apiQueryAuth, &queryParam, data)
 	if e2 != nil {

authorizer/authorizer_list.go → api/authorizer/authorizer_list.go

@@ -14,20 +14,13 @@ 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/utils/request"
 )
 
-// AuthorizerListParam 拉取所有已授权的帐号信息参数
-type AuthorizerListParam struct {
-	ComponentAppId string `json:"component_appid"`
-	Offset         int    `json:"offset"`
-	Count          int    `json:"count"`
-}
-
 // AuthorizerListResult 拉取所有已授权的帐号信息结果
 type AuthorizerListResult struct {
 	wxerr.Error
@@ -40,30 +33,28 @@ const (
 )
 
 // GetAuthorizerList 拉取所有已授权的帐号信息
-func GetAuthorizerList(componentAccessToken string, data AuthorizerListParam) (*AuthorizerListResult, error) {
-	if componentAccessToken == "" {
-		return nil, errors.New("拉取所有已授权的帐号信息 第三方平台的 component_access_token 不能为空")
+func GetAuthorizerList(offset, count int) (*AuthorizerListResult, error) {
+	if offset < 0 {
+		offset = 0
 	}
 
-	if data.ComponentAppId == "" {
-		return nil, errors.New("拉取所有已授权的帐号信息 第三方平台的 appid 不能为空")
+	if count < 0 {
+		count = 100
 	}
 
-	if data.Offset < 0 {
-		data.Offset = 0
+	if count > 500 {
+		count = 500
 	}
 
-	if data.Count < 0 {
-		data.Count = 100
-	}
+	queryParam := url.Values{}
+	queryParam.Set("component_access_token", config.GetAccessToken())
 
-	if data.Count > 500 {
-		data.Count = 500
+	data := map[string]interface{}{
+		"component_appid": config.GetAppID(),
+		"offset":          offset,
+		"count":           count,
 	}
 
-	queryParam := url.Values{}
-	queryParam.Set("component_access_token", componentAccessToken)
-
 	resp, e2 := request.PostJSON(apiGetAuthorizerList, &queryParam, data)
 	if e2 != nil {
 		return nil, e2

authorizer/get_authorizer_option.go → api/authorizer/get_authorizer_option.go

@@ -17,17 +17,11 @@ import (
 	"errors"
 	"net/url"
 
+	"gitee.com/yansen_zh/wxcomponent/config"
 	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
 	"gitee.com/yansen_zh/wxcomponent/utils/request"
 )
 
-// GetAuthorizerOptionParam 获取授权方选项信息参数
-type GetAuthorizerOptionParam struct {
-	ComponentAppId  string `json:"component_appid"`
-	AuthorizerAppId string `json:"authorizer_appid"`
-	OptionName      string `json:"option_name"`
-}
-
 // GetAuthorizerOptionResult 获取授权方选项信息结果
 type GetAuthorizerOptionResult struct {
 	wxerr.Error
@@ -41,25 +35,23 @@ const (
 )
 
 // GetAuthorizerOption 获取授权方选项信息
-func GetAuthorizerOption(componentAccessToken string, data GetAuthorizerOptionParam) (*GetAuthorizerOptionResult, error) {
-	if componentAccessToken == "" {
-		return nil, errors.New("获取授权方选项信息 第三方平台的 component_access_token 不能为空")
-	}
-
-	if data.ComponentAppId == "" {
-		return nil, errors.New("获取授权方选项信息 授权公众号或小程序的 appid 不能为空")
-	}
-
-	if data.AuthorizerAppId == "" {
+func GetAuthorizerOption(authorizerAppID string, optionName string) (*GetAuthorizerOptionResult, error) {
+	if authorizerAppID == "" {
 		return nil, errors.New("获取授权方选项信息 第三方平台的 appid 不能为空")
 	}
 
-	if data.OptionName == "" {
+	if optionName == "" {
 		return nil, errors.New("获取授权方选项信息 选项名称 不能为空")
 	}
 
 	queryParam := url.Values{}
-	queryParam.Set("component_access_token", componentAccessToken)
+	queryParam.Set("component_access_token", config.GetAccessToken())
+
+	data := map[string]string{
+		"component_appid":  config.GetAppID(),
+		"authorizer_appid": authorizerAppID,
+		"option_name":      optionName,
+	}
 
 	resp, e2 := request.PostJSON(apiGetAuthorizerOption, &queryParam, data)
 	if e2 != nil {

api/authorizer/set_authorizer_option.go

@@ -0,0 +1,53 @@
+/**
+ * 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 authorizer
+
+import (
+	"errors"
+	"net/url"
+
+	"gitee.com/yansen_zh/wxcomponent/config"
+	"gitee.com/yansen_zh/wxcomponent/utils/request"
+)
+
+const (
+	apiSetAuthorizerOption = "https://apies.weixin.qq.com/cgi-bin/component/api_set_authorizer_option"
+)
+
+// SetAuthorizerOption 设置授权方选项信息
+func SetAuthorizerOption(authorizerAppID, optionName, optionValue string) error {
+	if authorizerAppID == "" {
+		return errors.New("设置授权方选项信息 第三方平台的 appid 不能为空")
+	}
+
+	if optionName == "" {
+		return errors.New("设置授权方选项信息 选项名称 不能为空")
+	}
+
+	if optionValue == "" {
+		return errors.New("设置授权方选项信息 设置的选项值 不能为空")
+	}
+
+	queryParam := url.Values{}
+	queryParam.Set("component_access_token", config.GetAccessToken())
+
+	data := map[string]string{
+		"component_appid":  config.GetAppID(),
+		"authorizer_appid": authorizerAppID,
+		"option_name":      optionName,
+		"option_value":     optionValue,
+	}
+
+	_, err := request.PostJSON(apiSetAuthorizerOption, &queryParam, data)
+	return err
+}

api/mp/jsapi.go

@@ -0,0 +1,77 @@
+package mp
+
+import (
+	"crypto/sha1"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/url"
+	"strconv"
+	"time"
+
+	wxerr "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
+	Ticket    string `json:"ticket"`
+	ExpiresIn int    `json:"expires_in"`
+}
+
+// JsapiSignature 可以用来初始化 JS SDK
+type JsapiSignature struct {
+	Timestamp int64  `json:"timestamp"`
+	NonceStr  string `json:"nonceStr"`
+	Signature string `json:"signature"`
+}
+
+const (
+	apiGetJSTicket = "https://api.weixin.qq.com/cgi-bin/ticket/getticket"
+)
+
+// GetJSTicket 通过 access_token 获取 jsapi_ticket
+func GetJSTicket(authorizerToken string) (*JsapiTicketResult, error) {
+	if authorizerToken == "" {
+		return nil, errors.New("获取 jsapi_ticket authorizerToken 不能为空")
+	}
+
+	param := url.Values{}
+	param.Set("access_token", authorizerToken)
+	param.Set("type", "jsapi")
+
+	resp, e2 := request.GetJSON(apiGetJSTicket, &param)
+	if e2 != nil {
+		return nil, e2
+	}
+
+	result := JsapiTicketResult{}
+	if err := json.Unmarshal(resp, &result); err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
+
+// GetJSAPISignature 获取 JsapiSignature
+func GetJSAPISignature(ticket, url string) *JsapiSignature {
+	timestamp := time.Now().Unix()
+	timestampStr := strconv.FormatInt(timestamp, 10)
+	nonceStr := utils.RandStr(16)
+
+	s1 := "jsapi_ticket=" + ticket
+	s2 := "&noncestr=" + nonceStr
+	s3 := "&timestamp=" + timestampStr
+	s4 := "&url=" + url
+
+	plain := s1 + s2 + s3 + s4
+	signature := fmt.Sprintf("%x", sha1.Sum([]byte(plain)))
+
+	return &JsapiSignature{
+		Timestamp: timestamp,
+		NonceStr:  nonceStr,
+		Signature: signature,
+	}
+}

api/mp/webpage.go

@@ -0,0 +1,71 @@
+package mp
+
+// 代公众号发起网页授权
+
+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/utils/request"
+)
+
+// GetOAuthCodeLink 代公众号发起网页授权, 构造授权链接
+// redirectURI 必须是未经编码的原始网址字符串
+func GetOAuthCodeLink(appID, redirectURI, state string, scopes ...string) string {
+	params := url.Values{}
+	params.Set("appid", appID)
+	params.Set("redirect_uri", redirectURI)
+	params.Set("response_type", "code")
+	params.Set("scope", strings.Join(scopes, ","))
+	params.Set("state", state)
+	params.Set("component_appid", config.GetAppID())
+
+	return "https://open.weixin.qq.com/connect/oauth2/authorize?" + params.Encode()
+}
+
+// MpOAuthAccessTokenResult 网页授权, 通过 code 换取 access_token 返回值
+type MpOAuthAccessTokenResult struct {
+	wxerr.Error
+	// AccessToken 接口调用凭证
+	AccessToken string `json:"access_token"`
+	// ExpiresIn access_token 接口调用凭证超时时间，单位（秒）
+	ExpiresIn int `json:"expires_in"`
+	// RefreshToken 用户刷新 access_token
+	RefreshToken string `json:"refresh_token"`
+	// Openid 授权用户唯一标识
+	OpenID string `json:"openid"`
+	// Scope 用户授权的作用域，使用逗号（,）分隔
+	Scope string `json:"scope"`
+}
+
+const apiOAuthAccessToken = "https://api.weixin.qq.com/sns/oauth2/component/access_token"
+
+// GetOAuthAccessToken 网页授权, 通过 code 换取 access_token
+func GetOAuthAccessToken(appID, code string) (*MpOAuthAccessTokenResult, error) {
+	if appID == "" || code == "" {
+		return nil, errors.New("获取网页授权Token appID 或者 code 不能为空")
+	}
+
+	param := url.Values{}
+	param.Set("appid", appID)
+	param.Set("code", code)
+	param.Set("grant_type", "authorization_code")
+	param.Set("component_appid", config.GetAppID())
+	param.Set("component_access_token", config.GetAccessToken())
+
+	resp, e2 := request.GetJSON(apiOAuthAccessToken, &param)
+	if e2 != nil {
+		return nil, e2
+	}
+
+	result := MpOAuthAccessTokenResult{}
+	if err := json.Unmarshal(resp, &result); err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}

authorization/push_ticket.go

@@ -1,59 +0,0 @@
-/**
- * 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 authorization
-
-import (
-	"encoding/json"
-	"errors"
-
-	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
-	"gitee.com/yansen_zh/wxcomponent/utils/request"
-)
-
-// PushTicketParam 启动票据推送服务参数
-type PushTicketParam struct {
-	ComponentAppId  string `json:"component_appid"`
-	ComponentSecret string `json:"component_secret"`
-}
-
-// PushTicketResult 启动票据推送服务参数
-type PushTicketResult struct {
-	wxerr.Error
-}
-
-const (
-	apiStartPushTicket = "https://apies.weixin.qq.com/cgi-bin/component/api_start_push_ticket"
-)
-
-// StartPushTicket 启动 ticket 推送服务
-func StartPushTicket(data PushTicketParam) (*PushTicketResult, error) {
-	if data.ComponentAppId == "" {
-		return nil, errors.New("启动 ticket 推送服务 第三方平台的 appid 不能为空")
-	}
-
-	if data.ComponentSecret == "" {
-		return nil, errors.New("启动 ticket 推送服务 第三方平台的 appsecret 不能为空")
-	}
-
-	resp, e2 := request.PostJSON(apiStartPushTicket, nil, data)
-	if e2 != nil {
-		return nil, e2
-	}
-
-	result := PushTicketResult{}
-	if err := json.Unmarshal(resp, &result); err != nil {
-		return nil, err
-	}
-
-	return &result, nil
-}

authorizer/set_authorizer_option.go

@@ -1,77 +0,0 @@
-/**
- * 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 authorizer
-
-import (
-	"encoding/json"
-	"errors"
-	"net/url"
-
-	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
-	"gitee.com/yansen_zh/wxcomponent/utils/request"
-)
-
-// SetAuthorizerOptionParam 设置授权方选项信息参数
-type SetAuthorizerOptionParam struct {
-	ComponentAppId  string `json:"component_appid"`
-	AuthorizerAppId string `json:"authorizer_appid"`
-	OptionName      string `json:"option_name"`
-	OptionValue     string `json:"option_value"`
-}
-
-// SetAuthorizerOptionResult 设置授权方选项信息结果
-type SetAuthorizerOptionResult struct {
-	wxerr.Error
-}
-
-const (
-	apiSetAuthorizerOption = "https://apies.weixin.qq.com/cgi-bin/component/api_set_authorizer_option"
-)
-
-// SetAuthorizerOption 设置授权方选项信息
-func SetAuthorizerOption(componentAccessToken string, data SetAuthorizerOptionParam) (*SetAuthorizerOptionResult, error) {
-	if componentAccessToken == "" {
-		return nil, errors.New("设置授权方选项信息 第三方平台的 component_access_token 不能为空")
-	}
-
-	if data.ComponentAppId == "" {
-		return nil, errors.New("设置授权方选项信息 授权公众号或小程序的 appid 不能为空")
-	}
-
-	if data.AuthorizerAppId == "" {
-		return nil, errors.New("设置授权方选项信息 第三方平台的 appid 不能为空")
-	}
-
-	if data.OptionName == "" {
-		return nil, errors.New("设置授权方选项信息 选项名称 不能为空")
-	}
-
-	if data.OptionValue == "" {
-		return nil, errors.New("设置授权方选项信息 设置的选项值 不能为空")
-	}
-
-	queryParam := url.Values{}
-	queryParam.Set("component_access_token", componentAccessToken)
-
-	resp, e2 := request.PostJSON(apiSetAuthorizerOption, &queryParam, data)
-	if e2 != nil {
-		return nil, e2
-	}
-
-	result := SetAuthorizerOptionResult{}
-	if err := json.Unmarshal(resp, &result); err != nil {
-		return nil, err
-	}
-
-	return &result, nil
-}

config/config.go

@@ -0,0 +1,28 @@
+package config
+
+import "time"
+
+type Config interface {
+	// GetAppID 获取平台 APPID
+	GetAppID() string
+
+	// GetAppSecret 获取平台 APPSECRET
+	GetAppSecret() string
+
+	// GetAppSecret 获取平台消息校验Token
+	GetMsgToken() string
+
+	// GetToken 获取 Token
+	GetAccessToken() string
+
+	// RefreshToken 刷新 Token
+	RefreshToken(token string, expire time.Time) error
+
+	// GetTicket 获取票据
+	GetVerifyTicket() string
+
+	// RefreshTicket 刷新票据
+	RefreshVerifyTicket(ticket string, expire time.Time) error
+}
+
+var conf Config

config/index.go

@@ -0,0 +1,59 @@
+package config
+
+import (
+	"errors"
+	"time"
+)
+
+// Init 初始化平台实例
+func Init(config Config) error {
+	if config == nil {
+		return errors.New("平台初始化参数不能为空")
+	}
+
+	appID := config.GetAppID()
+	secret := config.GetAppSecret()
+	token := config.GetMsgToken()
+
+	if appID == "" || secret == "" || token == "" {
+		return errors.New("平台组件初始化内容不能为空")
+	}
+
+	conf = config
+	return nil
+}
+
+// GetAppID 获取平台 APPID
+func GetAppID() string {
+	return conf.GetAppID()
+}
+
+// GetAppSecret 获取平台 APPSECRET
+func GetAppSecret() string {
+	return conf.GetAppSecret()
+}
+
+// GetAppSecret 获取平台消息校验Token
+func GetMsgToken() string {
+	return conf.GetMsgToken()
+}
+
+// GetToken 获取 Token
+func GetAccessToken() string {
+	return conf.GetAccessToken()
+}
+
+// RefreshToken 刷新 Token
+func RefreshToken(token string, expire time.Time) error {
+	return conf.RefreshToken(token, expire)
+}
+
+// GetTicket 获取票据
+func GetVerifyTicket() string {
+	return conf.GetVerifyTicket()
+}
+
+// RefreshTicket 刷新票据
+func RefreshVerifyTicket(ticket string, expire time.Time) error {
+	return conf.RefreshVerifyTicket(ticket, expire)
+}

mp/webpage.go

@@ -1,37 +0,0 @@
-package mp
-
-import (
-	"net/url"
-	"strings"
-
-	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
-)
-
-// MpWebAccessTokenResult 网页授权, 通过 code 换取 access_token 返回值
-type MpWebAccessTokenResult struct {
-	wxerr.Error
-	// AccessToken 接口调用凭证
-	AccessToken string `json:"access_token"`
-	// ExpiresIn access_token 接口调用凭证超时时间，单位（秒）
-	ExpiresIn int `json:"expires_in"`
-	// RefreshToken 用户刷新 access_token
-	RefreshToken string `json:"refresh_token"`
-	// Openid 授权用户唯一标识
-	OpenID string `json:"openid"`
-	// Scope 用户授权的作用域，使用逗号（,）分隔
-	Scope string `json:"scope"`
-}
-
-// GetAuthorizationCodeLink 代公众号发起网页授权, 构造授权链接
-// redirectURI 必须是未经编码的原始网址字符串
-func GetAuthorizationCodeLink(componentAppID, appID, redirectURI, state string, scopes ...string) string {
-	params := url.Values{}
-	params.Set("appid", appID)
-	params.Set("redirect_uri", redirectURI)
-	params.Set("response_type", "code")
-	params.Set("scope", strings.Join(scopes, ","))
-	params.Set("state", state)
-	params.Set("component_appid", componentAppID)
-
-	return "https://open.weixin.qq.com/connect/oauth2/authorize?" + params.Encode()
-}

utils/request/request.go

@@ -24,18 +24,26 @@ import (
 	"gitee.com/yansen_zh/wxcomponent/utils/log"
 )
 
-func post(url string, contentType string, body []byte) ([]byte, error) {
+func Fetch(method, url string, contentType string, body []byte) ([]byte, error) {
 
 	logger := log.GetLogger()
-	logger.Info("发送请求: ", url)
+	logger.Info("发送请求: [", method, "] ", url)
 
 	if len(body) > 0 {
 		logger.Info(body)
 	}
 
-	resp, e1 := http.Post(url, contentType, bytes.NewReader(body))
-	if e1 != nil {
-		return nil, e1
+	var resp *http.Response
+	var err error
+
+	if method == "POST" {
+		resp, err = http.Post(url, contentType, bytes.NewReader(body))
+	} else {
+		resp, err = http.Get(url)
+	}
+
+	if err != nil {
+		return nil, err
 	}
 
 	if resp.StatusCode > 299 {
@@ -65,7 +73,30 @@ func PostJSON(addr string, query *url.Values, body interface{}) ([]byte, error)
 		return nil, e1
 	}
 
-	resp, e2 := post(apiURL.String(), ContentTypeJSON, data)
+	resp, e2 := Fetch("POST", apiURL.String(), ContentTypeJSON, data)
+	if e2 != nil {
+		return nil, e2
+	}
+
+	e3 := wxerr.Error{}
+	if err := json.Unmarshal(resp, &e3); err != nil {
+		return nil, err
+	}
+
+	if e3.Code != 0 {
+		return nil, e3
+	}
+
+	return resp, nil
+}
+
+func GetJSON(addr string, query *url.Values) ([]byte, error) {
+	apiURL, e0 := ParseURL(addr, query)
+	if e0 != nil {
+		return nil, e0
+	}
+
+	resp, e2 := Fetch("GET", apiURL.String(), "", nil)
 	if e2 != nil {
 		return nil, e2
 	}

utils/utils.go

@@ -0,0 +1,24 @@
+package utils
+
+import (
+	"math/rand"
+	"strings"
+	"time"
+)
+
+// RandStr 获取指定 n 长度的随机字符串
+func RandStr(n int) string {
+	arr := strings.Split("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", "")
+	arrLen := len(arr)
+	seed := time.Now().Unix()
+
+	r := rand.New(rand.NewSource(seed))
+	dst := make([]string, n)
+
+	for i := range dst {
+		p := r.Intn(arrLen)
+		dst[i] = arr[p]
+	}
+
+	return strings.Join(dst, "")
+}