change struct

api/api.go

@@ -1,34 +0,0 @@
-package api
-
-// BindComponentByPC 构建PC端授权链接
-const BindComponentByPC = "https://mp.weixin.qq.com/cgi-bin/componentloginpage"
-
-// BindComponentByH5 构建移动端授权链接
-const BindComponentByH5 = "https://mp.weixin.qq.com/safe/bindcomponent"
-
-// StartPushTicket 启动票据推送服务
-const StartPushTicket = "https://api.weixin.qq.com/cgi-bin/component/api_start_push_ticket"
-
-// ComponentToken 获取令牌
-const ComponentToken = "https://api.weixin.qq.com/cgi-bin/component/api_component_token"
-
-// CreatePreAuthCode 获取预授权码
-const CreatePreAuthCode = "https://api.weixin.qq.com/cgi-bin/component/api_create_preauthcode"
-
-// QueryAuth 获取授权信息
-const QueryAuth = "https://api.weixin.qq.com/cgi-bin/component/api_query_auth"
-
-// AuthorizerToken 获取/刷新接口调用令牌
-const AuthorizerToken = "https://api.weixin.qq.com/cgi-bin/component/api_authorizer_token"
-
-// GetAuthorizerInfo 获取授权帐号信息
-const GetAuthorizerInfo = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_info"
-
-// GetAuthorizerList 拉取所有已授权的帐号信息
-const GetAuthorizerList = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_list"
-
-// GetAuthorizerOption 获取授权方选项信息
-const GetAuthorizerOption = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_option"
-
-// SetAuthorizerOption 设置授权方选项信息
-const SetAuthorizerOption = "https://api.weixin.qq.com/cgi-bin/component/api_set_authorizer_option"

service/authorizer_info.go → authorization/authorizer_info.go

@@ -1,14 +1,12 @@
-package service
+package authorization
 
 import (
 	"encoding/json"
 	"errors"
 	"net/url"
 
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/api"
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/entities"
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/utils"
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/utils/request"
+	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
+	"gitee.com/yansen_zh/wxcomponent/utils/request"
 )
 
 // AuthorizerInfoParam 获取授权帐号信息参数
