feats

api/authorization/bind_component.go

@@ -20,32 +20,11 @@ import (
 	"gitee.com/yansen_zh/wxcomponent/config"
 )
 
-// AuthLinkParam 构建授权链接入参
-type AuthLinkParam struct {
-	ComponentAppId string
-	PreAuthCode    string
-
-	// RedirectUri 不需要转码
-	RedirectUri string
-	AuthType    int
-	BizAppId    string
-}
-
 const (
 	componentloginpage = "https://mp.weixin.qq.com/cgi-bin/componentloginpage"
 	bindcomponent      = "https://mp.weixin.qq.com/safe/bindcomponent"
 )
 
-// GetPCAuthLink 构建PC端授权链接
-func GetPCAuthLink(preAuthCode, redirectURI, bizAppID string, authType int) (string, error) {
-	return GetAuthLink("PC", preAuthCode, redirectURI, bizAppID, authType)
-}
-
-// GetH5AuthLink 构建H5端授权链接
-func GetH5AuthLink(preAuthCode, redirectURI, bizAppID string, authType int) (string, error) {
-	return GetAuthLink("H5", preAuthCode, redirectURI, bizAppID, authType)
-}
-
 // GetAuthLink 构建授权链接
 // redirectURI 回调地址必须是未经过处理的原始URL字符串
 func GetAuthLink(client, preAuthCode, redirectURI, bizAppID string, authType int) (string, error) {

api/authorization/types.go

@@ -70,7 +70,7 @@ type AuthorizerInfo struct {
 
 // AuthorizationInfo 授权信息
 type AuthorizationInfo struct {
-	AuthorizerAppId        string     `json:"authorizer_appid"`
+	AuthorizerAppID        string     `json:"authorizer_appid"`
 	AuthorizerAccessToken  string     `json:"authorizer_access_token"`
 	ExpiresIn              int        `json:"expires_in"`
 	AuthorizerRefreshToken string     `json:"authorizer_refresh_token"`
@@ -79,7 +79,7 @@ type AuthorizationInfo struct {
 
 // AuthorizationChangeNotice 授权变更通知
 type AuthorizationChangeNotice struct {
-	AppId                        string `json:"AppId"`
+	AppID                        string `json:"AppId"`
 	CreateTime                   int64  `json:"CreateTime"`
 	InfoType                     string `json:"InfoType"`
 	AuthorizerAppid              string `json:"AuthorizerAppid"`

api/authorization/verify_ticket.go

@@ -1,37 +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/xml"
-)
-
-// VerifyTicketResult 获取验证票据结果
-type VerifyTicketResult struct {
-	AppId                 string `xml:"AppId"`
-	CreateTime            int64  `xml:"CreateTime"`
-	InfoType              string `xml:"InfoType"`
-	ComponentVerifyTicket string `xml:"ComponentVerifyTicket"`
-}
-
-// ParseVerifyTicket 获取验证票据
-// data 是解密之后的数据
-func ParseVerifyTicket(data []byte) (*VerifyTicketResult, error) {
-	res := VerifyTicketResult{}
-
-	if e := xml.Unmarshal(data, &res); e != nil {
-		return nil, e
-	}
-
-	return &res, nil
-}

api/authorizer/get_authorizer_option.go

@@ -25,7 +25,7 @@ import (
 // GetAuthorizerOptionResult 获取授权方选项信息结果
 type GetAuthorizerOptionResult struct {
 	wxerr.Error
-	AuthorizerAppId string `json:"authorizer_appid"`
+	AuthorizerAppID string `json:"authorizer_appid"`
 	OptionName      string `json:"option_name"`
 	OptionValue     string `json:"option_value"`
 }

authorization.go

@@ -20,7 +20,13 @@ import (
 
 // 授权与Token
 
-// RefreshToken 刷新Token
+// VerifyTicket 验证票据
+func VerifyTicket(ticket string) error {
+	expire := utils.GetExpireTime(12 * 3600) // component_verify_ticket 的有效时间为12小时
+	return config.RefreshVerifyTicket(ticket, expire)
+}
+
+// RefreshToken 获取令牌
 // 主要是定时任务调用
 func RefreshToken() error {
 	result, err := authorization.GetComponentToken()
@@ -37,3 +43,55 @@ func RefreshToken() error {
 
 	return nil
 }
+
+// CreateAuthLink 自建授权链接, client 默认是 PC 端, 如果是移动端, 需要传入 H5。
+// url 为需要跳转的结果页, 必须是原始的值, 不能经过 encode 处理.
+// appID 为小程序或者公众号ID, 可以不传
+func CreateAuthLink(client, url, appID string) (string, error) {
+	preAuth, err := authorization.CreatePreAuthCode()
+	if err != nil {
+		return "", err
+	}
+
+	return authorization.GetAuthLink(client, preAuth.PreAuthCode, url, appID, 3)
+}
+
+// RefreshAuthorizerInfo 刷新授权对象信息
+func RefreshAuthorizerInfo(authCode string, authorizer config.AuthorizerConfig) error {
+	res, err := authorization.GetQueryAuth(authCode)
+	if err != nil {
+		return err
+	}
+
+	authInfo := res.AuthorizationInfo
+	appID := authInfo.AuthorizerAppID
+	expire := utils.GetExpireTime(authInfo.ExpiresIn)
+
+	authorizer.RefreshFuncInfo(appID, authInfo.FuncInfo)
+	if err := authorizer.RefreshToken(appID, authInfo.AuthorizerAccessToken, authInfo.AuthorizerRefreshToken, expire); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// RefreshAuthorizerToken 刷新接口调用令牌
+func RefreshAuthorizerToken(appID string, authorizer config.AuthorizerConfig) error {
+	res, err := authorization.RefreshAuthorizerToken(appID, authorizer.GetRefreshToken(appID))
+	if err != nil {
+		return err
+	}
+
+	expire := utils.GetExpireTime(res.ExpiresIn)
+
+	if err := authorizer.RefreshToken(appID, res.AuthorizerAccessToken, res.AuthorizerRefreshToken, expire); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// GetAuthorizerInfo 获取授权帐号信息
+func GetAuthorizerInfo(appID string) (*authorization.AuthorizerInfoResult, error) {
+	return authorization.GetAuthorizerInfo(appID)
+}

config/config.go

@@ -12,7 +12,11 @@
 
 package config
 
-import "time"
+import (
+	"time"
+
+	"gitee.com/yansen_zh/wxcomponent/api/authorization"
+)
 
 type Config interface {
 	// GetAppID 获取平台 APPID
@@ -35,6 +39,27 @@ type Config interface {
 
 	// RefreshTicket 刷新票据
 	RefreshVerifyTicket(ticket string, expire time.Time) error
+
+	// GetPushTicketState 是否开启票据推送服务
+	GetPushTicketState() bool
+
+	// RefreshPushTicketState 刷新票据推送服务状态
+	RefreshPushTicketState(state bool)
 }
 
 var conf Config
+
+// AuthorizerConfig 公众号或小程序配置
+type AuthorizerConfig interface {
+	// GetToken 获取 Token
+	GetAccessToken(appID string) string
+
+	// GetRefreshToken 获取 RefreshToken
+	GetRefreshToken(appID string) string
+
+	// RefreshToken 刷新 Token
+	RefreshToken(appID, token, refreshToken string, expire time.Time) error
+
+	// RefreshFuncInfo 刷新权限集列表
+	RefreshFuncInfo(appID string, lst []authorization.FuncInfo)
+}

config/index.go

@@ -74,3 +74,13 @@ func GetVerifyTicket() string {
 func RefreshVerifyTicket(ticket string, expire time.Time) error {
 	return conf.RefreshVerifyTicket(ticket, expire)
 }
+
+// GetPushTicketState 是否开启票据推送服务
+func GetPushTicketState() bool {
+	return conf.GetPushTicketState()
+}
+
+// RefreshPushTicketState 刷新票据推送服务状态
+func RefreshPushTicketState(state bool) {
+	conf.RefreshPushTicketState(state)
+}

decode.go

@@ -0,0 +1,62 @@
+/**
+ * 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 wxcomponent
+
+import (
+	"encoding/base64"
+	"encoding/xml"
+
+	"gitee.com/yansen_zh/wxcomponent/utils/encrypt"
+	"gitee.com/yansen_zh/wxcomponent/utils/log"
+)
+
+// EncryptMessage 待解密数据
+type EncryptMessage struct {
+	XMLName    xml.Name `xml:"xml"`
+	ToUserName string   `xml:"ToUserName"`
+	Encrypt    string   `xml:"Encrypt"`
+}
+
+// DecodeMessage 解密消息
+func DecodeMessage(src []byte) (*encrypt.XMLMap, error) {
+	log.Info("解码 xml 数据: ", string(src))
+
+	msg := EncryptMessage{}
+	if err := xml.Unmarshal(src, &msg); err != nil {
+		log.Error("解码 xml 数据失败: ", err.Error())
+		return nil, err
+	}
+
+	bt1, e1 := base64.StdEncoding.DecodeString(msg.Encrypt)
+	if e1 != nil {
+		log.Error("解码 base 数据失败: ", e1.Error())
+		log.Error("原始 base64 数据: ", msg.Encrypt)
+		return nil, e1
+	}
+
+	bt2, e2 := encrypt.MsgDecode(bt1, aesKey)
+	if e2 != nil {
+		log.Error("解码加密数据失败: ", e2.Error())
+		log.Error("待解密数据: ", string(bt1))
+		return nil, e2
+	}
+
+	res := encrypt.XMLMap{}
+	if err := xml.Unmarshal(bt2, &res); err != nil {
+		log.Error("解码 xml 数据失败: ", err.Error())
+		log.Info("待解码 xml 数据: ", string(bt2))
+		return nil, err
+	}
+
+	return &res, nil
+}

init.go

@@ -13,6 +13,7 @@
 package wxcomponent
 
 import (
+	"encoding/base64"
 	"errors"
 
 	"gitee.com/yansen_zh/wxcomponent/api/authorization"
@@ -20,6 +21,8 @@ import (
 	"gitee.com/yansen_zh/wxcomponent/utils/log"
 )
 
+var aesKey []byte
+
 // InitLogger 初始化 Logger
 func InitLogger(logger log.Logger) {
 	log.SetLogger(logger)
@@ -27,7 +30,16 @@ func InitLogger(logger log.Logger) {
 
 // InitConfig 初始化配置
 func InitConfig(conf config.Config) error {
-	return config.Init(conf)
+	err := config.Init(conf)
+	if err != nil {
+		var e error
+		aesKey, e = base64.StdEncoding.DecodeString(conf.GetAppSecret() + "=")
+		if e != nil {
+			return e
+		}
+	}
+
+	return err
 }
 
 // Start 启动服务
@@ -40,7 +52,16 @@ func Start() error {
 		errors.New("请先进行日志初始化")
 	}
 
-	// 启动ticket推送服务, 之后微信服务器会每隔 10 分钟推送 component_verify_ticket
-	err := authorization.StartPushTicket()
-	return err
+	if !config.GetPushTicketState() {
+		// 启动ticket推送服务, 之后微信服务器会每隔 10 分钟推送 component_verify_ticket
+		err := authorization.StartPushTicket()
+
+		if err != nil {
+			config.RefreshPushTicketState(true)
+		}
+
+		return err
+	}
+
+	return nil
 }

utils/encrypt/msg_encrypt.go

@@ -79,10 +79,6 @@ func MsgDecode(data, key []byte) ([]byte, error) {
 // pkcs7 填充
 func pkcs7(data []byte, blockSize int) []byte {
 	paddingBlock := blockSize - len(data)%blockSize
-	if paddingBlock == 0 {
-		paddingBlock = blockSize
-	}
-
 	padding := bytes.Repeat([]byte{byte(paddingBlock)}, paddingBlock)
 	return append(data, padding...)
 }
@@ -90,7 +86,6 @@ func pkcs7(data []byte, blockSize int) []byte {
 // unpkcs7 取消 pkcs7 填充
 func unpkcs7(data []byte) []byte {
 	length := len(data)
-
 	unpadding := int(data[length-1])
 	return data[:(length - unpadding)]
 }

utils/encrypt/xml.go

@@ -0,0 +1,107 @@
+/**
+ * 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 encrypt
+
+import (
+	"encoding/xml"
+	"io"
+	"regexp"
+)
+
+// 简易版本的 xml 解析, 实现将 单层 xml 解析到 map[string]string
+
+// XMLMap  xml 转换 map
+type XMLMap map[string]string
+
+// XMLElement xml 转换 element
+type XMLElement struct {
+	XMLName xml.Name
+	Value   string `xml:",chardata"`
+}
+
+// XMLCDATA xml 转换 cdata
+type XMLCDATA struct {
+	XMLName xml.Name
+	Value   string `xml:",cdata"`
+}
+
+// UnmarshalXML xml.Unmarshaler 接口实现
+// 参考 https://stackoverflow.com/questions/30928770/marshall-map-to-xml-in-go
+func (m *XMLMap) UnmarshalXML(d *xml.Decoder, _ xml.StartElement) error {
+	for {
+		ele := XMLElement{}
+		err := d.Decode(&ele)
+		if err == io.EOF {
+			break
+		} else if err != nil {
+			return err
+		}
+
+		// 忽略 Space
+		(*m)[ele.XMLName.Local] = ele.Value
+	}
+
+	return nil
+}
+
+// MarshalXML xml.Marshaler 接口实现
+// 参考 https://stackoverflow.com/questions/30928770/marshall-map-to-xml-in-go
+func (m *XMLMap) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
+	if m == nil || len(*m) == 0 {
+		return nil
+	}
+
+	if start.Name.Local == "XMLMap" {
+		start.Name.Local = "xml"
+	}
+
+	if err := e.EncodeToken(start); err != nil {
+		return err
+	}
+
+	regx, err := regexp.Compile(`<!\[CDATA\[(.*)\]\]>`)
+	if err != nil {
+		return err
+	}
+
+	for k, v := range *m {
+		res := regx.FindAllStringSubmatch(v, -1)
+		if len(res) > 0 {
+			t := XMLCDATA{
+				XMLName: xml.Name{
+					Space: "",
+					Local: k,
+				},
+				Value: res[0][1],
+			}
+
+			if err := e.Encode(&t); err != nil {
+				return err
+			}
+		} else {
+			t := XMLElement{
+				XMLName: xml.Name{
+					Space: "",
+					Local: k,
+				},
+				Value: v,
+			}
+
+			if err := e.Encode(&t); err != nil {
+				return err
+			}
+		}
+	}
+
+	return e.EncodeToken(start.End())
+}

utils/utils.go

@@ -13,9 +13,12 @@
 package utils
 
 import (
+	"encoding/xml"
 	"math/rand"
 	"strings"
 	"time"
+
+	"gitee.com/yansen_zh/wxcomponent/utils/encrypt"
 )
 
 // RandStr 获取指定 n 长度的随机字符串
@@ -39,3 +42,12 @@ func RandStr(n int) string {
 func GetExpireTime(sec int) time.Time {
 	return time.Now().Add(time.Duration(sec) * time.Second)
 }
+
+// DeCodeXML 解析XML到MAP
+func DeCodeXML(src []byte) (*encrypt.XMLMap, error) {
+	dst := new(encrypt.XMLMap)
+
+	err := xml.Unmarshal(src, dst)
+
+	return dst, err
+}