@@ -19,34 +17,33 @@ type AuthorizerInfoParam struct {
 
 // AuthorizerInfoResult 获取授权帐号信息结果
 type AuthorizerInfoResult struct {
-	entities.Error
-	AuthorizationInfo entities.AuthorizationInfo `json:"authorization_info"`
-	AuthorizerInfo    entities.AuthorizerInfo    `json:"authorizer_info"`
+	wxerr.Error
+	AuthorizationInfo AuthorizationInfo `json:"authorization_info"`
+	AuthorizerInfo    AuthorizerInfo    `json:"authorizer_info"`
 }
 
+const (
+	apiGetAuthorizerInfo = "https://apies.weixin.qq.com/cgi-bin/component/api_get_authorizer_info"
+)
+
 // GetAuthorizerInfo 获取授权帐号信息
-func GetAuthorizerInfo(componentAccessToken string, param AuthorizerInfoParam) (*AuthorizerInfoResult, error) {
+func GetAuthorizerInfo(componentAccessToken string, data AuthorizerInfoParam) (*AuthorizerInfoResult, error) {
 	if componentAccessToken == "" {
 		return nil, errors.New("获取授权帐号信息 第三方平台的 component_access_token 不能为空")
 	}
 
-	if param.ComponentAppId == "" {
+	if data.ComponentAppId == "" {
 		return nil, errors.New("获取授权帐号信息 第三方平台的 appid 不能为空")
 	}
 
-	if param.AuthorizerAppId == "" {
+	if data.AuthorizerAppId == "" {
 		return nil, errors.New("获取授权帐号信息 授权方 appid 不能为空")
 	}
 
-	data, e1 := json.Marshal(param)
-	if e1 != nil {
-		return nil, e1
-	}
-
 	queryParam := url.Values{}
 	queryParam.Set("component_access_token", componentAccessToken)
 
-	apiUrl, _ := utils.ParseURL(api.GetAuthorizerInfo, &queryParam)
+	apiUrl, _ := request.ParseURL(apiGetAuthorizerInfo, &queryParam)
 	resp, e2 := request.PostJSON(apiUrl.String(), data)
 	if e2 != nil {
 		return nil, e2

service/authorizer_token.go → authorization/authorizer_token.go

@@ -1,14 +1,12 @@
-package service
+package authorization
 
 import (
 	"encoding/json"
 	"errors"
 	"net/url"
 
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/api"
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/entities"
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/utils"
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/utils/request"
+	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
+	"gitee.com/yansen_zh/wxcomponent/utils/request"
 )
 
 // AuthorizerTokenParam 获取/刷新接口调用令牌参数
@@ -20,39 +18,38 @@ type AuthorizerTokenParam struct {
 
 // AuthorizerTokenResult 获取/刷新接口调用令牌结果
 type AuthorizerTokenResult struct {
-	entities.Error
+	wxerr.Error
 	AuthorizerAccessToken  string  `json:"authorizer_access_token"`
 	ExpiresIn              float64 `json:"expires_in"`
 	AuthorizerRefreshToken string  `json:"authorizer_refresh_token"`
 }
 
+const (
+	apiAuthorizerToken = "https://apies.weixin.qq.com/cgi-bin/component/api_authorizer_token"
+)
+
 // AuthorizerToken 获取/刷新接口调用令牌
-func AuthorizerToken(componentAccessToken string, param AuthorizerTokenParam) (*AuthorizerTokenResult, error) {
+func AuthorizerToken(componentAccessToken string, data AuthorizerTokenParam) (*AuthorizerTokenResult, error) {
 	if componentAccessToken == "" {
 		return nil, errors.New("获取/刷新接口调用令牌 第三方平台的 component_access_token 不能为空")
 	}
 
-	if param.ComponentAppId == "" {
+	if data.ComponentAppId == "" {
 		return nil, errors.New("获取/刷新接口调用令牌 第三方平台的 appid 不能为空")
 	}
 
-	if param.AuthorizerAppId == "" {
+	if data.AuthorizerAppId == "" {
 		return nil, errors.New("获取/刷新接口调用令牌 授权方 appid 不能为空")
 	}
 
-	if param.AuthorizerRefreshToken == "" {
+	if data.AuthorizerRefreshToken == "" {
 		return nil, errors.New("获取/刷新接口调用令牌 刷新令牌 不能为空")
 	}
 
-	data, e1 := json.Marshal(param)
-	if e1 != nil {
-		return nil, e1
-	}
-
 	queryParam := url.Values{}
 	queryParam.Set("component_access_token", componentAccessToken)
 
-	apiUrl, _ := utils.ParseURL(api.AuthorizerToken, &queryParam)
+	apiUrl, _ := request.ParseURL(apiAuthorizerToken, &queryParam)
 	resp, e2 := request.PostJSON(apiUrl.String(), data)
 	if e2 != nil {
 		return nil, e2

service/bind_component.go → authorization/bind_component.go

@@ -1,12 +1,11 @@
-package service
+package authorization
 
 import (
 	"errors"
 	"net/url"
 	"strconv"
 
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/api"
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/utils"
+	"gitee.com/yansen_zh/wxcomponent/utils/request"
 )
 
 // BindComponentParam 构建授权链接入参
@@ -20,6 +19,11 @@ type BindComponentParam struct {
 	BizAppId    string
 }
 
+const (
+	componentloginpage = "https://mp.weixin.qq.com/cgi-bin/componentloginpage"
+	bindcomponent      = "https://mp.weixin.qq.com/safe/bindcomponent"
+)
+
 // BindComponentByPC 构建PC端授权链接
 func BindComponentByPC(param BindComponentParam) (*url.URL, error) {
 	return BindComponent("PC", param)
@@ -65,11 +69,11 @@ func BindComponent(client string, param BindComponentParam) (*url.URL, error) {
 		queryParams.Set("auth_type", strconv.Itoa(param.AuthType))
 	}
 
-	apiUrl := api.BindComponentByPC
+	apiUrl := componentloginpage
 	if isH5 {
-		apiUrl = api.BindComponentByH5
+		apiUrl = bindcomponent
 	}
-	u, err := utils.ParseURL(apiUrl, &queryParams)
+	u, err := request.ParseURL(apiUrl, &queryParams)
 	if err != nil {
 		return nil, err
 	}

service/component_token.go → authorization/component_token.go

@@ -1,12 +1,11 @@
-package service
+package authorization
 
 import (
 	"encoding/json"
 	"errors"
 
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/api"
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/entities"
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/utils/request"
+	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
+	"gitee.com/yansen_zh/wxcomponent/utils/request"
 )
 
 // ComponentTokenParam 获取令牌参数
@@ -18,31 +17,30 @@ type ComponentTokenParam struct {
 
 // ComponentTokenResult 获取令牌结果
 type ComponentTokenResult struct {
-	entities.Error
+	wxerr.Error
 	ComponentAccessToken string  `json:"component_access_token"`
 	ExpiresIn            float64 `json:"expires_in"`
 }
 
+const (
+	apiComponentToken = "https://apies.weixin.qq.com/cgi-bin/component/api_component_token"
+)
+
 // ComponentVerifyTicket 获取令牌
-func ComponentToken(param ComponentTokenParam) (*ComponentTokenResult, error) {
-	if param.ComponentAppId == "" {
+func ComponentToken(data ComponentTokenParam) (*ComponentTokenResult, error) {
+	if data.ComponentAppId == "" {
 		return nil, errors.New("获取令牌 第三方平台的 appid 不能为空")
 	}
 
-	if param.ComponentAppSecret == "" {
+	if data.ComponentAppSecret == "" {
 		return nil, errors.New("获取令牌 第三方平台的 appsecret 不能为空")
 	}
 
-	if param.ComponentVerifyTicket == "" {
+	if data.ComponentVerifyTicket == "" {
 		return nil, errors.New("获取令牌 推送 ticket 不能为空")
 	}
 
-	data, e1 := json.Marshal(param)
-	if e1 != nil {
-		return nil, e1
-	}
-
-	resp, e2 := request.PostJSON(api.ComponentToken, data)
+	resp, e2 := request.PostJSON(apiComponentToken, data)
 	if e2 != nil {
 		return nil, e2
 	}

service/pre_auth_code.go → authorization/pre_auth_code.go

@@ -1,14 +1,12 @@
-package service
+package authorization
 
 import (
 	"encoding/json"
 	"errors"
 	"net/url"
 
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/api"
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/entities"
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/utils"
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/utils/request"
+	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
+	"gitee.com/yansen_zh/wxcomponent/utils/request"
 )
 
 // PreAuthCodeParam 获取预授权码参数
@@ -18,30 +16,29 @@ type PreAuthCodeParam struct {
 
 // PreAuthCodeResult 获取预授权码结果
 type PreAuthCodeResult struct {
-	entities.Error
+	wxerr.Error
 	PreAuthCode string  `json:"pre_auth_code"`
 	ExpiresIn   float64 `json:"expires_in"`
 }
 
+const (
+	apiCreatePreauthcode = "https://apies.weixin.qq.com/cgi-bin/component/api_create_preauthcode"
+)
+
 // CreatePreAuthCode 获取预授权码
-func CreatePreAuthCode(componentAccessToken string, param PreAuthCodeParam) (*PreAuthCodeResult, error) {
+func CreatePreAuthCode(componentAccessToken string, data PreAuthCodeParam) (*PreAuthCodeResult, error) {
 	if componentAccessToken == "" {
 		return nil, errors.New("获取预授权码 第三方平台的 component_access_token 不能为空")
 	}
 
-	if param.ComponentAppId == "" {
+	if data.ComponentAppId == "" {
 		return nil, errors.New("获取预授权码 第三方平台的 appid 不能为空")
 	}
 
-	data, e1 := json.Marshal(param)
-	if e1 != nil {
-		return nil, e1
-	}
-
 	queryParam := url.Values{}
 	queryParam.Set("component_access_token", componentAccessToken)
 
-	apiUrl, _ := utils.ParseURL(api.CreatePreAuthCode, &queryParam)
+	apiUrl, _ := request.ParseURL(apiCreatePreauthcode, &queryParam)
 	resp, e2 := request.PostJSON(apiUrl.String(), data)
 	if e2 != nil {
 		return nil, e2

service/push_ticket.go → authorization/push_ticket.go

@@ -1,12 +1,11 @@
-package service
+package authorization
 
 import (
 	"encoding/json"
 	"errors"
 
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/api"
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/entities"
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/utils/request"
+	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
+	"gitee.com/yansen_zh/wxcomponent/utils/request"
 )
 
 // PushTicketParam 启动票据推送服务参数
@@ -17,25 +16,24 @@ type PushTicketParam struct {
 
 // PushTicketResult 启动票据推送服务参数
 type PushTicketResult struct {
-	entities.Error
+	wxerr.Error
 }
 
+const (
+	apiStartPushTicket = "https://apies.weixin.qq.com/cgi-bin/component/api_start_push_ticket"
+)
+
 // StartPushTicket 启动 ticket 推送服务
-func StartPushTicket(param PushTicketParam) (*PushTicketResult, error) {
-	if param.ComponentAppId == "" {
+func StartPushTicket(data PushTicketParam) (*PushTicketResult, error) {
+	if data.ComponentAppId == "" {
 		return nil, errors.New("启动 ticket 推送服务 第三方平台的 appid 不能为空")
 	}
 
-	if param.ComponentSecret == "" {
+	if data.ComponentSecret == "" {
 		return nil, errors.New("启动 ticket 推送服务 第三方平台的 appsecret 不能为空")
 	}
 
-	data, e1 := json.Marshal(param)
-	if e1 != nil {
-		return nil, e1
-	}
-
-	resp, e2 := request.PostJSON(api.StartPushTicket, data)
+	resp, e2 := request.PostJSON(apiStartPushTicket, data)
 	if e2 != nil {
 		return nil, e2
 	}

service/query_auth.go → authorization/query_auth.go

@@ -1,14 +1,12 @@
-package service
+package authorization
 
 import (
 	"encoding/json"
 	"errors"
 	"net/url"
 
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/api"
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/entities"
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/utils"
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/utils/request"
+	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
+	"gitee.com/yansen_zh/wxcomponent/utils/request"
 )
 
 // QueryAuthParam 获取授权信息参数
@@ -19,33 +17,32 @@ type QueryAuthParam struct {
 
 // QueryAuthResult 获取授权信息结果
 type QueryAuthResult struct {
-	entities.Error
-	AuthorizationInfo entities.AuthorizationInfo `json:"authorization_info"`
+	wxerr.Error
+	AuthorizationInfo AuthorizationInfo `json:"authorization_info"`
 }
 
+const (
+	apiQueryAuth = "https://apies.weixin.qq.com/cgi-bin/component/api_query_auth"
+)
+
 // QueryAuth 获取授权信息
-func QueryAuth(componentAccessToken string, param QueryAuthParam) (*QueryAuthResult, error) {
+func QueryAuth(componentAccessToken string, data QueryAuthParam) (*QueryAuthResult, error) {
 	if componentAccessToken == "" {
 		return nil, errors.New("获取授权信息 第三方平台的 component_access_token 不能为空")
 	}
 
-	if param.ComponentAppId == "" {
+	if data.ComponentAppId == "" {
 		return nil, errors.New("获取授权信息 第三方平台的 appid 不能为空")
 	}
 
-	if param.AuthorizationCode == "" {
+	if data.AuthorizationCode == "" {
 		return nil, errors.New("获取授权信息 授权码 不能为空")
 	}
 
-	data, e1 := json.Marshal(param)
-	if e1 != nil {
-		return nil, e1
-	}
-
 	queryParam := url.Values{}
 	queryParam.Set("component_access_token", componentAccessToken)
 
-	apiUrl, _ := utils.ParseURL(api.QueryAuth, &queryParam)
+	apiUrl, _ := request.ParseURL(apiQueryAuth, &queryParam)
 	resp, e2 := request.PostJSON(apiUrl.String(), data)
 	if e2 != nil {
 		return nil, e2

authorization/types.go

@@ -0,0 +1,77 @@
+package authorization
+
+// Enum 通用枚举类型
+type Enum struct {
+	ID float64 `json:"id"`
+}
+
+// BusinessInfo 功能的开通状况（0代表未开通，1代表已开通）
+type BusinessInfo struct {
+	OpenStore float64 `json:"open_store"`
+	OpenScan  float64 `json:"open_scan"`
+	OpenPay   float64 `json:"open_pay"`
+	OpenCard  float64 `json:"open_card"`
+	OpenShake float64 `json:"open_shake"`
+}
+
+// FuncInfo 权限
+type FuncInfo struct {
+	FuncscopeCategory Enum `json:"funcscope_category"`
+}
+
+// MiniProgramNetwork 小程序配置的合法域名信息
+type MiniProgramNetwork struct {
+	RequestDomain   []string `json:"RequestDomain"`
+	WsRequestDomain []string `json:"WsRequestDomain"`
+	UploadDomain    []string `json:"UploadDomain"`
+	DownloadDomain  []string `json:"DownloadDomain"`
+	BizDomain       []string `json:"BizDomain"`
+	UDPDomain       []string `json:"UDPDomain"`
+}
+
+// MiniProgramCategory 小程序配置的类目信息
+type MiniProgramCategory struct {
+	First  string `json:"first"`
+	Second string `json:"second"`
+}
+
+// MiniProgramInfo 小程序配置
+type MiniProgramInfo struct {
+	Network    MiniProgramNetwork    `json:"network"`
+	Categories []MiniProgramCategory `json:"categories"`
+}
+
+// AuthorizerInfo 公众号/小程序帐号信息
+type AuthorizerInfo struct {
+	NickName        string          `json:"nick_name"`
+	HeadImg         string          `json:"head_img"`
+	ServiceTypeInfo Enum            `json:"service_type_info"`
+	VerifyTypeInfo  Enum            `json:"verify_type_info"`
+	UserName        string          `json:"user_name"`
+	PrincipalName   string          `json:"principal_name"`
+	Signature       string          `json:"signature"`
+	Alias           string          `json:"alias"`
+	BusinessInfo    BusinessInfo    `json:"business_info"`
+	QrcodeUrl       string          `json:"qrcode_url"`
+	MiniProgramInfo MiniProgramInfo `json:"MiniProgramInfo"`
+}
+
+// AuthorizationInfo 授权信息
+type AuthorizationInfo struct {
+	AuthorizerAppId        string     `json:"authorizer_appid"`
+	AuthorizerAccessToken  string     `json:"authorizer_access_token"`
+	ExpiresIn              float64    `json:"expires_in"`
+	AuthorizerRefreshToken string     `json:"authorizer_refresh_token"`
+	FuncInfo               []FuncInfo `json:"func_info"`
+}
+
+// AuthorizationChangeNotice 授权变更通知
+type AuthorizationChangeNotice struct {
+	AppId                        string  `json:"AppId"`
+	CreateTime                   float64 `json:"CreateTime"`
+	InfoType                     string  `json:"InfoType"`
+	AuthorizerAppid              string  `json:"AuthorizerAppid"`
+	AuthorizationCode            string  `json:"AuthorizationCode"`
+	AuthorizationCodeExpiredTime float64 `json:"AuthorizationCodeExpiredTime"`
+	PreAuthCode                  string  `json:"PreAuthCode"`
+}

service/verify_ticket.go → authorization/verify_ticket.go

@@ -1,9 +1,9 @@
-package service
+package authorization
 
 import (
 	"encoding/xml"
 
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/utils/encrypt"
+	"gitee.com/yansen_zh/wxcomponent/utils/encrypt"
 )
 
 // ComponentVerifyTicketResult 获取验证票据结果

service/authorizer_list.go → authorizer/authorizer_list.go

@@ -1,14 +1,12 @@
-package service
+package authorizer
 
 import (
 	"encoding/json"
 	"errors"
 	"net/url"
 
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/api"
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/entities"
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/utils"
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/utils/request"
+	wxerr "gitee.com/yansen_zh/wxcomponent/errors"
+	"gitee.com/yansen_zh/wxcomponent/utils/request"
 )
 
 // AuthorizerListParam 拉取所有已授权的帐号信息参数
@@ -20,42 +18,41 @@ type AuthorizerListParam struct {
 
 // AuthorizerListResult 拉取所有已授权的帐号信息结果
 type AuthorizerListResult struct {
-	entities.Error
-	TotalCount float64                        `json:"total_count"`
-	List       []entities.AuthorizerBasicInfo `json:"list"`
+	wxerr.Error
+	TotalCount float64               `json:"total_count"`
+	List       []AuthorizerBasicInfo `json:"list"`
 }
 
+const (
+	apiGetAuthorizerList = "https://apies.weixin.qq.com/cgi-bin/component/api_get_authorizer_list"
+)
+
 // AuthorizerList 拉取所有已授权的帐号信息
-func AuthorizerList(componentAccessToken string, param AuthorizerListParam) (*AuthorizerListResult, error) {
+func AuthorizerList(componentAccessToken string, data AuthorizerListParam) (*AuthorizerListResult, error) {
 	if componentAccessToken == "" {
 		return nil, errors.New("拉取所有已授权的帐号信息 第三方平台的 component_access_token 不能为空")
 	}
 
-	if param.ComponentAppId == "" {
+	if data.ComponentAppId == "" {
 		return nil, errors.New("拉取所有已授权的帐号信息 第三方平台的 appid 不能为空")
 	}
 
-	if param.Offset < 0 {
-		param.Offset = 0
-	}
-
-	if param.Count < 0 {
-		param.Count = 100
+	if data.Offset < 0 {
+		data.Offset = 0
 	}
 
-	if param.Count > 500 {
-		param.Count = 500
+	if data.Count < 0 {
+		data.Count = 100
 	}
 
-	data, e1 := json.Marshal(param)
-	if e1 != nil {
-		return nil, e1
+	if data.Count > 500 {
+		data.Count = 500
 	}
 
 	queryParam := url.Values{}
 	queryParam.Set("component_access_token", componentAccessToken)
 
-	apiUrl, _ := utils.ParseURL(api.GetAuthorizerList, &queryParam)
+	apiUrl, _ := request.ParseURL(apiGetAuthorizerList, &queryParam)
 	resp, e2 := request.PostJSON(apiUrl.String(), data)
 	if e2 != nil {
 		return nil, e2

authorizer/get_authorizer_option.go

@@ -0,0 +1,68 @@
+package authorizer
+
+import (
+	"encoding/json"
+	"errors"
+	"net/url"
+
+	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
+	AuthorizerAppId string `json:"authorizer_appid"`
+	OptionName      string `json:"option_name"`
+	OptionValue     string `json:"option_value"`
+}
+
+const (
+	apiGetAuthorizerOption = "https://apies.weixin.qq.com/cgi-bin/component/api_get_authorizer_option"
+)
+
+// 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 == "" {
+		return nil, errors.New("获取授权方选项信息 第三方平台的 appid 不能为空")
+	}
+
+	if data.OptionName == "" {
+		return nil, errors.New("获取授权方选项信息 选项名称 不能为空")
+	}
+
+	queryParam := url.Values{}
+	queryParam.Set("component_access_token", componentAccessToken)
+
+	apiUrl, _ := request.ParseURL(apiGetAuthorizerOption, &queryParam)
+	resp, e2 := request.PostJSON(apiUrl.String(), data)
+	if e2 != nil {
+		return nil, e2
+	}
+
+	result := GetAuthorizerOptionResult{}
+	if err := json.Unmarshal(resp, &result); err != nil {
+		return nil, err
+	}
+
+	if result.Code != 0 {
+		return &result, result.Error
+	}
+
+	return &result, nil
+}

authorizer/set_authorizer_option.go

@@ -0,0 +1,70 @@
+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)
+
+	apiUrl, _ := request.ParseURL(apiSetAuthorizerOption, &queryParam)
+	resp, e2 := request.PostJSON(apiUrl.String(), data)
+	if e2 != nil {
+		return nil, e2
+	}
+
+	result := SetAuthorizerOptionResult{}
+	if err := json.Unmarshal(resp, &result); err != nil {
+		return nil, err
+	}
+
+	if result.Code != 0 {
+		return &result, result.Error
+	}
+
+	return &result, nil
+}

authorizer/types.go

@@ -0,0 +1,8 @@
+package authorizer
+
+// AuthorizerBasicInfo 公众号/小程序帐号基本信息
+type AuthorizerBasicInfo struct {
+	AuthorizerAppid string  `json:"authorizer_appid"`
+	RefreshToken    string  `json:"refresh_token"`
+	AuthTime        float64 `json:"auth_time"`
+}

entities/authorization_change_notice.go

@@ -1,12 +0,0 @@
-package entities
-
-// AuthorizationChangeNotice 授权变更通知
-type AuthorizationChangeNotice struct {
-	AppId                        string  `json:"AppId"`
-	CreateTime                   float64 `json:"CreateTime"`
-	InfoType                     string  `json:"InfoType"`
-	AuthorizerAppid              string  `json:"AuthorizerAppid"`
-	AuthorizationCode            string  `json:"AuthorizationCode"`
-	AuthorizationCodeExpiredTime float64 `json:"AuthorizationCodeExpiredTime"`
-	PreAuthCode                  string  `json:"PreAuthCode"`
-}

entities/authorization_info.go

@@ -1,10 +0,0 @@
-package entities
-
-// AuthorizationInfo 授权信息
-type AuthorizationInfo struct {
-	AuthorizerAppId        string     `json:"authorizer_appid"`
-	AuthorizerAccessToken  string     `json:"authorizer_access_token"`
-	ExpiresIn              float64    `json:"expires_in"`
-	AuthorizerRefreshToken string     `json:"authorizer_refresh_token"`
-	FuncInfo               []FuncInfo `json:"func_info"`
-}

entities/authorizer_info.go

@@ -1,23 +0,0 @@
-package entities
-
-// AuthorizerBasicInfo 公众号/小程序帐号基本信息
-type AuthorizerBasicInfo struct {
-	AuthorizerAppid string  `json:"authorizer_appid"`
-	RefreshToken    string  `json:"refresh_token"`
-	AuthTime        float64 `json:"auth_time"`
-}
-
-// AuthorizerInfo 公众号/小程序帐号信息
-type AuthorizerInfo struct {
-	NickName        string          `json:"nick_name"`
-	HeadImg         string          `json:"head_img"`
-	ServiceTypeInfo Enum            `json:"service_type_info"`
-	VerifyTypeInfo  Enum            `json:"verify_type_info"`
-	UserName        string          `json:"user_name"`
-	PrincipalName   string          `json:"principal_name"`
-	Signature       string          `json:"signature"`
-	Alias           string          `json:"alias"`
-	BusinessInfo    BusinessInfo    `json:"business_info"`
-	QrcodeUrl       string          `json:"qrcode_url"`
-	MiniProgramInfo MiniProgramInfo `json:"MiniProgramInfo"`
-}

entities/business_info.go

@@ -1,10 +0,0 @@
-package entities
-
-// BusinessInfo 功能的开通状况（0代表未开通，1代表已开通）
-type BusinessInfo struct {
-	OpenStore float64 `json:"open_store"`
-	OpenScan  float64 `json:"open_scan"`
-	OpenPay   float64 `json:"open_pay"`
-	OpenCard  float64 `json:"open_card"`
-	OpenShake float64 `json:"open_shake"`
-}

entities/entity.go

@@ -1,6 +0,0 @@
-package entities
-
-// Enum 通用枚举类型
-type Enum struct {
-	ID float64 `json:"id"`
-}

entities/func_info.go

@@ -1,6 +0,0 @@
-package entities
-
-// FuncInfo 权限
-type FuncInfo struct {
-	FuncscopeCategory Enum `json:"funcscope_category"`
-}

entities/mini_program_info.go

@@ -1,23 +0,0 @@
-package entities
-
-// MiniProgramNetwork 小程序配置的合法域名信息
-type MiniProgramNetwork struct {
-	RequestDomain   []string `json:"RequestDomain"`
-	WsRequestDomain []string `json:"WsRequestDomain"`
-	UploadDomain    []string `json:"UploadDomain"`
-	DownloadDomain  []string `json:"DownloadDomain"`
-	BizDomain       []string `json:"BizDomain"`
-	UDPDomain       []string `json:"UDPDomain"`
-}
-
-// MiniProgramCategory 小程序配置的类目信息
-type MiniProgramCategory struct {
-	First  string `json:"first"`
-	Second string `json:"second"`
-}
-
-// MiniProgramInfo 小程序配置
-type MiniProgramInfo struct {
-	Network    MiniProgramNetwork    `json:"network"`
-	Categories []MiniProgramCategory `json:"categories"`
-}

entities/error.go → errors/error.go

@@ -1,4 +1,4 @@
-package entities
+package errors
 
 import "fmt"
 

go.mod

@@ -1,3 +1,3 @@
-module gitee.com/yansen_zh/wechat-oplatform-sdk
+module gitee.com/yansen_zh/wxcomponent
 
 go 1.17

init.go

@@ -0,0 +1,10 @@
+package wxcomponent
+
+import (
+	"gitee.com/yansen_zh/wxcomponent/utils/log"
+)
+
+// InitLogger 初始化 Logger
+func InitLogger(logger log.Logger) {
+	log.SetLogger(logger)
+}

interfaces/log.go

@@ -1,9 +0,0 @@
-package interfaces
-
-type Logger interface {
-	// Error 级别日志
-	Error(...interface{})
-
-	// Info 级别错误
-	Info(...interface{})
-}

service/authorizer_option.go

@@ -1,132 +0,0 @@
-package service
-
-import (
-	"encoding/json"
-	"errors"
-	"net/url"
-
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/api"
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/entities"
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/utils"
-	"gitee.com/yansen_zh/wechat-oplatform-sdk/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 {
-	entities.Error
-	AuthorizerAppId string `json:"authorizer_appid"`
-	OptionName      string `json:"option_name"`
-	OptionValue     string `json:"option_value"`
-}
-
-// GetAuthorizerOption 获取授权方选项信息
-func GetAuthorizerOption(componentAccessToken string, param GetAuthorizerOptionParam) (*GetAuthorizerOptionResult, error) {
-	if componentAccessToken == "" {
-		return nil, errors.New("获取授权方选项信息 第三方平台的 component_access_token 不能为空")
-	}
-
-	if param.ComponentAppId == "" {
-		return nil, errors.New("获取授权方选项信息 授权公众号或小程序的 appid 不能为空")
-	}
-
-	if param.AuthorizerAppId == "" {
-		return nil, errors.New("获取授权方选项信息 第三方平台的 appid 不能为空")
-	}
-
-	if param.OptionName == "" {
-		return nil, errors.New("获取授权方选项信息 选项名称 不能为空")
-	}
-
-	data, e1 := json.Marshal(param)
-	if e1 != nil {
-		return nil, e1
-	}
-
-	queryParam := url.Values{}
-	queryParam.Set("component_access_token", componentAccessToken)
-
-	apiUrl, _ := utils.ParseURL(api.GetAuthorizerOption, &queryParam)
-	resp, e2 := request.PostJSON(apiUrl.String(), data)
-	if e2 != nil {
-		return nil, e2
-	}
-
-	result := GetAuthorizerOptionResult{}
-	if err := json.Unmarshal(resp, &result); err != nil {
-		return nil, err
-	}
-
-	if result.Code != 0 {
-		return &result, result.Error
-	}
-
-	return &result, nil
-}
-
-// 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 {
-	entities.Error
-}
-
-// SetAuthorizerOption 设置授权方选项信息
-func SetAuthorizerOption(componentAccessToken string, param SetAuthorizerOptionParam) (*SetAuthorizerOptionResult, error) {
-	if componentAccessToken == "" {
-		return nil, errors.New("设置授权方选项信息 第三方平台的 component_access_token 不能为空")
-	}
-
-	if param.ComponentAppId == "" {
-		return nil, errors.New("设置授权方选项信息 授权公众号或小程序的 appid 不能为空")
-	}
-
-	if param.AuthorizerAppId == "" {
-		return nil, errors.New("设置授权方选项信息 第三方平台的 appid 不能为空")
-	}
-
-	if param.OptionName == "" {
-		return nil, errors.New("设置授权方选项信息 选项名称 不能为空")
-	}
-
-	if param.OptionValue == "" {
-		return nil, errors.New("设置授权方选项信息 设置的选项值 不能为空")
-	}
-
-	data, e1 := json.Marshal(param)
-	if e1 != nil {
-		return nil, e1
-	}
-
-	queryParam := url.Values{}
-	queryParam.Set("component_access_token", componentAccessToken)
-
-	apiUrl, _ := utils.ParseURL(api.SetAuthorizerOption, &queryParam)
-	resp, e2 := request.PostJSON(apiUrl.String(), data)
-	if e2 != nil {
-		return nil, e2
-	}
-
-	result := SetAuthorizerOptionResult{}
-	if err := json.Unmarshal(resp, &result); err != nil {
-		return nil, err
-	}
-
-	if result.Code != 0 {
-		return &result, result.Error
-	}
-
-	return &result, nil
-}

utils/log/logger.go

@@ -0,0 +1,19 @@
+package log
+
+type Logger interface {
+	// Error 级别日志
+	Error(...interface{})
+
+	// Info 级别错误
+	Info(...interface{})
+}
+
+var inst Logger
+
+func SetLogger(logger Logger) {
+	inst = logger
+}
+
+func GetLogger() Logger {
+	return inst
+}

utils/request/request.go

@@ -2,12 +2,23 @@ package request
 
 import (
 	"bytes"
+	"encoding/json"
 	"errors"
 	"io"
 	"net/http"
+
+	"gitee.com/yansen_zh/wxcomponent/utils/log"
 )
 
 func post(url string, contentType string, body []byte) ([]byte, error) {
+
+	logger := log.GetLogger()
+	logger.Info("发送请求: ", url)
+
+	if len(body) > 0 {
+		logger.Info(body)
+	}
+
 	resp, e1 := http.Post(url, contentType, bytes.NewReader(body))
 	if e1 != nil {
 		return nil, e1
@@ -23,12 +34,18 @@ func post(url string, contentType string, body []byte) ([]byte, error) {
 		return nil, e2
 	}
 
+	logger.Info("微信端返回: ", body)
+
 	return body, nil
 }
 
 // PostJSON 使用 POST 方式发送 json 数据
-func PostJSON(url string, body []byte) ([]byte, error) {
+func PostJSON(url string, body interface{}) ([]byte, error) {
+	data, e1 := json.Marshal(body)
+	if e1 != nil {
+		return nil, e1
+	}
 
-	return post(url, ContentTypeJSON, body)
+	return post(url, ContentTypeJSON, data)
 
 }

utils/url.go → utils/request/url.go

@@ -1,4 +1,4 @@
-package utils
+package request
 
 import "net/url"