feat: 微信小程序-登录及用户信息 (#830)

* feat: 微信小程序-登录及用户信息

* feat: 微信小程序-登录及用户信息

credential/access_token.go

@@ -7,6 +7,16 @@ type AccessTokenHandle interface {
 	GetAccessToken() (accessToken string, err error)
 }
 
+// AccessTokenCompatibleHandle 同时实现 AccessTokenHandle 和 AccessTokenContextHandle
+type AccessTokenCompatibleHandle struct {
+	AccessTokenHandle
+}
+
+// GetAccessTokenContext 获取access_token,先从cache中获取，没有则从服务端获取
+func (c AccessTokenCompatibleHandle) GetAccessTokenContext(_ context.Context) (accessToken string, err error) {
+	return c.GetAccessToken()
+}
+
 // AccessTokenContextHandle AccessToken 接口
 type AccessTokenContextHandle interface {
 	AccessTokenHandle

credential/default_access_token.go

@@ -101,10 +101,11 @@ func (ak *DefaultAccessToken) GetAccessTokenContext(ctx context.Context) (access
 // 不强制更新access_token,可用于不同环境不同服务而不需要分布式锁以及公用缓存，避免access_token争抢
 // https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-access-token/getStableAccessToken.html
 type StableAccessToken struct {
-	appID          string
-	appSecret      string
-	cacheKeyPrefix string
-	cache          cache.Cache
+	appID           string
+	appSecret       string
+	cacheKeyPrefix  string
+	cache           cache.Cache
+	accessTokenLock *sync.Mutex
 }
 
 // NewStableAccessToken new StableAccessToken
@@ -113,10 +114,11 @@ func NewStableAccessToken(appID, appSecret, cacheKeyPrefix string, cache cache.C
 		panic("cache is need")
 	}
 	return &StableAccessToken{
-		appID:          appID,
-		appSecret:      appSecret,
-		cache:          cache,
-		cacheKeyPrefix: cacheKeyPrefix,
+		appID:           appID,
+		appSecret:       appSecret,
+		cache:           cache,
+		cacheKeyPrefix:  cacheKeyPrefix,
+		accessTokenLock: new(sync.Mutex),
 	}
 }
 
@@ -130,7 +132,20 @@ func (ak *StableAccessToken) GetAccessTokenContext(ctx context.Context) (accessT
 	// 先从cache中取
 	accessTokenCacheKey := fmt.Sprintf("%s_stable_access_token_%s", ak.cacheKeyPrefix, ak.appID)
 	if val := ak.cache.Get(accessTokenCacheKey); val != nil {
-		return val.(string), nil
+		if accessToken = val.(string); accessToken != "" {
+			return
+		}
+	}
+
+	// 加上lock，是为了防止在并发获取token时，cache刚好失效，导致从微信服务器上获取到不同token
+	ak.accessTokenLock.Lock()
+	defer ak.accessTokenLock.Unlock()
+
+	// 双检，防止重复从微信服务器获取
+	if val := ak.cache.Get(accessTokenCacheKey); val != nil {
+		if accessToken = val.(string); accessToken != "" {
+			return
+		}
 	}
 
 	// cache失效，从微信服务器获取
@@ -174,19 +189,27 @@ func (ak *StableAccessToken) GetAccessTokenDirectly(ctx context.Context, forceRe
 type WorkAccessToken struct {
 	CorpID          string
 	CorpSecret      string
+	AgentID         string // 可选，用于区分不同应用
 	cacheKeyPrefix  string
 	cache           cache.Cache
 	accessTokenLock *sync.Mutex
 }
 
-// NewWorkAccessToken new WorkAccessToken
-func NewWorkAccessToken(corpID, corpSecret, cacheKeyPrefix string, cache cache.Cache) AccessTokenContextHandle {
+// NewWorkAccessToken new WorkAccessToken (保持向后兼容)
+func NewWorkAccessToken(corpID, corpSecret, agentID, cacheKeyPrefix string, cache cache.Cache) AccessTokenContextHandle {
+	// 调用新方法，保持兼容性
+	return NewWorkAccessTokenWithAgentID(corpID, corpSecret, agentID, cacheKeyPrefix, cache)
+}
+
+// NewWorkAccessTokenWithAgentID new WorkAccessToken with agentID
+func NewWorkAccessTokenWithAgentID(corpID, corpSecret, agentID, cacheKeyPrefix string, cache cache.Cache) AccessTokenContextHandle {
 	if cache == nil {
-		panic("cache the not exist")
+		panic("cache is needed")
 	}
 	return &WorkAccessToken{
 		CorpID:          corpID,
 		CorpSecret:      corpSecret,
+		AgentID:         agentID,
 		cache:           cache,
 		cacheKeyPrefix:  cacheKeyPrefix,
 		accessTokenLock: new(sync.Mutex),
@@ -203,7 +226,18 @@ func (ak *WorkAccessToken) GetAccessTokenContext(ctx context.Context) (accessTok
 	// 加上lock，是为了防止在并发获取token时，cache刚好失效，导致从微信服务器上获取到不同token
 	ak.accessTokenLock.Lock()
 	defer ak.accessTokenLock.Unlock()
-	accessTokenCacheKey := fmt.Sprintf("%s_access_token_%s", ak.cacheKeyPrefix, ak.CorpID)
+
+	// 构建缓存key
+	var accessTokenCacheKey string
+
+	if ak.AgentID != "" {
+		// 如果设置了AgentID，使用新的key格式
+		accessTokenCacheKey = fmt.Sprintf("%s_access_token_%s_%s", ak.cacheKeyPrefix, ak.CorpID, ak.AgentID)
+	} else {
+		// 兼容历史版本的key格式
+		accessTokenCacheKey = fmt.Sprintf("%s_access_token_%s", ak.cacheKeyPrefix, ak.CorpID)
+	}
+
 	val := ak.cache.Get(accessTokenCacheKey)
 	if val != nil {
 		accessToken = val.(string)
@@ -219,6 +253,9 @@ func (ak *WorkAccessToken) GetAccessTokenContext(ctx context.Context) (accessTok
 
 	expires := resAccessToken.ExpiresIn - 1500
 	err = ak.cache.Set(accessTokenCacheKey, resAccessToken.AccessToken, time.Duration(expires)*time.Second)
+	if err != nil {
+		return
+	}
 
 	accessToken = resAccessToken.AccessToken
 	return

credential/default_js_ticket.go

@@ -1,6 +1,7 @@
 package credential
 
 import (
+	context2 "context"
 	"encoding/json"
 	"fmt"
 	"sync"
@@ -42,6 +43,16 @@ type ResTicket struct {
 
 // GetTicket 获取jsapi_ticket
 func (js *DefaultJsTicket) GetTicket(accessToken string) (ticketStr string, err error) {
+	return js.GetTicketContext(context2.Background(), accessToken)
+}
+
+// GetTicketFromServer 从服务器中获取ticket
+func GetTicketFromServer(accessToken string) (ticket ResTicket, err error) {
+	return GetTicketFromServerContext(context2.Background(), accessToken)
+}
+
+// GetTicketContext 获取jsapi_ticket
+func (js *DefaultJsTicket) GetTicketContext(ctx context2.Context, accessToken string) (ticketStr string, err error) {
 	// 先从cache中取
 	jsAPITicketCacheKey := fmt.Sprintf("%s_jsapi_ticket_%s", js.cacheKeyPrefix, js.appID)
 	if val := js.cache.Get(jsAPITicketCacheKey); val != nil {
@@ -57,7 +68,7 @@ func (js *DefaultJsTicket) GetTicket(accessToken string) (ticketStr string, err
 	}
 
 	var ticket ResTicket
-	ticket, err = GetTicketFromServer(accessToken)
+	ticket, err = GetTicketFromServerContext(ctx, accessToken)
 	if err != nil {
 		return
 	}
@@ -67,11 +78,11 @@ func (js *DefaultJsTicket) GetTicket(accessToken string) (ticketStr string, err
 	return
 }
 
-// GetTicketFromServer 从服务器中获取ticket
-func GetTicketFromServer(accessToken string) (ticket ResTicket, err error) {
+// GetTicketFromServerContext 从服务器中获取ticket
+func GetTicketFromServerContext(ctx context2.Context, accessToken string) (ticket ResTicket, err error) {
 	var response []byte
 	url := fmt.Sprintf(getTicketURL, accessToken)
-	response, err = util.HTTPGet(url)
+	response, err = util.HTTPGetContext(ctx, url)
 	if err != nil {
 		return
 	}

credential/default_js_ticket_test.go

@@ -0,0 +1,22 @@
+package credential
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"gopkg.in/h2non/gock.v1"
+)
+
+// TestGetTicketFromServerContext 测试 GetTicketFromServerContext 函数
+func TestGetTicketFromServerContext(t *testing.T) {
+	defer gock.Off()
+	gock.New(fmt.Sprintf(getTicketURL, "arg-ak")).Reply(200).JSON(&ResTicket{Ticket: "mock-ticket", ExpiresIn: 10})
+
+	ticket, err := GetTicketFromServerContext(context.Background(), "arg-ak")
+	assert.Nil(t, err)
+	assert.Equal(t, int64(0), ticket.ErrCode)
+	assert.Equal(t, "mock-ticket", ticket.Ticket, "they should be equal")
+	assert.Equal(t, int64(10), ticket.ExpiresIn, "they should be equal")
+}

credential/js_ticket.go

@@ -1,7 +1,15 @@
 package credential
 
+import context2 "context"
+
 // JsTicketHandle js ticket获取
 type JsTicketHandle interface {
 	// GetTicket 获取ticket
 	GetTicket(accessToken string) (ticket string, err error)
 }
+
+// JsTicketContextHandle js ticket获取
+type JsTicketContextHandle interface {
+	JsTicketHandle
+	GetTicketContext(ctx context2.Context, accessToken string) (ticket string, err error)
+}

credential/work_js_ticket.go

@@ -10,24 +10,37 @@ import (
 	"github.com/silenceper/wechat/v2/util"
 )
 
-//获取ticket的url  https://developer.work.weixin.qq.com/document/path/90506
-const getQyWxTicketURL = "https://qyapi.weixin.qq.com/cgi-bin/get_jsapi_ticket?access_token=%s"
-const getQyAppTicketURL = "https://qyapi.weixin.qq.com/cgi-bin/ticket/get?access_token=%s&type=agent_config"
+// TicketType ticket类型
+type TicketType int
 
-//WorkJsTicket 默认获取js ticket方法
+const (
+	// TicketTypeCorpJs 企业jsapi ticket
+	TicketTypeCorpJs TicketType = iota
+	// TicketTypeAgentJs 应用jsapi ticket
+	TicketTypeAgentJs
+)
+
+// 企业微信相关的 ticket URL
+const (
+	// 企业微信 jsapi ticket
+	getWorkJsTicketURL = "https://qyapi.weixin.qq.com/cgi-bin/get_jsapi_ticket?access_token=%s"
+	// 企业微信应用 jsapi ticket
+	getWorkAgentJsTicketURL = "https://qyapi.weixin.qq.com/cgi-bin/ticket/get?access_token=%s&type=agent_config"
+)
+
+// WorkJsTicket 企业微信js ticket获取
 type WorkJsTicket struct {
-	appID          string
-	agentID        string
-	cacheKeyPrefix string
-	cache          cache.Cache
-	//jsAPITicket 读写锁 同一个AppID一个
+	corpID          string
+	agentID         string
+	cacheKeyPrefix  string
+	cache           cache.Cache
 	jsAPITicketLock *sync.Mutex
 }
 
-//NewWorkJsTicket new
-func NewWorkJsTicket(appID string, agentID string, cacheKeyPrefix string, cache cache.Cache) JsTicketHandle {
+// NewWorkJsTicket new WorkJsTicket
+func NewWorkJsTicket(corpID, agentID, cacheKeyPrefix string, cache cache.Cache) *WorkJsTicket {
 	return &WorkJsTicket{
-		appID:           appID,
+		corpID:          corpID,
 		agentID:         agentID,
 		cache:           cache,
 		cacheKeyPrefix:  cacheKeyPrefix,
@@ -35,11 +48,24 @@ func NewWorkJsTicket(appID string, agentID string, cacheKeyPrefix string, cache
 	}
 }
 
-//GetTicket 获取企业微信jsapi_ticket
-func (js *WorkJsTicket) GetTicket(accessToken string) (ticketStr string, err error) {
-	//先从cache中取
-	jsAPITicketCacheKey := fmt.Sprintf("%s_jsapi_ticket_%s", js.cacheKeyPrefix, js.appID)
-	if val := js.cache.Get(jsAPITicketCacheKey); val != nil {
+// GetTicket 根据类型获取相应的jsapi_ticket
+func (js *WorkJsTicket) GetTicket(accessToken string, ticketType TicketType) (ticketStr string, err error) {
+	var cacheKey string
+	switch ticketType {
+	case TicketTypeCorpJs:
+		cacheKey = fmt.Sprintf("%s_corp_jsapi_ticket_%s", js.cacheKeyPrefix, js.corpID)
+	case TicketTypeAgentJs:
+		if js.agentID == "" {
+			err = fmt.Errorf("agentID is empty")
+			return
+		}
+		cacheKey = fmt.Sprintf("%s_agent_jsapi_ticket_%s_%s", js.cacheKeyPrefix, js.corpID, js.agentID)
+	default:
+		err = fmt.Errorf("unsupported ticket type: %v", ticketType)
+		return
+	}
+
+	if val := js.cache.Get(cacheKey); val != nil {
 		return val.(string), nil
 	}
 
@@ -47,28 +73,35 @@ func (js *WorkJsTicket) GetTicket(accessToken string) (ticketStr string, err err
 	defer js.jsAPITicketLock.Unlock()
 
 	// 双检，防止重复从微信服务器获取
-	if val := js.cache.Get(jsAPITicketCacheKey); val != nil {
+	if val := js.cache.Get(cacheKey); val != nil {
 		return val.(string), nil
 	}
 
 	var ticket ResTicket
-	ticket, err = GetQyWxTicketFromServer(accessToken, js.agentID != "")
+	ticket, err = js.getTicketFromServer(accessToken, ticketType)
 	if err != nil {
 		return
 	}
 	expires := ticket.ExpiresIn - 1500
-	err = js.cache.Set(jsAPITicketCacheKey, ticket.Ticket, time.Duration(expires)*time.Second)
+	err = js.cache.Set(cacheKey, ticket.Ticket, time.Duration(expires)*time.Second)
 	ticketStr = ticket.Ticket
 	return
 }
 
-//GetQyWxTicketFromServer 从企业微信服务器中获取ticket
-func GetQyWxTicketFromServer(accessToken string, isApp bool) (ticket ResTicket, err error) {
-	var response []byte
-	url := fmt.Sprintf(getQyWxTicketURL, accessToken)
-	if isApp {
-		url = fmt.Sprintf(getQyAppTicketURL, accessToken)
+// getTicketFromServer 从服务器中获取ticket
+func (js *WorkJsTicket) getTicketFromServer(accessToken string, ticketType TicketType) (ticket ResTicket, err error) {
+	var url string
+	switch ticketType {
+	case TicketTypeCorpJs:
+		url = fmt.Sprintf(getWorkJsTicketURL, accessToken)
+	case TicketTypeAgentJs:
+		url = fmt.Sprintf(getWorkAgentJsTicketURL, accessToken)
+	default:
+		err = fmt.Errorf("unsupported ticket type: %v", ticketType)
+		return
 	}
+
+	var response []byte
 	response, err = util.HTTPGet(url)
 	if err != nil {
 		return

miniprogram/auth/auth.go

@@ -10,11 +10,22 @@ import (
 )
 
 const (
+	// code2SessionURL 小程序登录
 	code2SessionURL = "https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code"
-
+	// checkEncryptedDataURL 检查加密信息
 	checkEncryptedDataURL = "https://api.weixin.qq.com/wxa/business/checkencryptedmsg?access_token=%s"
-
+	// getPhoneNumber 获取手机号
 	getPhoneNumber = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=%s"
+	// checkSessionURL 检验登录态
+	checkSessionURL = "https://api.weixin.qq.com/wxa/checksession?access_token=%s&signature=%s&openid=%s&sig_method=hmac_sha256"
+	// resetUserSessionKeyURL 重置登录态
+	resetUserSessionKeyURL = "https://api.weixin.qq.com/wxa/resetusersessionkey?access_token=%s&signature=%s&openid=%s&sig_method=hmac_sha256"
+	// getPluginOpenPIDURL 获取插件用户openPID
+	getPluginOpenPIDURL = "https://api.weixin.qq.com/wxa/getpluginopenpid?access_token=%s"
+	// getPaidUnionIDURL 支付后获取 UnionID
+	getPaidUnionIDURL = "https://api.weixin.qq.com/wxa/getpaidunionid"
+	// getUserEncryptKeyURL 获取用户encryptKey
+	getUserEncryptKeyURL = "https://api.weixin.qq.com/wxa/business/getuserencryptkey?access_token=%s&signature=%s&openid=%s&sig_method=hmac_sha256"
 )
 
 // Auth 登录/用户信息
@@ -65,9 +76,45 @@ func (auth *Auth) Code2SessionContext(ctx context2.Context, jsCode string) (resu
 	return
 }
 
+type (
+	// GetPaidUnionIDRequest 支付后获取UnionID请求
+	GetPaidUnionIDRequest struct {
+		OpenID        string `json:"openid"`
+		TransactionID string `json:"transaction_id,omitempty"`
+		MchID         string `json:"mch_id,omitempty"`
+		OutTradeNo    string `json:"out_trade_no,omitempty"`
+	}
+
+	// GetPaidUnionIDResponse 支付后获取UnionID响应
+	GetPaidUnionIDResponse struct {
+		util.CommonError
+		UnionID string `json:"unionid"`
+	}
+)
+
 // GetPaidUnionID 用户支付完成后，获取该用户的 UnionId，无需用户授权
-func (auth *Auth) GetPaidUnionID() {
-	// TODO
+// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/user-info/basic-info/getPaidUnionid.html
+func (auth *Auth) GetPaidUnionID(req *GetPaidUnionIDRequest) (string, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = auth.GetAccessToken(); err != nil {
+		return "", err
+	}
+	var url string
+	if req.TransactionID != "" {
+		url = fmt.Sprintf("%s?access_token=%s&openid=%s&transaction_id=%s", getPaidUnionIDURL, accessToken, req.OpenID, req.TransactionID)
+	} else {
+		url = fmt.Sprintf("%s?access_token=%s&openid=%s&mch_id=%s&out_trade_no=%s", getPaidUnionIDURL, accessToken, req.OpenID, req.MchID, req.OutTradeNo)
+	}
+	var response []byte
+	if response, err = util.HTTPGet(url); err != nil {
+		return "", err
+	}
+	result := &GetPaidUnionIDResponse{}
+	err = util.DecodeWithError(response, result, "GetPaidUnionID")
+	return result.UnionID, err
 }
 
 // CheckEncryptedData .检查加密信息是否由微信生成（当前只支持手机号加密数据），只能检测最近3天生成的加密数据
@@ -81,7 +128,7 @@ func (auth *Auth) CheckEncryptedDataContext(ctx context2.Context, encryptedMsgHa
 	var (
 		at string
 	)
-	if at, err = auth.GetAccessToken(); err != nil {
+	if at, err = auth.GetAccessTokenContext(ctx); err != nil {
 		return
 	}
 
@@ -120,7 +167,7 @@ func (auth *Auth) GetPhoneNumberContext(ctx context2.Context, code string) (*Get
 		at  string
 		err error
 	)
-	if at, err = auth.GetAccessToken(); err != nil {
+	if at, err = auth.GetAccessTokenContext(ctx); err != nil {
 		return nil, err
 	}
 	body := map[string]interface{}{
@@ -146,3 +193,115 @@ func (auth *Auth) GetPhoneNumberContext(ctx context2.Context, code string) (*Get
 func (auth *Auth) GetPhoneNumber(code string) (*GetPhoneNumberResponse, error) {
 	return auth.GetPhoneNumberContext(context2.Background(), code)
 }
+
+// CheckSession 检验登录态
+// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/user-login/checkSessionKey.html
+func (auth *Auth) CheckSession(signature, openID string) error {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = auth.GetAccessToken(); err != nil {
+		return err
+	}
+	var response []byte
+	if response, err = util.HTTPGet(fmt.Sprintf(checkSessionURL, accessToken, signature, openID)); err != nil {
+		return err
+	}
+	return util.DecodeWithCommonError(response, "CheckSession")
+}
+
+// ResetUserSessionKeyResponse 重置登录态响应
+type ResetUserSessionKeyResponse struct {
+	util.CommonError
+	OpenID     string `json:"openid"`
+	SessionKey string `json:"session_key"`
+}
+
+// ResetUserSessionKey 重置登录态
+// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/user-login/ResetUserSessionKey.html
+func (auth *Auth) ResetUserSessionKey(signature, openID string) (*ResetUserSessionKeyResponse, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = auth.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.HTTPGet(fmt.Sprintf(resetUserSessionKeyURL, accessToken, signature, openID)); err != nil {
+		return nil, err
+	}
+	result := &ResetUserSessionKeyResponse{}
+	err = util.DecodeWithError(response, result, "ResetUserSessionKey")
+	return result, err
+}
+
+type (
+	// GetPluginOpenPIDRequest 获取插件用户openPID请求
+	GetPluginOpenPIDRequest struct {
+		Code string `json:"code"`
+	}
+
+	// GetPluginOpenPIDResponse 获取插件用户openPID响应
+	GetPluginOpenPIDResponse struct {
+		util.CommonError
+		OpenPID string `json:"openpid"`
+	}
+)
+
+// GetPluginOpenPID 获取插件用户openPID
+// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/user-info/basic-info/getPluginOpenPId.html
+func (auth *Auth) GetPluginOpenPID(code string) (string, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = auth.GetAccessToken(); err != nil {
+		return "", err
+	}
+	req := &GetPluginOpenPIDRequest{
+		Code: code,
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(getPluginOpenPIDURL, accessToken), req); err != nil {
+		return "", err
+	}
+	result := &GetPluginOpenPIDResponse{}
+	err = util.DecodeWithError(response, result, "GetPluginOpenPID")
+	return result.OpenPID, err
+}
+
+// GetUserEncryptKeyResponse 获取用户encryptKey响应
+type GetUserEncryptKeyResponse struct {
+	util.CommonError
+	KeyInfoList []KeyInfo `json:"key_info_list"`
+}
+
+// KeyInfo 用户最近三次的加密key
+type KeyInfo struct {
+	EncryptKey string `json:"encrypt_key"`
+	Version    int64  `json:"version"`
+	ExpireIn   int64  `json:"expire_in"`
+	Iv         string `json:"iv"`
+	CreateTime int64  `json:"create_time"`
+}
+
+// GetUserEncryptKey 获取用户encryptKey
+// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/user-info/internet/getUserEncryptKey.html
+func (auth *Auth) GetUserEncryptKey(signature, openID string) (*GetUserEncryptKeyResponse, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = auth.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.HTTPGet(fmt.Sprintf(getUserEncryptKeyURL, accessToken, signature, openID)); err != nil {
+		return nil, err
+	}
+	result := &GetUserEncryptKeyResponse{}
+	err = util.DecodeWithError(response, result, "GetUserEncryptKey")
+	return result, err
+}

miniprogram/business/phone_number.go

@@ -1,6 +1,7 @@
 package business
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/silenceper/wechat/v2/util"
@@ -28,13 +29,18 @@ type PhoneInfo struct {
 
 // GetPhoneNumber code换取用户手机号。 每个code只能使用一次，code的有效期为5min
 func (business *Business) GetPhoneNumber(in *GetPhoneNumberRequest) (info PhoneInfo, err error) {
-	accessToken, err := business.GetAccessToken()
+	return business.GetPhoneNumberWithContext(context.Background(), in)
+}
+
+// GetPhoneNumberWithContext 利用context将code换取用户手机号。 每个code只能使用一次，code的有效期为5min
+func (business *Business) GetPhoneNumberWithContext(ctx context.Context, in *GetPhoneNumberRequest) (info PhoneInfo, err error) {
+	accessToken, err := business.GetAccessTokenContext(ctx)
 	if err != nil {
 		return
 	}
 
 	uri := fmt.Sprintf(getPhoneNumberURL, accessToken)
-	response, err := util.PostJSON(uri, in)
+	response, err := util.PostJSONContext(ctx, uri, in)
 	if err != nil {
 		return
 	}

miniprogram/context/context.go

@@ -8,5 +8,5 @@ import (
 // Context struct
 type Context struct {
 	*config.Config
-	credential.AccessTokenHandle
+	credential.AccessTokenContextHandle
 }

miniprogram/encryptor/encryptor.go

@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+
 	"github.com/silenceper/wechat/v2/miniprogram/context"
-	"strings"
 )
 
 // Encryptor struct
@@ -108,23 +108,13 @@ func GetCipherText(sessionKey, encryptedData, iv string) ([]byte, error) {
 }
 
 // Decrypt 解密数据
-func (encryptor *Encryptor) Decrypt(sessionKey, encryptedData, appid string) (*PlainData, error) {
-	ivB := make([]byte, 16)
-	iv := base64.StdEncoding.EncodeToString(ivB)
+func (encryptor *Encryptor) Decrypt(sessionKey, encryptedData, iv string) (*PlainData, error) {
 	cipherText, err := GetCipherText(sessionKey, encryptedData, iv)
 	if err != nil {
 		return nil, err
 	}
-	length := string(cipherText[:20])
-
-	cipherTextData := strings.TrimPrefix(string(cipherText), string(cipherText[:20]))
-	cipherTextData = strings.TrimSuffix(cipherTextData, appid)
-
-	if len(length) != len(cipherTextData) {
-		return nil, fmt.Errorf("length not match, %d != %d", length, len(cipherTextData))
-	}
 	var plainData PlainData
-	err = json.Unmarshal([]byte(cipherTextData), &plainData)
+	err = json.Unmarshal(cipherText, &plainData)
 	if err != nil {
 		return nil, err
 	}

miniprogram/miniprogram.go

@@ -42,15 +42,22 @@ func NewMiniProgram(cfg *config.Config) *MiniProgram {
 		defaultAkHandle = credential.NewDefaultAccessToken(cfg.AppID, cfg.AppSecret, cacheKeyPrefix, cfg.Cache)
 	}
 	ctx := &context.Context{
-		Config:            cfg,
-		AccessTokenHandle: defaultAkHandle,
+		Config:                   cfg,
+		AccessTokenContextHandle: defaultAkHandle,
 	}
 	return &MiniProgram{ctx}
 }
 
 // SetAccessTokenHandle 自定义 access_token 获取方式
 func (miniProgram *MiniProgram) SetAccessTokenHandle(accessTokenHandle credential.AccessTokenHandle) {
-	miniProgram.ctx.AccessTokenHandle = accessTokenHandle
+	miniProgram.ctx.AccessTokenContextHandle = credential.AccessTokenCompatibleHandle{
+		AccessTokenHandle: accessTokenHandle,
+	}
+}
+
+// SetAccessTokenContextHandle 自定义 access_token 获取方式
+func (miniProgram *MiniProgram) SetAccessTokenContextHandle(accessTokenContextHandle credential.AccessTokenContextHandle) {
+	miniProgram.ctx.AccessTokenContextHandle = accessTokenContextHandle
 }
 
 // GetContext get Context

miniprogram/subscribe/subscribe.go

@@ -1,6 +1,7 @@
 package subscribe
 
 import (
+	"encoding/json"
 	"fmt"
 
 	"github.com/silenceper/wechat/v2/miniprogram/context"
@@ -70,6 +71,13 @@ type TemplateList struct {
 	Data []TemplateItem `json:"data"`
 }
 
+// resTemplateSend 发送获取 msg id
+type resTemplateSend struct {
+	util.CommonError
+
+	MsgID int64 `json:"msgid"`
+}
+
 // Send 发送订阅消息
 func (s *Subscribe) Send(msg *Message) (err error) {
 	var accessToken string
@@ -85,6 +93,33 @@ func (s *Subscribe) Send(msg *Message) (err error) {
 	return util.DecodeWithCommonError(response, "Send")
 }
 
+// SendGetMsgID 发送订阅消息返回 msgid
+func (s *Subscribe) SendGetMsgID(msg *Message) (msgID int64, err error) {
+	var accessToken string
+	accessToken, err = s.GetAccessToken()
+	if err != nil {
+		return
+	}
+	uri := fmt.Sprintf("%s?access_token=%s", subscribeSendURL, accessToken)
+	response, err := util.PostJSON(uri, msg)
+	if err != nil {
+		return
+	}
+
+	var result resTemplateSend
+	if err = json.Unmarshal(response, &result); err != nil {
+		return
+	}
+	if result.ErrCode != 0 {
+		err = fmt.Errorf("template msg send error : errcode=%v , errmsg=%v", result.ErrCode, result.ErrMsg)
+		return
+	}
+
+	msgID = result.MsgID
+
+	return
+}
+
 // ListTemplates 获取当前帐号下的个人模板列表
 // https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.getTemplateList.html
 func (s *Subscribe) ListTemplates() (*TemplateList, error) {

miniprogram/urlscheme/urlscheme.go

@@ -54,6 +54,7 @@ type USParams struct {
 	ExpireType     TExpireType `json:"expire_type"`
 	ExpireTime     int64       `json:"expire_time"`
 	ExpireInterval int         `json:"expire_interval"`
+	IsExpire       bool        `json:"is_expire,omitempty"`
 }
 
 // USResult 返回的结果

officialaccount/js/js.go

@@ -1,6 +1,7 @@
 package js
 
 import (
+	context2 "context"
 	"fmt"
 
 	"github.com/silenceper/wechat/v2/credential"
@@ -39,14 +40,31 @@ func (js *Js) SetJsTicketHandle(ticketHandle credential.JsTicketHandle) {
 // GetConfig 获取jssdk需要的配置参数
 // uri 为当前网页地址
 func (js *Js) GetConfig(uri string) (config *Config, err error) {
-	config = new(Config)
+	return js.GetConfigContext(context2.Background(), uri)
+}
+
+// GetConfigContext  新方法，允许传入上下文，避免协程泄漏
+func (js *Js) GetConfigContext(ctx context2.Context, uri string) (config *Config, err error) {
 	var accessToken string
-	accessToken, err = js.GetAccessToken()
+	// 类型断言，如果断言成功，调用安全的 GetAccessTokenContext 方法
+	if ctxHandle, ok := js.Context.AccessTokenHandle.(credential.AccessTokenContextHandle); ok {
+		accessToken, err = ctxHandle.GetAccessTokenContext(ctx)
+	} else {
+		// 如果没有实现 AccessTokenContextHandle 接口，调用旧的 GetAccessToken 方法
+		accessToken, err = js.Context.GetAccessToken()
+	}
 	if err != nil {
 		return
 	}
+
 	var ticketStr string
-	ticketStr, err = js.GetTicket(accessToken)
+	// 类型断言 jsTicket
+	if ticketCtxHandle, ok := js.JsTicketHandle.(credential.JsTicketContextHandle); ok {
+		ticketStr, err = ticketCtxHandle.GetTicketContext(ctx, accessToken)
+	} else {
+		// 如果没有实现 JsTicketContextHandle 接口，调用旧的 GetTicket 方法
+		ticketStr, err = js.GetTicket(accessToken)
+	}
 	if err != nil {
 		return
 	}
@@ -56,6 +74,7 @@ func (js *Js) GetConfig(uri string) (config *Config, err error) {
 	str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s&timestamp=%d&url=%s", ticketStr, nonceStr, timestamp, uri)
 	sigStr := util.Signature(str)
 
+	config = new(Config)
 	config.AppID = js.AppID
 	config.NonceStr = nonceStr
 	config.Timestamp = timestamp

openplatform/account/account.go

@@ -2,7 +2,7 @@ package account
 
 import "github.com/silenceper/wechat/v2/openplatform/context"
 
-// Account 开放平台张哈管理
+// Account 开放平台帐号管理
 // TODO 实现方法
 type Account struct {
 	*context.Context

openplatform/context/accessToken.go

@@ -20,6 +20,7 @@ const (
 	getComponentInfoURL     = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_info?component_access_token=%s"
 	componentLoginURL       = "https://mp.weixin.qq.com/cgi-bin/componentloginpage?component_appid=%s&pre_auth_code=%s&redirect_uri=%s&auth_type=%d&biz_appid=%s"
 	bindComponentURL        = "https://mp.weixin.qq.com/safe/bindcomponent?action=bindcomponent&auth_type=%d&no_scan=1&component_appid=%s&pre_auth_code=%s&redirect_uri=%s&biz_appid=%s#wechat_redirect"
+	bindComponentURLV2      = "https://open.weixin.qq.com/wxaopen/safe/bindcomponent?action=bindcomponent&auth_type=%d&no_scan=1&component_appid=%s&pre_auth_code=%s&redirect_uri=%s&biz_appid=%s#wechat_redirect"
 	// TODO 获取授权方选项信息
 	// getComponentConfigURL = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_option?component_access_token=%s"
 	// TODO 获取已授权的账号信息
@@ -137,6 +138,20 @@ func (ctx *Context) GetBindComponentURL(redirectURI string, authType int, bizApp
 	return ctx.GetBindComponentURLContext(context.Background(), redirectURI, authType, bizAppID)
 }
 
+// GetBindComponentURLV2Context 获取新版本第三方公众号授权链接(链接跳转，适用移动端)
+func (ctx *Context) GetBindComponentURLV2Context(stdCtx context.Context, redirectURI string, authType int, bizAppID string) (string, error) {
+	code, err := ctx.GetPreCodeContext(stdCtx)
+	if err != nil {
+		return "", err
+	}
+	return fmt.Sprintf(bindComponentURLV2, authType, ctx.AppID, code, url.QueryEscape(redirectURI), bizAppID), nil
+}
+
+// GetBindComponentURLV2 获取新版本第三方公众号授权链接(链接跳转，适用移动端)
+func (ctx *Context) GetBindComponentURLV2(redirectURI string, authType int, bizAppID string) (string, error) {
+	return ctx.GetBindComponentURLContext(context.Background(), redirectURI, authType, bizAppID)
+}
+
 // ID 微信返回接口中各种类型字段
 type ID struct {
 	ID int `json:"id"`
@@ -225,6 +240,10 @@ func (ctx *Context) RefreshAuthrTokenContext(stdCtx context.Context, appid, refr
 	if err := cache.SetContext(stdCtx, ctx.Cache, authrTokenKey, ret.AccessToken, time.Second*time.Duration(ret.ExpiresIn-30)); err != nil {
 		return nil, err
 	}
+	refreshTokenKey := "authorizer_refresh_token_" + appid
+	if err := cache.SetContext(stdCtx, ctx.Cache, refreshTokenKey, ret.RefreshToken, 10*365*24*60*60*time.Second); err != nil {
+		return nil, err
+	}
 	return ret, nil
 }
 
@@ -238,8 +257,18 @@ func (ctx *Context) GetAuthrAccessTokenContext(stdCtx context.Context, appid str
 	authrTokenKey := "authorizer_access_token_" + appid
 	val := cache.GetContext(stdCtx, ctx.Cache, authrTokenKey)
 	if val == nil {
-		return "", fmt.Errorf("cannot get authorizer %s access token", appid)
+		refreshTokenKey := "authorizer_refresh_token_" + appid
+		val := cache.GetContext(stdCtx, ctx.Cache, refreshTokenKey)
+		if val == nil {
+			return "", fmt.Errorf("cannot get authorizer %s refresh token", appid)
+		}
+		token, err := ctx.RefreshAuthrTokenContext(stdCtx, appid, val.(string))
+		if err != nil {
+			return "", err
+		}
+		return token.AccessToken, nil
 	}
+
 	return val.(string), nil
 }
 

openplatform/miniprogram/miniprogram.go

@@ -1,6 +1,7 @@
 package miniprogram
 
 import (
+	originalContext "context"
 	"fmt"
 
 	"github.com/silenceper/wechat/v2/credential"
@@ -37,6 +38,22 @@ func (miniProgram *MiniProgram) GetAccessToken() (string, error) {
 	return akRes.AccessToken, nil
 }
 
+// GetAccessTokenContext 利用ctx获取ak
+func (miniProgram *MiniProgram) GetAccessTokenContext(ctx originalContext.Context) (string, error) {
+	ak, akErr := miniProgram.openContext.GetAuthrAccessTokenContext(ctx, miniProgram.AppID)
+	if akErr == nil {
+		return ak, nil
+	}
+	if miniProgram.authorizerRefreshToken == "" {
+		return "", fmt.Errorf("please set the authorizer_refresh_token first")
+	}
+	akRes, akResErr := miniProgram.GetComponent().RefreshAuthrTokenContext(ctx, miniProgram.AppID, miniProgram.authorizerRefreshToken)
+	if akResErr != nil {
+		return "", akResErr
+	}
+	return akRes.AccessToken, nil
+}
+
 // SetAuthorizerRefreshToken 设置代执操作业务授权账号authorizer_refresh_token
 func (miniProgram *MiniProgram) SetAuthorizerRefreshToken(authorizerRefreshToken string) *MiniProgram {
 	miniProgram.authorizerRefreshToken = authorizerRefreshToken
@@ -68,7 +85,7 @@ func (miniProgram *MiniProgram) GetBasic() *basic.Basic {
 // GetURLLink 小程序URL Link接口 调用前需确认已调用 SetAuthorizerRefreshToken 避免由于缓存中 authorizer_access_token 过期执行中断
 func (miniProgram *MiniProgram) GetURLLink() *urllink.URLLink {
 	return urllink.NewURLLink(&miniContext.Context{
-		AccessTokenHandle: miniProgram,
+		AccessTokenContextHandle: miniProgram,
 	})
 }
 

openplatform/officialaccount/js/js.go

@@ -1,6 +1,7 @@
 package js
 
 import (
+	context2 "context"
 	"fmt"
 
 	"github.com/silenceper/wechat/v2/credential"
@@ -32,14 +33,31 @@ func (js *Js) SetJsTicketHandle(ticketHandle credential.JsTicketHandle) {
 // GetConfig 第三方平台 - 获取jssdk需要的配置参数
 // uri 为当前网页地址
 func (js *Js) GetConfig(uri, appid string) (config *officialJs.Config, err error) {
-	config = new(officialJs.Config)
+	return js.GetConfigContext(context2.Background(), uri, appid)
+}
+
+// GetConfigContext 新方法，允许传入上下文，避免协程泄漏
+func (js *Js) GetConfigContext(ctx context2.Context, uri, appid string) (config *officialJs.Config, err error) {
 	var accessToken string
-	accessToken, err = js.GetAccessToken()
+	// 类型断言，如果断言成功，调用安全的 GetAccessTokenContext 方法
+	if ctxHandle, ok := js.Context.AccessTokenHandle.(credential.AccessTokenContextHandle); ok {
+		accessToken, err = ctxHandle.GetAccessTokenContext(ctx)
+	} else {
+		// 如果没有实现 AccessTokenContextHandle 接口，调用旧的 GetAccessToken 方法
+		accessToken, err = js.Context.GetAccessToken()
+	}
 	if err != nil {
 		return
 	}
+
 	var ticketStr string
-	ticketStr, err = js.GetTicket(accessToken)
+	// 类型断言 jsTicket
+	if ticketCtxHandle, ok := js.JsTicketHandle.(credential.JsTicketContextHandle); ok {
+		ticketStr, err = ticketCtxHandle.GetTicketContext(ctx, accessToken)
+	} else {
+		// 如果没有实现 JsTicketContextHandle 接口，调用旧的 GetTicket 方法
+		ticketStr, err = js.GetTicket(accessToken)
+	}
 	if err != nil {
 		return
 	}
@@ -49,6 +67,7 @@ func (js *Js) GetConfig(uri, appid string) (config *officialJs.Config, err error
 	str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s&timestamp=%d&url=%s", ticketStr, nonceStr, timestamp, uri)
 	sigStr := util.Signature(str)
 
+	config = new(officialJs.Config)
 	config.AppID = appid
 	config.NonceStr = nonceStr
 	config.Timestamp = timestamp

openplatform/officialaccount/js/js_test.go

@@ -0,0 +1,147 @@
+// 验证 js.GetConfigContext 是否能正确传递上下文到 HTTP 请求，确保上下文正确传播，防止在获取 JSSDK 配置时发生协程泄露。
+package js
+
+import (
+	"bytes"
+	context2 "context"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"testing"
+
+	"github.com/silenceper/wechat/v2/cache"
+	"github.com/silenceper/wechat/v2/credential"
+	"github.com/silenceper/wechat/v2/officialaccount/config"
+	"github.com/silenceper/wechat/v2/officialaccount/context"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+// mockAccessTokenHandle 模拟 AccessTokenHandle
+type mockAccessTokenHandle struct{}
+
+func (m *mockAccessTokenHandle) GetAccessToken() (string, error) {
+	return "mock-access-token", nil
+}
+
+func (m *mockAccessTokenHandle) GetAccessTokenContext(_ context2.Context) (string, error) {
+	return "mock-access-token", nil
+}
+
+// contextCheckingRoundTripper 自定义 RoundTripper 用于检查 context
+type contextCheckingRoundTripper struct {
+	originalCtx context2.Context
+	t           *testing.T
+	key         interface{}
+	expectedVal interface{}
+}
+
+func (rt *contextCheckingRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
+	// 获取请求中的 context
+	reqCtx := req.Context()
+
+	// 打印 context 比较结果
+	rt.t.Logf("比较上下文的内存地址:\n")
+	if reqCtx == rt.originalCtx {
+		rt.t.Logf("上下文具有相同的内存地址。原始上下文: %p, 请求上下文: %p\n", rt.originalCtx, reqCtx)
+	} else {
+		rt.t.Logf("上下文具有不同的内存地址。原始上下文: %p, 请求上下文: %p\n", rt.originalCtx, reqCtx)
+	}
+
+	// 检查 context 中的键值对
+	if rt.key != nil {
+		value := reqCtx.Value(rt.key)
+		rt.t.Logf("检查请求上下文中的键 %v:\n", rt.key)
+		if value != rt.expectedVal {
+			rt.t.Errorf("上下文键 %v 的值不匹配: 预期 %v, 实际 %v\n", rt.key, rt.expectedVal, value)
+		} else {
+			rt.t.Logf("上下文键 %v 的值匹配: 预期 %v, 实际 %v\n", rt.key, rt.expectedVal, value)
+		}
+	}
+
+	// 检查上下文是否已取消
+	select {
+	case <-reqCtx.Done():
+		return nil, reqCtx.Err() // 返回上下文取消错误
+	default:
+		// 返回模拟的 HTTP 响应，包含有效的 JSON
+		responseBody := `{"ticket":"mock-ticket","expires_in":7200}`
+		response := &http.Response{
+			Status:        "200 OK",
+			StatusCode:    http.StatusOK,
+			Proto:         "HTTP/1.1",
+			ProtoMajor:    1,
+			ProtoMinor:    1,
+			Body:          io.NopCloser(bytes.NewReader([]byte(responseBody))),
+			ContentLength: int64(len(responseBody)),
+			Header:        make(http.Header),
+		}
+		response.Header.Set("Content-Type", "application/json")
+		return response, nil
+	}
+}
+
+// contextKey 定义自定义上下文键类型，避免使用内置 string 类型
+type contextKey string
+
+// setupJsInstance 初始化 Js 实例和 HTTP 客户端
+func setupJsInstance(t *testing.T, ctx context2.Context, key, val interface{}) (*Js, func()) {
+	cfg := &config.Config{
+		AppID:     "test-app-id",
+		AppSecret: "test-app-secret",
+		Cache:     cache.NewMemory(),
+	}
+	cacheKey := fmt.Sprintf("%s_jsapi_ticket_%s", credential.CacheKeyOfficialAccountPrefix, cfg.AppID)
+	if err := cfg.Cache.Delete(cacheKey); err != nil {
+		t.Fatalf("清除缓存失败: %v", err)
+	}
+	t.Log("清除 jsapi_ticket 的缓存:", cacheKey)
+
+	ctxHandle := &context.Context{Config: cfg, AccessTokenHandle: &mockAccessTokenHandle{}}
+	jsInstance := NewJs(ctxHandle, cfg.AppID)
+	jsInstance.SetJsTicketHandle(credential.NewDefaultJsTicket(cfg.AppID, credential.CacheKeyOfficialAccountPrefix, cfg.Cache))
+
+	originalClient := util.DefaultHTTPClient
+	util.DefaultHTTPClient = &http.Client{
+		Transport: &contextCheckingRoundTripper{originalCtx: ctx, t: t, key: key, expectedVal: val},
+	}
+	return jsInstance, func() { util.DefaultHTTPClient = originalClient }
+}
+
+// TestGetConfigContext 测试GetConfigContext的上下文传递和取消行为。
+func TestGetConfigContext(t *testing.T) {
+	t.Run("ContextPassing", func(t *testing.T) {
+		ctxKey := contextKey("testKey111") // 使用自定义类型 contextKey
+		ctxValue := "testValue222"
+		ctx := context2.WithValue(context2.Background(), ctxKey, ctxValue)
+		t.Logf("创建的测试上下文: %p, 添加的键值对: %v=%v\n", ctx, ctxKey, ctxValue)
+
+		jsInstance, cleanup := setupJsInstance(t, ctx, ctxKey, ctxValue)
+		defer cleanup()
+		t.Log("调用 GetConfigContext")
+		config2, err := jsInstance.GetConfigContext(ctx, "https://www.baidu.com", "test-app-id")
+		if err != nil {
+			t.Fatalf("GetConfigContext 失败: %v", err)
+		}
+		if config2.AppID != "test-app-id" {
+			t.Errorf("预期 AppID 为 %s，实际为 %s", "test-app-id", config2.AppID)
+		}
+	})
+
+	t.Run("ContextCancellation", func(t *testing.T) {
+		ctx, cancel := context2.WithCancel(context2.Background())
+		defer cancel()
+
+		jsInstance, cleanup := setupJsInstance(t, ctx, nil, nil)
+		defer cleanup()
+
+		cancel()
+		t.Log("调用 GetConfigContext（已取消上下文）")
+		_, err := jsInstance.GetConfigContext(ctx, "https://www.baidu.com", "test-app-id")
+		if err == nil {
+			t.Error("预期上下文取消错误，但 GetConfigContext 未返回错误")
+		} else if !errors.Is(err, context2.Canceled) {
+			t.Errorf("预期错误为 context.Canceled，实际为: %v", err)
+		}
+	})
+}

util/http.go

@@ -166,6 +166,7 @@ func PostFile(fieldName, filePath, uri string) ([]byte, error) {
 			IsFile:    true,
 			Fieldname: fieldName,
 			FilePath:  filePath,
+			Filename:  filePath,
 		},
 	}
 	return PostMultipartForm(fields, uri)

util/signature.go

@@ -1,7 +1,6 @@
 package util
 
 import (
-	"bytes"
 	"crypto/sha1"
 	"fmt"
 	"io"
@@ -17,16 +16,3 @@ func Signature(params ...string) string {
 	}
 	return fmt.Sprintf("%x", h.Sum(nil))
 }
-
-func CalSignature(params ...string) string {
-	sort.Strings(params)
-	var buffer bytes.Buffer
-	for _, value := range params {
-		buffer.WriteString(value)
-	}
-
-	sha := sha1.New()
-	sha.Write(buffer.Bytes())
-	signature := fmt.Sprintf("%x", sha.Sum(nil))
-	return string(signature)
-}

work/addresslist/department.go

@@ -9,12 +9,16 @@ import (
 const (
 	// departmentCreateURL 创建部门
 	departmentCreateURL = "https://qyapi.weixin.qq.com/cgi-bin/department/create?access_token=%s"
+	// departmentUpdateURL 更新部门
+	departmentUpdateURL = "https://qyapi.weixin.qq.com/cgi-bin/department/update?access_token=%s"
+	// departmentDeleteURL 删除部门
+	departmentDeleteURL = "https://qyapi.weixin.qq.com/cgi-bin/department/delete?access_token=%s&id=%d"
 	// departmentSimpleListURL 获取子部门ID列表
 	departmentSimpleListURL = "https://qyapi.weixin.qq.com/cgi-bin/department/simplelist?access_token=%s&id=%d"
 	// departmentListURL 获取部门列表
 	departmentListURL     = "https://qyapi.weixin.qq.com/cgi-bin/department/list?access_token=%s"
 	departmentListByIDURL = "https://qyapi.weixin.qq.com/cgi-bin/department/list?access_token=%s&id=%d"
-	// departmentGetURL 获取单个部门详情 https://qyapi.weixin.qq.com/cgi-bin/department/get?access_token=ACCESS_TOKEN&id=ID
+	// departmentGetURL 获取单个部门详情
 	departmentGetURL = "https://qyapi.weixin.qq.com/cgi-bin/department/get?access_token=%s&id=%d"
 )
 
@@ -85,6 +89,49 @@ func (r *Client) DepartmentCreate(req *DepartmentCreateRequest) (*DepartmentCrea
 	return result, err
 }
 
+// DepartmentUpdateRequest 更新部门请求
+type DepartmentUpdateRequest struct {
+	ID       int    `json:"id"`
+	Name     string `json:"name,omitempty"`
+	NameEn   string `json:"name_en,omitempty"`
+	ParentID int    `json:"parentid,omitempty"`
+	Order    int    `json:"order,omitempty"`
+}
+
+// DepartmentUpdate 更新部门
+// see https://developer.work.weixin.qq.com/document/path/90206
+func (r *Client) DepartmentUpdate(req *DepartmentUpdateRequest) error {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(departmentUpdateURL, accessToken), req); err != nil {
+		return err
+	}
+	return util.DecodeWithCommonError(response, "DepartmentUpdate")
+}
+
+// DepartmentDelete 删除部门
+// @see https://developer.work.weixin.qq.com/document/path/90207
+func (r *Client) DepartmentDelete(departmentID int) error {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return err
+	}
+	var response []byte
+	if response, err = util.HTTPGet(fmt.Sprintf(departmentDeleteURL, accessToken, departmentID)); err != nil {
+		return err
+	}
+	return util.DecodeWithCommonError(response, "DepartmentDelete")
+}
+
 // DepartmentSimpleList 获取子部门ID列表
 // see https://developer.work.weixin.qq.com/document/path/95350
 func (r *Client) DepartmentSimpleList(departmentID int) ([]*DepartmentID, error) {

work/addresslist/user.go

@@ -12,6 +12,8 @@ const (
 	userSimpleListURL = "https://qyapi.weixin.qq.com/cgi-bin/user/simplelist"
 	// userCreateURL 创建成员
 	userCreateURL = "https://qyapi.weixin.qq.com/cgi-bin/user/create?access_token=%s"
+	// userUpdateURL 更新成员
+	userUpdateURL = "https://qyapi.weixin.qq.com/cgi-bin/user/update?access_token=%s"
 	// userGetURL 读取成员
 	userGetURL = "https://qyapi.weixin.qq.com/cgi-bin/user/get"
 	// userDeleteURL 删除成员
@@ -154,6 +156,52 @@ func (r *Client) UserCreate(req *UserCreateRequest) (*UserCreateResponse, error)
 	return result, err
 }
 
+// UserUpdateRequest 更新成员请求
+type UserUpdateRequest struct {
+	UserID         string   `json:"userid"`
+	NewUserID      string   `json:"new_userid"`
+	Name           string   `json:"name"`
+	Alias          string   `json:"alias"`
+	Mobile         string   `json:"mobile"`
+	Department     []int    `json:"department"`
+	Order          []int    `json:"order"`
+	Position       string   `json:"position"`
+	Gender         int      `json:"gender"`
+	Email          string   `json:"email"`
+	BizMail        string   `json:"biz_mail"`
+	BizMailAlias   string   `json:"biz_mail_alias"`
+	IsLeaderInDept []int    `json:"is_leader_in_dept"`
+	DirectLeader   []string `json:"direct_leader"`
+	Enable         int      `json:"enable"`
+	AvatarMediaid  string   `json:"avatar_mediaid"`
+	Telephone      string   `json:"telephone"`
+	Address        string   `json:"address"`
+	MainDepartment int      `json:"main_department"`
+	Extattr        struct {
+		Attrs []ExtraAttr `json:"attrs"`
+	} `json:"extattr"`
+	ToInvite         bool            `json:"to_invite"`
+	ExternalPosition string          `json:"external_position"`
+	ExternalProfile  ExternalProfile `json:"external_profile"`
+}
+
+// UserUpdate 更新成员
+// see https://developer.work.weixin.qq.com/document/path/90197
+func (r *Client) UserUpdate(req *UserUpdateRequest) error {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(userUpdateURL, accessToken), req); err != nil {
+		return err
+	}
+	return util.DecodeWithCommonError(response, "UserUpdate")
+}
+
 // UserGetResponse 获取部门成员响应
 type UserGetResponse struct {
 	util.CommonError

work/checkin/checkin.go

@@ -21,6 +21,8 @@ const (
 	clearOptionURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/clear_checkin_option_array_field?access_token=%s"
 	// delOptionURL 删除打卡规则
 	delOptionURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/del_checkin_option?access_token=%s"
+	// addRecordURL 添加打卡记录
+	addRecordURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/add_checkin_record?access_token=%s"
 )
 
 // SetScheduleListRequest 为打卡人员排班请求
@@ -140,6 +142,7 @@ type OptionGroupRule struct {
 	SyncOutCheckin         bool                         `json:"sync_out_checkin,omitempty"`
 	BukaRemind             OptionGroupBukaRemind        `json:"buka_remind,omitempty"`
 	BukaRestriction        int64                        `json:"buka_restriction,omitempty"`
+	CheckinMethodType      int64                        `json:"checkin_method_type,omitempty"`
 	SpanDayTime            int64                        `json:"span_day_time,omitempty"`
 	StandardWorkDuration   int64                        `json:"standard_work_duration,omitempty"`
 }
@@ -385,3 +388,41 @@ func (r *Client) DelOption(req *DelOptionRequest) error {
 	}
 	return util.DecodeWithCommonError(response, "DelOption")
 }
+
+// AddRecordRequest 添加打卡记录请求
+type AddRecordRequest struct {
+	Records []Record `json:"records"`
+}
+
+// Record 打卡记录
+type Record struct {
+	UserID         string   `json:"userid"`
+	CheckinTime    int64    `json:"checkin_time"`
+	LocationTitle  string   `json:"location_title"`
+	LocationDetail string   `json:"location_detail"`
+	MediaIDS       []string `json:"mediaids"`
+	Notes          string   `json:"notes"`
+	DeviceType     int      `json:"device_type"`
+	Lat            int64    `json:"lat"`
+	Lng            int64    `json:"lng"`
+	DeviceDetail   string   `json:"device_detail"`
+	WifiName       string   `json:"wifiname"`
+	WifiMac        string   `json:"wifimac"`
+}
+
+// AddRecord 添加打卡记录
+// see https://developer.work.weixin.qq.com/document/path/99647
+func (r *Client) AddRecord(req *AddRecordRequest) error {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(addRecordURL, accessToken), req); err != nil {
+		return err
+	}
+	return util.DecodeWithCommonError(response, "AddRecord")
+}

work/checkin/record.go

@@ -173,9 +173,15 @@ type (
 
 	// OtInfo 加班信息
 	OtInfo struct {
-		OtStatus          int64    `json:"ot_status"`
-		OtDuration        int64    `json:"ot_duration"`
-		ExceptionDuration []uint64 `json:"exception_duration"`
+		OtStatus              int64    `json:"ot_status"`
+		OtDuration            int64    `json:"ot_duration"`
+		ExceptionDuration     []uint64 `json:"exception_duration"`
+		WorkdayOverAsVacation int64    `json:"workday_over_as_vacation"`
+		WorkdayOverAsMoney    int64    `json:"workday_over_as_money"`
+		RestdayOverAsVacation int64    `json:"restday_over_as_vacation"`
+		RestdayOverAsMoney    int64    `json:"restday_over_as_money"`
+		HolidayOverAsVacation int64    `json:"holiday_over_as_vacation"`
+		HolidayOverAsMoney    int64    `json:"holiday_over_as_money"`
 	}
 )
 
@@ -237,13 +243,20 @@ type (
 		RegularDays     int64 `json:"regular_days"`
 		RegularWorkSec  int64 `json:"regular_work_sec"`
 		StandardWorkSec int64 `json:"standard_work_sec"`
+		RestDays        int64 `json:"rest_days"`
 	}
 
 	// OverWorkInfo 加班情况
 	OverWorkInfo struct {
-		WorkdayOverSec int64 `json:"workday_over_sec"`
-		HolidayOverSec int64 `json:"holidays_over_sec"`
-		RestDayOverSec int64 `json:"restdays_over_sec"`
+		WorkdayOverSec         int64 `json:"workday_over_sec"`
+		HolidayOverSec         int64 `json:"holidays_over_sec"`
+		RestDayOverSec         int64 `json:"restdays_over_sec"`
+		WorkdaysOverAsVacation int64 `json:"workdays_over_as_vacation"`
+		WorkdaysOverAsMoney    int64 `json:"workdays_over_as_money"`
+		RestdaysOverAsVacation int64 `json:"restdays_over_as_vacation"`
+		RestdaysOverAsMoney    int64 `json:"restdays_over_as_money"`
+		HolidaysOverAsVacation int64 `json:"holidays_over_as_vacation"`
+		HolidaysOverAsMoney    int64 `json:"holidays_over_as_money"`
 	}
 )
 
@@ -304,6 +317,10 @@ type CorpOptionGroup struct {
 	BukaRestriction        int64              `json:"buka_restriction"`
 	ScheduleList           []ScheduleList     `json:"schedulelist"`
 	OffWorkIntervalTime    int64              `json:"offwork_interval_time"`
+	SpanDayTime            int64              `json:"span_day_time"`
+	StandardWorkDuration   int64              `json:"standard_work_duration"`
+	OpenSpCheckin          bool               `json:"open_sp_checkin"`
+	CheckinMethodType      int64              `json:"checkin_method_type"`
 }
 
 // GroupCheckinDate 打卡时间，当规则类型为排班时没有意义
@@ -505,6 +522,7 @@ type OptionInfo struct {
 type OptionGroup struct {
 	GroupType              int64               `json:"grouptype"`
 	GroupID                int64               `json:"groupid"`
+	OpenSpCheckin          bool                `json:"open_sp_checkin"`
 	GroupName              string              `json:"groupname"`
 	CheckinDate            []OptionCheckinDate `json:"checkindate"`
 	SpeWorkdays            []SpeWorkdays       `json:"spe_workdays"`
@@ -518,6 +536,10 @@ type OptionGroup struct {
 	LocInfos               []LocInfos          `json:"loc_infos"`
 	ScheduleList           []ScheduleList      `json:"schedulelist"`
 	BukaRestriction        int64               `json:"buka_restriction"`
+	SpanDayTime            int64               `json:"span_day_time"`
+	StandardWorkDuration   int64               `json:"standard_work_duration"`
+	OffWorkIntervalTime    int64               `json:"offwork_interval_time"`
+	CheckinMethodType      int64               `json:"checkin_method_type"`
 }
 
 // OptionCheckinDate 打卡时间配置

work/config/config.go

@@ -7,12 +7,11 @@ import (
 
 // Config for 企业微信
 type Config struct {
-	CorpID        string `json:"corp_id"`     // corp_id
-	CorpSecret    string `json:"corp_secret"` // corp_secret,如果需要获取会话存档实例，当前参数请填写聊天内容存档的Secret，可以在企业微信管理端--管理工具--聊天内容存档查看
-	AgentID       string `json:"agent_id"`    // agent_id
-	Cache         cache.Cache
-	RasPrivateKey string // 消息加密私钥，可以在企业微信管理端--管理工具--消息加密公钥查看对用公钥，私钥一般由自己保存
-
+	CorpID         string `json:"corp_id"`     // corp_id
+	CorpSecret     string `json:"corp_secret"` // corp_secret,如果需要获取会话存档实例，当前参数请填写聊天内容存档的Secret，可以在企业微信管理端--管理工具--聊天内容存档查看
+	AgentID        string `json:"agent_id"`    // agent_id
+	Cache          cache.Cache
+	RasPrivateKey  string // 消息加密私钥，可以在企业微信管理端--管理工具--消息加密公钥查看对用公钥，私钥一般由自己保存
 	Token          string `json:"token"`            // 微信客服回调配置，用于生成签名校验回调请求的合法性
 	EncodingAESKey string `json:"encoding_aes_key"` // 微信客服回调p配置，用于解密回调消息内容对应的密文
 }

work/externalcontact/add_msg_template.go

@@ -1,90 +0,0 @@
-package externalcontact
-
-import (
-	"encoding/json"
-	"fmt"
-	"github.com/silenceper/wechat/v2/util"
-)
-
-const (
-	addMsgTemplateUrl = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/add_msg_template"
-)
-
-type ChatType string
-
-const (
-	ChatTypeSingle ChatType = "single"
-	ChatTypeGroup  ChatType = "group"
-)
-
-// ReqMessage 企业群发参数
-type ReqMessage struct {
-	ChatType       ChatType `json:"chat_type"`       //群发任务的类型，默认为single，表示发送给客户，group表示发送给客户群
-	ExternalUserid []string `json:"external_userid"` // 客户的外部联系人id列表，仅在chat_type为single时有效，不可与sender同时为空，最多可传入1万个客户
-	Sender         string   `json:"sender"`          //发送企业群发消息的成员userid，当类型为发送给客户群时必填
-	Text           struct {
-		Content string `json:"content"`
-	} `json:"text"`
-	Attachments []struct {
-		Msgtype     string         `json:"msgtype"`
-		Image       MsgImage       `json:"image"`
-		Link        MsgLink        `json:"link"`
-		Miniprogram MsgMiniprogram `json:"miniprogram"`
-		Video       MsgVideo       `json:"video"`
-		File        MsgFile        `json:"file"`
-	} `json:"attachments"`
-}
-type MsgImage struct {
-	MediaId string `json:"media_id"`
-	PicUrl  string `json:"pic_url"`
-}
-type MsgLink struct {
-	Title  string `json:"title"`
-	Picurl string `json:"picurl"`
-	Desc   string `json:"desc"`
-	Url    string `json:"url"`
-}
-type MsgMiniprogram struct {
-	Title      string `json:"title"`
-	PicMediaId string `json:"pic_media_id"`
-	Appid      string `json:"appid"`
-	Page       string `json:"page"`
-}
-type MsgVideo struct {
-	MediaId string `json:"media_id"`
-}
-type MsgFile struct {
-	MediaId string `json:"media_id"`
-}
-
-type resTemplateSend struct {
-	util.CommonError
-	FailList string `json:"fail_list"`
-	MsgID    int64  `json:"msgid"`
-}
-
-// Send 发送应用消息
-func (r *Client) Send(msg *ReqMessage) (msgID int64, err error) {
-	var accessToken string
-	accessToken, err = r.GetAccessToken()
-	if err != nil {
-		return
-	}
-	uri := fmt.Sprintf("%s?access_token=%s", addMsgTemplateUrl, accessToken)
-	var response []byte
-	response, err = util.PostJSON(uri, msg)
-	if err != nil {
-		return
-	}
-	var result resTemplateSend
-	err = json.Unmarshal(response, &result)
-	if err != nil {
-		return
-	}
-	if result.ErrCode != 0 {
-		err = fmt.Errorf("template msg send error : errcode=%v , errmsg=%v", result.ErrCode, result.ErrMsg)
-		return
-	}
-	msgID = result.MsgID
-	return
-}

work/externalcontact/customer_acquisition.go

@@ -23,6 +23,8 @@ const (
 	customerAcquisitionQuotaURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/customer_acquisition_quota?access_token=%s"
 	// customerAcquisitionStatistic 查询链接使用详情
 	customerAcquisitionStatisticURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/customer_acquisition/statistic?access_token=%s"
+	// customerAcquisitionGetChatInfo 获取成员多次收消息详情
+	customerAcquisitionGetChatInfoURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/customer_acquisition/get_chat_info?access_token=%s"
 )
 
 type (
@@ -308,3 +310,42 @@ func (r *Client) CustomerAcquisitionStatistic(req *CustomerAcquisitionStatisticR
 	err = util.DecodeWithError(response, result, "CustomerAcquisitionStatistic")
 	return result, err
 }
+
+type (
+	// GetChatInfoRequest 获取成员多次收消息详情请求
+	GetChatInfoRequest struct {
+		ChatKey string `json:"chat_key"`
+	}
+	// GetChatInfoResponse 获取成员多次收消息详情响应
+	GetChatInfoResponse struct {
+		util.CommonError
+		UserID         string   `json:"userid"`
+		ExternalUserID string   `json:"external_userid"`
+		ChatInfo       ChatInfo `json:"chat_info"`
+	}
+	// ChatInfo 聊天信息
+	ChatInfo struct {
+		RecvMsgCnt int64  `json:"recv_msg_cnt"` // 成员收到的此客户的消息次数
+		LinkID     string `json:"link_id"`      // 成员添加客户的获客链接id
+		State      string `json:"state"`        // 成员添加客户的state
+	}
+)
+
+// GetChatInfo 获取成员多次收消息详情
+// see https://developer.work.weixin.qq.com/document/path/100130
+func (r *Client) GetChatInfo(req *GetChatInfoRequest) (*GetChatInfoResponse, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(customerAcquisitionGetChatInfoURL, accessToken), req); err != nil {
+		return nil, err
+	}
+	result := &GetChatInfoResponse{}
+	err = util.DecodeWithError(response, result, "GetChatInfo")
+	return result, err
+}

work/externalcontact/user.go

@@ -1,162 +0,0 @@
-package externalcontact
-
-import (
-	"encoding/json"
-	"fmt"
-	"github.com/silenceper/wechat/v2/util"
-)
-
-const (
-	listUrl           = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/list"
-	getUrl            = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/get"
-	getByUserBatchUrl = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/batch/get_by_user"
-)
-
-type ReqGetByUser struct {
-	UseridList []string `json:"userid_list"`
-	Cursor     string   `json:"cursor"`
-	Limit      int      `json:"limit"`
-}
-type OneUser struct {
-	util.CommonError
-	ExternalContact ExternalContact `json:"external_contact"`
-	FollowUser      []FollowInfo    `json:"follow_user"` //注意，仅获取单个客户详情的时候这里返回的是跟进人列表
-	NextCursor      string          `json:"next_cursor"`
-}
-type resUserList struct {
-	util.CommonError
-	ExternalContactList []UserInfo `json:"external_contact_list"`
-	NextCursor          string     `json:"next_cursor"`
-}
-type resUserids struct {
-	util.CommonError
-	ExternalUserid []string `json:"external_userid"`
-}
-
-type UserInfo struct {
-	ExternalContact ExternalContact `json:"external_contact"`
-	FollowInfo      FollowInfo      `json:"follow_info"` //企业成员客户跟进人信息，可以参考获取客户详情，但标签信息只会返回企业标签和规则组标签的tag_id，个人标签将不再返回
-}
-
-// GetUseridList 获取我的客户列表
-func (tpl *Client) GetUseridList(myUserid string) (externalUserid []string, err error) {
-	var accessToken string
-	accessToken, err = tpl.GetAccessToken()
-	if err != nil {
-		return
-	}
-	uri := fmt.Sprintf("%s?access_token=%s&userid=%s", listUrl, accessToken, myUserid)
-	var response []byte
-	response, err = util.HTTPGet(uri)
-	if err != nil {
-		return
-	}
-	var result resUserids
-	err = json.Unmarshal(response, &result)
-	if err != nil {
-		return
-	}
-	if result.ErrCode != 0 {
-		err = fmt.Errorf("template msg send error : errcode=%v , errmsg=%v", result.ErrCode, result.ErrMsg)
-		return
-	}
-	externalUserid = result.ExternalUserid
-	return
-}
-
-// GetUseridList 获取我的全部客户列表及详情
-func (tpl *Client) GetQyUserInfoList(qyUserid []string) ([]UserInfo, error) {
-	var userInfoList []UserInfo
-	var req ReqGetByUser
-	req.UseridList = qyUserid
-	req.Limit = 100
-	for {
-		userInfoPage, resCursor, err := tpl.GetUserInfoListByUserIds(req)
-		if err != nil {
-			return userInfoList, err
-		}
-		userInfoList = append(userInfoList, userInfoPage...)
-		if resCursor != "" {
-			req.Cursor = resCursor
-		} else {
-			break
-		}
-	}
-	return userInfoList, nil
-}
-
-// GetUserInfoAndAllFollow 获取客户详情以及全部跟进人
-func (tpl *Client) GetUserInfoAndAllFollow(userid string) (OneUser, error) {
-	var result, res OneUser
-	var err error
-	var cursor string
-	for {
-		res, err = tpl.GetUserInfo(userid, cursor)
-		if err != nil {
-			return result, err
-		}
-		result.FollowUser = append(result.FollowUser, res.FollowUser...)
-		result.ExternalContact = res.ExternalContact
-		if res.NextCursor != "" {
-			cursor = res.NextCursor
-		} else {
-			break
-		}
-	}
-	return result, nil
-}
-
-// GetUserInfo 获取客户详情
-func (tpl *Client) GetUserInfo(externalUserid string, cursor ...string) (result OneUser, err error) {
-	var accessToken string
-	accessToken, err = tpl.GetAccessToken()
-	if err != nil {
-		return
-	}
-	var page = ""
-	if len(cursor) > 0 {
-		page = cursor[0]
-	}
-	uri := fmt.Sprintf("%s?access_token=%s&external_userid=%s&cursor=%s", getUrl, accessToken, externalUserid, page)
-	var response []byte
-	response, err = util.HTTPGet(uri)
-	if err != nil {
-		return
-	}
-	err = json.Unmarshal(response, &result)
-	if err != nil {
-		return
-	}
-	if result.ErrCode != 0 {
-		err = fmt.Errorf("template msg send error : errcode=%v , errmsg=%v", result.ErrCode, result.ErrMsg)
-		return
-	}
-	return
-}
-
-// GetUserInfoListByUserId 批量获取客户详情
-func (tpl *Client) GetUserInfoListByUserIds(req ReqGetByUser) (userList []UserInfo, nextCursor string, err error) {
-	var accessToken string
-	accessToken, err = tpl.GetAccessToken()
-	if err != nil {
-		return
-	}
-	uri := fmt.Sprintf("%s?access_token=%s", getByUserBatchUrl, accessToken)
-	var response []byte
-	response, err = util.PostJSON(uri, req)
-	if err != nil {
-		return
-	}
-	var result resUserList
-	err = json.Unmarshal(response, &result)
-	if err != nil {
-		return
-	}
-	if result.ErrCode != 0 {
-		err = fmt.Errorf("template msg send error : errcode=%v , errmsg=%v", result.ErrCode, result.ErrMsg)
-		return
-	}
-	userList = result.ExternalContactList
-	nextCursor = result.NextCursor
-	return
-}

work/js/js.go

@@ -1,93 +0,0 @@
-package js
-
-import (
-	"fmt"
-
-	"github.com/silenceper/wechat/v2/credential"
-	"github.com/silenceper/wechat/v2/util"
-	"github.com/silenceper/wechat/v2/work/context"
-)
-
-// Js struct
-type Js struct {
-	*context.Context
-	credential.JsTicketHandle
-}
-
-// Config 返回给用户jssdk配置信息
-type Config struct {
-	CorpID    string `json:"corp_id"`
-	Agentid   string `json:"agentid"`
-	Timestamp int64  `json:"timestamp"`
-	NonceStr  string `json:"nonce_str"`
-	Signature string `json:"signature"`
-}
-
-//NewJs init
-func NewJs(context *context.Context) *Js {
-	js := new(Js)
-	js.Context = context
-	jsTicketHandle := credential.NewWorkJsTicket(context.CorpID, context.AgentID, credential.CacheKeyWorkPrefix, context.Cache)
-	js.SetJsTicketHandle(jsTicketHandle)
-	return js
-}
-
-//SetJsTicketHandle 自定义js ticket取值方式
-func (js *Js) SetJsTicketHandle(ticketHandle credential.JsTicketHandle) {
-	js.JsTicketHandle = ticketHandle
-}
-
-//GetConfig 获取jssdk需要的配置参数
-//uri 为当前网页地址
-func (js *Js) GetConfig(uri string) (config *Config, err error) {
-	config = new(Config)
-	var accessToken string
-	accessToken, err = js.GetAccessToken()
-	if err != nil {
-		return
-	}
-	var ticketStr string
-	ticketStr, err = js.GetTicket(accessToken)
-	if err != nil {
-		return
-	}
-
-	nonceStr := util.RandomStr(16)
-	timestamp := util.GetCurrTS()
-	str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s&timestamp=%d&url=%s", ticketStr, nonceStr, timestamp, uri)
-	sigStr := util.Signature(str)
-
-	config.CorpID = js.CorpID
-	config.Agentid = js.AgentID
-	config.NonceStr = nonceStr
-	config.Timestamp = timestamp
-	config.Signature = sigStr
-	return
-}
-
-//GetAgentConfig 获取jssdk需要的配置参数
-//uri 为当前网页地址
-func (js *Js) GetAgentConfig(uri string) (config *Config, err error) {
-	config = new(Config)
-	var accessToken string
-	accessToken, err = js.GetAccessToken()
-	if err != nil {
-		return
-	}
-	var ticketStr string
-	ticketStr, err = js.GetTicket(accessToken)
-	if err != nil {
-		return
-	}
-
-	nonceStr := util.RandomStr(16)
-	timestamp := util.GetCurrTS()
-	str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s&timestamp=%d&url=%s", ticketStr, nonceStr, timestamp, uri)
-	sigStr := util.Signature(str)
-
-	config.CorpID = js.CorpID
-	config.NonceStr = nonceStr
-	config.Timestamp = timestamp
-	config.Signature = sigStr
-	return
-}

work/jsapi/jsapi.go

@@ -0,0 +1,75 @@
+package jsapi
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/credential"
+	"github.com/silenceper/wechat/v2/util"
+	"github.com/silenceper/wechat/v2/work/context"
+)
+
+// Js struct
+type Js struct {
+	*context.Context
+	jsTicket *credential.WorkJsTicket
+}
+
+// NewJs init
+func NewJs(context *context.Context) *Js {
+	js := new(Js)
+	js.Context = context
+	js.jsTicket = credential.NewWorkJsTicket(
+		context.Config.CorpID,
+		context.Config.AgentID,
+		credential.CacheKeyWorkPrefix,
+		context.Cache,
+	)
+	return js
+}
+
+// Config 返回给用户使用的配置
+type Config struct {
+	Timestamp int64  `json:"timestamp"`
+	NonceStr  string `json:"nonce_str"`
+	Signature string `json:"signature"`
+}
+
+// GetConfig 获取企业微信JS配置 https://developer.work.weixin.qq.com/document/path/90514
+func (js *Js) GetConfig(uri string) (config *Config, err error) {
+	config = new(Config)
+	var accessToken string
+	accessToken, err = js.GetAccessToken()
+	if err != nil {
+		return
+	}
+	var ticketStr string
+	ticketStr, err = js.jsTicket.GetTicket(accessToken, credential.TicketTypeCorpJs)
+	if err != nil {
+		return
+	}
+	config.NonceStr = util.RandomStr(16)
+	config.Timestamp = util.GetCurrTS()
+	str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s&timestamp=%d&url=%s", ticketStr, config.NonceStr, config.Timestamp, uri)
+	config.Signature = util.Signature(str)
+	return
+}
+
+// GetAgentConfig 获取企业微信应用JS配置 https://developer.work.weixin.qq.com/document/path/94313
+func (js *Js) GetAgentConfig(uri string) (config *Config, err error) {
+	config = new(Config)
+	var accessToken string
+	accessToken, err = js.GetAccessToken()
+	if err != nil {
+		return
+	}
+	var ticketStr string
+	ticketStr, err = js.jsTicket.GetTicket(accessToken, credential.TicketTypeAgentJs)
+	if err != nil {
+		return
+	}
+	config.NonceStr = util.RandomStr(16)
+	config.Timestamp = util.GetCurrTS()
+	str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s&timestamp=%d&url=%s", ticketStr, config.NonceStr, config.Timestamp, uri)
+	config.Signature = util.Signature(str)
+	return
+}

work/kf/account.go

@@ -33,6 +33,7 @@ type AccountAddSchema struct {
 }
 
 // AccountAdd 添加客服账号
+// see https://developer.work.weixin.qq.com/document/path/94662
 func (r *Client) AccountAdd(options AccountAddOptions) (info AccountAddSchema, err error) {
 	var (
 		accessToken string
@@ -59,6 +60,7 @@ type AccountDelOptions struct {
 }
 
 // AccountDel 删除客服账号
+// see https://developer.work.weixin.qq.com/document/path/94663
 func (r *Client) AccountDel(options AccountDelOptions) (info util.CommonError, err error) {
 	var (
 		accessToken string
@@ -86,7 +88,8 @@ type AccountUpdateOptions struct {
 	MediaID  string `json:"media_id"`  // 客服头像临时素材。可以调用上传临时素材接口获取, 不多于128个字节
 }
 
-// AccountUpdate 修复客服账号
+// AccountUpdate 修改客服账号
+// see https://developer.work.weixin.qq.com/document/path/94664
 func (r *Client) AccountUpdate(options AccountUpdateOptions) (info util.CommonError, err error) {
 	var (
 		accessToken string
@@ -109,9 +112,10 @@ func (r *Client) AccountUpdate(options AccountUpdateOptions) (info util.CommonEr
 
 // AccountInfoSchema 客服详情
 type AccountInfoSchema struct {
-	OpenKFID string `json:"open_kfid"` // 客服帐号ID
-	Name     string `json:"name"`      // 客服帐号名称
-	Avatar   string `json:"avatar"`    // 客服头像URL
+	OpenKFID        string `json:"open_kfid"`        // 客服帐号ID
+	Name            string `json:"name"`             // 客服帐号名称
+	Avatar          string `json:"avatar"`           // 客服头像URL
+	ManagePrivilege bool   `json:"manage_privilege"` // 当前调用接口的应用身份，是否有该客服账号的管理权限（编辑客服账号信息、分配会话和收发消息）
 }
 
 // AccountListSchema 获取客服账号列表响应内容
@@ -141,6 +145,31 @@ func (r *Client) AccountList() (info AccountListSchema, err error) {
 	return info, nil
 }
 
+// AccountPagingRequest 分页获取客服账号列表请求
+type AccountPagingRequest struct {
+	Offset int `json:"offset"`
+	Limit  int `json:"limit"`
+}
+
+// AccountPaging 分页获取客服账号列表
+// see https://developer.work.weixin.qq.com/document/path/94661
+func (r *Client) AccountPaging(req *AccountPagingRequest) (*AccountListSchema, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.ctx.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(accountListAddr, accessToken), req); err != nil {
+		return nil, err
+	}
+	result := &AccountListSchema{}
+	err = util.DecodeWithError(response, result, "AccountPaging")
+	return result, err
+}
+
 // AddContactWayOptions 获取客服账号链接
 // 1.若scene非空，返回的客服链接开发者可拼接scene_param=SCENE_PARAM参数使用，用户进入会话事件会将SCENE_PARAM原样返回。其中SCENE_PARAM需要urlencode，且长度不能超过128字节。
 // 如 https://work.weixin.qq.com/kf/kfcbf8f8d07ac7215f?enc_scene=ENCGFSDF567DF&scene_param=a%3D1%26b%3D2
@@ -158,6 +187,7 @@ type AddContactWaySchema struct {
 }
 
 // AddContactWay 获取客服账号链接
+// see https://developer.work.weixin.qq.com/document/path/94665
 func (r *Client) AddContactWay(options AddContactWayOptions) (info AddContactWaySchema, err error) {
 	var (
 		accessToken string

work/kf/client.go

@@ -24,7 +24,7 @@ func NewClient(cfg *config.Config) (client *Client, err error) {
 	}
 
 	// 初始化 AccessToken Handle
-	defaultAkHandle := credential.NewWorkAccessToken(cfg.CorpID, cfg.CorpSecret, credential.CacheKeyWorkPrefix, cfg.Cache)
+	defaultAkHandle := credential.NewWorkAccessToken(cfg.CorpID, cfg.CorpSecret, cfg.AgentID, credential.CacheKeyWorkPrefix, cfg.Cache)
 	ctx := &context.Context{
 		Config:            cfg,
 		AccessTokenHandle: defaultAkHandle,

work/material/media.go

@@ -59,6 +59,30 @@ func (r *Client) UploadImg(filename string) (*UploadImgResponse, error) {
 	return result, err
 }
 
+// UploadImgFromReader 从 io.Reader 上传图片
+// @see https://developer.work.weixin.qq.com/document/path/90256
+func (r *Client) UploadImgFromReader(filename string, reader io.Reader) (*UploadImgResponse, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var byteData []byte
+	byteData, err = io.ReadAll(reader)
+	if err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.PostFileByStream("media", filename, fmt.Sprintf(uploadImgURL, accessToken), byteData); err != nil {
+		return nil, err
+	}
+	result := &UploadImgResponse{}
+	err = util.DecodeWithError(response, result, "UploadImg")
+	return result, err
+}
+
 // UploadTempFile 上传临时素材
 // @see https://developer.work.weixin.qq.com/document/path/90253
 // @mediaType 媒体文件类型，分别有图片（image）、语音（voice）、视频（video），普通文件（file）
@@ -166,5 +190,13 @@ func (r *Client) GetTempFile(mediaID string) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
+
+	// 检查响应是否为错误信息
+	err = util.DecodeWithCommonError(response, "GetTempFile")
+	if err != nil {
+		return nil, err
+	}
+
+	// 如果不是错误响应，则返回原始数据
 	return response, nil
 }

work/message/group.go

@@ -1 +0,0 @@
-package message

work/message/image.go

@@ -1,16 +0,0 @@
-package message
-
-//Image 图片消息
-type Image struct {
-	CommonToken `json:"-"`
-	Image       struct {
-		MediaID string `xml:"MediaId" json:"media_id"`
-	} `xml:"Image" json:"image"`
-}
-
-//NewImage 回复图片消息
-func NewImage(mediaID string) *Image {
-	image := new(Image)
-	image.Image.MediaID = mediaID
-	return image
-}

work/message/message.go

@@ -24,7 +24,7 @@ type (
 		// 消息类型，此时固定为：text
 		MsgType string `json:"msgtype"`
 		// 企业应用的id，整型。企业内部开发，可在应用的设置页面查看；第三方服务商，可通过接口 获取企业授权信息 获取该参数值
-		AgentID int `json:"agentid"`
+		AgentID string `json:"agentid"`
 		// 表示是否是保密消息，0表示可对外分享，1表示不能分享且内容显示水印，默认为0
 		Safe int `json:"safe"`
 		// 表示是否开启id转译，0表示否，1表示是，默认0。仅第三方应用需要用到，企业自建应用可以忽略。

work/message/mix_message.go

@@ -1,285 +0,0 @@
-package message
-
-import (
-	"encoding/xml"
-
-	"github.com/silenceper/wechat/v2/officialaccount/device"
-)
-
-// MsgType 企业微信普通消息类型
-type MsgType string
-
-// EventType 企业微信事件消息类型
-type EventType string
-
-// InfoType 第三方平台授权事件类型
-type InfoType string
-
-const (
-	//MsgTypeEvent 表示事件推送消息 [限接收]
-	MsgTypeEvent = "event"
-
-	//MsgTypeText 表示文本消息
-	MsgTypeText MsgType = "text"
-	//MsgTypeImage 表示图片消息
-	MsgTypeImage MsgType = "image"
-	//MsgTypeVoice 表示语音消息
-	MsgTypeVoice MsgType = "voice"
-	//MsgTypeVideo 表示视频消息
-	MsgTypeVideo MsgType = "video"
-	//MsgTypeNews 表示图文消息[限回复与发送应用消息]
-	MsgTypeNews MsgType = "news"
-
-	//MsgTypeLink 表示链接消息[限接收]
-	MsgTypeLink MsgType = "link"
-	//MsgTypeLocation 表示坐标消息[限接收]
-	MsgTypeLocation MsgType = "location"
-
-	//MsgTypeUpdateButton 更新点击用户的按钮文案[限回复应用消息]
-	MsgTypeUpdateButton MsgType = "update_button"
-	//MsgTypeUpdateTemplateCard 更新点击用户的整张卡片[限回复应用消息]
-	MsgTypeUpdateTemplateCard MsgType = "update_template_card"
-
-	//MsgTypeFile 文件消息[限发送应用消息]
-	MsgTypeFile MsgType = "file"
-	//MsgTypeTextCard 文本卡片消息[限发送应用消息]
-	MsgTypeTextCard MsgType = "textcard"
-	//MsgTypeMpNews 图文消息[限发送应用消息] 跟普通的图文消息一致，唯一的差异是图文内容存储在企业微信
-	MsgTypeMpNews MsgType = "mpnews"
-	//MsgTypeMarkdown markdown消息[限发送应用消息]
-	MsgTypeMarkdown MsgType = "markdown"
-	//MsgTypeMiniprogramNotice 小程序通知消息[限发送应用消息]
-	MsgTypeMiniprogramNotice MsgType = "miniprogram_notice"
-	//MsgTypeTemplateCard 模板卡片消息[限发送应用消息]
-	MsgTypeTemplateCard MsgType = "template_card"
-)
-
-const (
-	//EventSubscribe 成员关注，成员已经加入企业，管理员添加成员到应用可见范围(或移除可见范围)时
-	EventSubscribe EventType = "subscribe"
-	//EventUnsubscribe 成员取消关注，成员已经在应用可见范围，成员加入(或退出)企业时
-	EventUnsubscribe EventType = "unsubscribe"
-	//EventEnterAgent 本事件在成员进入企业微信的应用时触发
-	EventEnterAgent EventType = "enter_agent"
-	//EventLocation 上报地理位置事件
-	EventLocation EventType = "LOCATION"
-	//EventBatchJobResult 异步任务完成事件推送
-	EventBatchJobResult EventType = "batch_job_result"
-	//EventClick 点击菜单拉取消息时的事件推送
-	EventClick EventType = "click"
-	//EventView 点击菜单跳转链接时的事件推送
-	EventView EventType = "view"
-	//EventScancodePush 扫码推事件的事件推送
-	EventScancodePush EventType = "scancode_push"
-	//EventScancodeWaitmsg 扫码推事件且弹出“消息接收中”提示框的事件推送
-	EventScancodeWaitmsg EventType = "scancode_waitmsg"
-	//EventPicSysphoto 弹出系统拍照发图的事件推送
-	EventPicSysphoto EventType = "pic_sysphoto"
-	//EventPicPhotoOrAlbum 弹出拍照或者相册发图的事件推送
-	EventPicPhotoOrAlbum EventType = "pic_photo_or_album"
-	//EventPicWeixin 弹出微信相册发图器的事件推送
-	EventPicWeixin EventType = "pic_weixin"
-	//EventLocationSelect 弹出地理位置选择器的事件推送
-	EventLocationSelect EventType = "location_select"
-
-	//EventOpenApprovalChange 审批状态通知事件推送
-	EventOpenApprovalChange EventType = "open_approval_change"
-
-	//EventShareAgentChange 共享应用事件回调
-	EventShareAgentChange EventType = "share_agent_change"
-
-	//EventTemplateCard 模板卡片事件推送
-	EventTemplateCard EventType = "template_card_event"
-
-	//EventTemplateCardMenu 通用模板卡片右上角菜单事件推送
-	EventTemplateCardMenu EventType = "template_card_menu_event"
-
-	//EventChangeExternalContact 企业客户事件推送
-	//add_external_contact 添加
-	//edit_external_contact 编辑
-	//add_half_external_contact 免验证添加
-	//del_external_contact 员工删除客户
-	//del_follow_user 客户删除跟进员工
-	//transfer_fail 企业将客户分配给新的成员接替后，客户添加失败
-	//change_external_chat 客户群创建事件
-	EventChangeExternalContact EventType = "change_external_contact"
-
-	//EventChangeExternalChat 企业客户群变更事件推送
-	//create 客户群创建
-	//update 客户群变更
-	//dismiss 客户群解散
-	EventChangeExternalChat EventType = "change_external_chat"
-
-	//EventChangeExternalTag 企业客户标签创建事件推送
-	//create 创建标签
-	//update 变更标签
-	//delete 删除标签
-	//shuffle 重新排序
-	EventChangeExternalTag EventType = "change_external_tag"
-
-	//EventKfMsg 企业微信客服回调事件
-	EventKfMsg EventType = "kf_msg_or_event"
-	//EventLivingStatusChange 直播回调事件
-	EventLivingStatusChange EventType = "living_status_change"
-
-	//EventMsgauditNotify 会话内容存档开启后，产生会话回调事件
-	EventMsgauditNotify EventType = "msgaudit_notify"
-)
-
-//todo 第三方应用开发
-/*const (
-    //微信开放平台需要用到
-
-    // InfoTypeVerifyTicket 返回ticket
-    InfoTypeVerifyTicket InfoType = "component_verify_ticket"
-    // InfoTypeAuthorized 授权
-    InfoTypeAuthorized = "authorized"
-    // InfoTypeUnauthorized 取消授权
-    InfoTypeUnauthorized = "unauthorized"
-    // InfoTypeUpdateAuthorized 更新授权
-    InfoTypeUpdateAuthorized = "updateauthorized"
-)*/
-
-// MixMessage 存放所有企业微信官方发送过来的消息和事件
-type MixMessage struct {
-	CommonToken
-
-	//接收普通消息
-	MsgID   int64 `xml:"MsgId"`   //其他消息推送过来是MsgId
-	AgentID int   `xml:"AgentID"` //企业应用的id，整型。可在应用的设置页面查看
-
-	Content      string `xml:"Content,omitempty"`      //文本消息内容
-	Format       string `xml:"Format,omitempty"`       //语音消息格式，如amr，speex等
-	ThumbMediaID string `xml:"ThumbMediaId,omitempty"` //视频消息缩略图的媒体id，可以调用获取媒体文件接口拉取数据，仅三天内有效
-
-	Title       string `xml:"Title,omitempty"`       //链接消息，标题
-	Description string `xml:"Description,omitempty"` //链接消息，描述
-	URL         string `xml:"Url,omitempty"`         //链接消息，链接跳转的url
-
-	PicURL  string `xml:"PicUrl,omitempty"`  ////图片消息或者链接消息，封面缩略图的url
-	MediaID string `xml:"MediaId,omitempty"` //图片媒体文件id//语音媒体文件id//视频消息缩略图的媒体id，可以调用获取媒体文件接口拉取，仅三天内有效
-
-	LocationX float64 `xml:"Location_X,omitempty"` //位置消息，地理位置纬度
-	LocationY float64 `xml:"Location_Y,omitempty"` //位置消息，地理位置经度
-	Scale     float64 `xml:"Scale,omitempty"`      //位置消息，地图缩放大小
-	Label     string  `xml:"Label,omitempty"`      //位置消息，地理位置信息
-
-	AppType string `xml:"AppType,omitempty"` //接收地理位置时存在，app类型，在企业微信固定返回wxwork，在微信不返回该字段
-
-	//TemplateMsgID int64   `xml:"MsgID"` //模板消息推送成功的消息是MsgID
-	///Recognition   string  `xml:"Recognition"`
-
-	//事件相关
-	Event      EventType `xml:"Event,omitempty"`
-	EventKey   string    `xml:"EventKey,omitempty"`
-	ChangeType string    `xml:"ChangeType,omitempty"`
-
-	//模板卡片事件推送 https://developer.work.weixin.qq.com/document/path/90240#%E6%A8%A1%E6%9D%BF%E5%8D%A1%E7%89%87%E4%BA%8B%E4%BB%B6%E6%8E%A8%E9%80%81
-	TaskId        string `xml:"TaskId,omitempty"`       //与发送模板卡片消息时指定的task_id相同
-	CardType      string `xml:"CardType,omitempty"`     //通用模板卡片的类型，类型有"text_notice", "news_notice", "button_interaction", "vote_interaction", "multiple_interaction"五种
-	ResponseCode  string `xml:"ResponseCode,omitempty"` //用于调用更新卡片接口的ResponseCode，24小时内有效，且只能使用一次
-	SelectedItems struct {
-		SelectedItem struct {
-			QuestionKey string   `xml:"QuestionKey"` //问题的key值
-			OptionIds   struct { //对应问题的选项列表
-				OptionId string `xml:"OptionId"`
-			} `xml:"OptionIds"`
-		} `xml:"SelectedItem"`
-	} `xml:"SelectedItems,omitempty"`
-
-	//仅上报地理位置事件
-	Latitude  string `xml:"Latitude,omitempty"`  //地理位置纬度
-	Longitude string `xml:"Longitude,omitempty"` //地理位置经度
-	Precision string `xml:"Precision,omitempty"` //地理位置精度
-
-	//仅异步任务完成事件
-	JobId   string `xml:"JobId,omitempty"`   //异步任务id，最大长度为64字符
-	JobType string `xml:"JobType,omitempty"` //异步任务，操作类型，字符串，目前分别有：sync_user(增量更新成员)、 replace_user(全量覆盖成员）、invite_user(邀请成员关注）、replace_party(全量覆盖部门)
-	ErrCode int    `xml:"ErrCode,omitempty"` //异步任务，返回码
-	ErrMsg  string `xml:"ErrMsg,omitempty"`  //异步任务，对返回码的文本描述内容
-
-	//开启通讯录回调通知 https://open.work.weixin.qq.com/api/doc/90000/90135/90967
-	UserID         string `xml:"UserID,omitempty"`         //用户userid
-	ExternalUserID string `xml:"ExternalUserID,omitempty"` //外部联系人userid
-	State          string `xml:"State,omitempty"`          //添加此用户的「联系我」方式配置的state参数，可用于识别添加此用户的渠道
-	WelcomeCode    string `xml:"WelcomeCode,omitempty"`    //欢迎码，当state为1时，该值有效
-	Source         string `xml:"Source,omitempty"`         //删除客户的操作来源，DELETE_BY_TRANSFER表示此客户是因在职继承自动被转接成员删除
-
-	// todo 第三方平台相关 字段名可能不准确
-	/*InfoType                     InfoType `xml:"InfoType"`
-	  AppID                        string   `xml:"AppId"`
-	  ComponentVerifyTicket        string   `xml:"ComponentVerifyTicket"`
-	  AuthorizerAppid              string   `xml:"AuthorizerAppid"`
-	  AuthorizationCode            string   `xml:"AuthorizationCode"```````````````````````````````````````
-	  AuthorizationCodeExpiredTime int64    `xml:"AuthorizationCodeExpiredTime"`
-	  PreAuthCode                  string   `xml:"PreAuthCode"`*/
-
-	//设备相关
-	device.MsgDevice
-}
-
-// EventPic 发图事件推送
-type EventPic struct {
-	PicMd5Sum string `xml:"PicMd5Sum"`
-}
-
-// EncryptedXMLMsg 安全模式下的消息体
-type EncryptedXMLMsg struct {
-	XMLName      struct{} `xml:"xml" json:"-"`
-	ToUserName   string   `xml:"ToUserName" json:"ToUserName"`
-	AgentID      string   `xml:"AgentID" json:"AgentID"`
-	EncryptedMsg string   `xml:"Encrypt"    json:"Encrypt"`
-}
-
-// ResponseEncryptedXMLMsg 需要返回的消息体
-type ResponseEncryptedXMLMsg struct {
-	XMLName      struct{} `xml:"xml" json:"-"`
-	EncryptedMsg string   `xml:"Encrypt"      json:"Encrypt"`
-	MsgSignature string   `xml:"MsgSignature" json:"MsgSignature"`
-	Timestamp    int64    `xml:"TimeStamp"    json:"TimeStamp"`
-	Nonce        string   `xml:"Nonce"        json:"Nonce"`
-}
-
-// CDATA  使用该类型,在序列化为 xml 文本时文本会被解析器忽略
-type CDATA string
-
-// MarshalXML 实现自己的序列化方法
-func (c CDATA) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-	return e.EncodeElement(struct {
-		string `xml:",cdata"`
-	}{string(c)}, start)
-}
-
-// CommonToken 消息中通用的结构
-type CommonToken struct {
-	XMLName      xml.Name `xml:"xml"`
-	ToUserName   CDATA    `xml:"ToUserName"`
-	FromUserName CDATA    `xml:"FromUserName"`
-	CreateTime   int64    `xml:"CreateTime"`
-	MsgType      MsgType  `xml:"MsgType"`
-}
-
-// SetToUserName set ToUserName
-func (msg *CommonToken) SetToUserName(toUserName CDATA) {
-	msg.ToUserName = toUserName
-}
-
-// SetFromUserName set FromUserName
-func (msg *CommonToken) SetFromUserName(fromUserName CDATA) {
-	msg.FromUserName = fromUserName
-}
-
-// SetCreateTime set createTime
-func (msg *CommonToken) SetCreateTime(createTime int64) {
-	msg.CreateTime = createTime
-}
-
-// SetMsgType set MsgType
-func (msg *CommonToken) SetMsgType(msgType MsgType) {
-	msg.MsgType = msgType
-}
-
-// GetOpenID get the FromUserName value
-func (msg *CommonToken) GetOpenID() string {
-	return string(msg.FromUserName)
-}

work/message/news.go

@@ -1,41 +0,0 @@
-package message
-
-//News 图文消息
-type News struct {
-	CommonToken  `json:"-"`
-	ArticleCount int        `xml:"ArticleCount" json:"-"`
-	Articles     []*Article `xml:"Articles>item,omitempty" json:"articles"`
-}
-
-//NewNews 初始化图文消息
-func NewNews(articles []*Article) *News {
-	news := new(News)
-	news.ArticleCount = len(articles)
-	news.Articles = articles
-	return news
-}
-
-//Article 单篇文章
-type Article struct {
-	Title       string `xml:"Title,omitempty" json:"title"`
-	Description string `xml:"Description,omitempty" json:"description"`
-	PicURL      string `xml:"PicUrl,omitempty" json:"picurl"`
-	URL         string `xml:"Url,omitempty" json:"url"`
-	Appid       string `xml:"-" json:"appid"`    //仅在发送应用消息时需要
-	Pagepath    string `xml:"-" json:"pagepath"` //仅在发送应用消息时需要
-}
-
-//MpNews 图文消息
-type MpNews struct {
-	Articles []*MpNewsArticle `xml:"-" json:"articles"`
-}
-
-//MpNewsArticle mpnews类型的图文消息，跟普通的图文消息一致，唯一的差异是图文内容存储在企业微信
-type MpNewsArticle struct {
-	Title            string `json:"title"`
-	ThumbMediaId     string `json:"thumb_media_id"`
-	Author           string `json:"author"`
-	ContentSourceUrl string `json:"content_source_url"`
-	Content          string `json:"content"`
-	Digest           string `json:"digest"`
-}

work/message/reply.go

@@ -1,15 +0,0 @@
-package message
-
-import "errors"
-
-//ErrInvalidReply 无效的回复
-var ErrInvalidReply = errors.New("无效的回复消息")
-
-//ErrUnsupportReply 不支持的回复类型
-var ErrUnsupportReply = errors.New("无需回复消息")
-
-//Reply 消息回复
-type Reply struct {
-	MsgType MsgType
-	MsgData interface{}
-}

work/message/template_card.go

@@ -1,129 +0,0 @@
-package message
-
-import (
-	"encoding/json"
-	"fmt"
-	"github.com/silenceper/wechat/v2/util"
-)
-
-const (
-	messageUpdateTemplateCardURL = "https://api.weixin.qq.com/cgi-bin/message/update_template_card"
-	messageDelURL                = "https://api.weixin.qq.com/cgi-bin/message/recall"
-)
-
-// UpdateButton 模板卡片按钮
-type UpdateButton struct {
-	//CommonToken `json:"-"`
-	Button struct {
-		ReplaceName string `xml:"ReplaceName" json:"replace_name"`
-	} `xml:"Button" json:"button"`
-}
-
-// NewUpdateButton 更新点击用户的按钮文案
-func NewUpdateButton(replaceName string) *UpdateButton {
-	btn := new(UpdateButton)
-	btn.Button.ReplaceName = replaceName
-	return btn
-}
-
-// TemplateCard 被动回复模板卡片
-// https://open.work.weixin.qq.com/api/doc/90000/90135/90241
-type TemplateCard struct {
-	//CommonToken  `json:"-"`
-	TemplateCard interface{} `xml:"TemplateCard" json:"template_card"`
-}
-
-// NewTemplateCard 更新点击用户的整张卡片
-func NewTemplateCard(cardXml interface{}) *TemplateCard {
-	card := new(TemplateCard)
-	card.TemplateCard = cardXml
-	return card
-}
-
-type PushFile struct {
-	MediaID string `json:"media_id"`
-}
-type PushTextCard struct {
-	Title       string `json:"title"`
-	Description string `json:"description"`
-	Url         string `json:"url"`
-	Btntxt      string `json:"btntxt"`
-}
-
-type resTemplateSend struct {
-	util.CommonError
-	Invaliduser  string `json:"invaliduser"`   //不合法的userid，不区分大小写，统一转为小写
-	Invalidparty string `json:"invalidparty"`  //不合法的partyid
-	Invalidtag   string `json:"invalidtag"`    //不合法的标签id
-	MsgID        string `json:"msgid"`         //消息id，用于撤回应用消息
-	ResponseCode string `json:"response_code"` //仅消息类型为“按钮交互型”，“投票选择型”和“多项选择型”的模板卡片消息返回，应用可使用response_code调用更新模版卡片消息接口，24小时内有效，且只能使用一次
-}
-
-// TemplateUpdate  更新模版卡片消息内容
-type TemplateUpdate struct {
-	Userids      []string `json:"userids"`
-	Partyids     []int    `json:"partyids"`
-	Tagids       []int    `json:"tagids"`
-	Atall        int      `json:"atall"`
-	Agentid      int      `json:"agentid"`
-	ResponseCode string   `json:"response_code"`
-	*UpdateButton
-	*TemplateCard
-}
-
-// UpdateTemplate 更新模版卡片消息
-func (r *Client) UpdateTemplate(msg *TemplateUpdate) (msgID string, err error) {
-	var accessToken string
-	accessToken, err = r.GetAccessToken()
-	if err != nil {
-		return
-	}
-	uri := fmt.Sprintf("%s?access_token=%s", messageUpdateTemplateCardURL, accessToken)
-	var response []byte
-	response, err = util.PostJSON(uri, msg)
-	if err != nil {
-		return
-	}
-	var result resTemplateSend
-	err = json.Unmarshal(response, &result)
-	if err != nil {
-		return
-	}
-	if result.ErrCode != 0 {
-		err = fmt.Errorf("template msg send error : errcode=%v , errmsg=%v", result.ErrCode, result.ErrMsg)
-		return
-	}
-	msgID = result.MsgID
-	return
-}
-
-type ReqRecall struct {
-	MsgID int64 `json:"msgid"`
-}
-
-// Recall 撤回应用消息
-func (r *Client) Recall(msgID int64) (err error) {
-	var accessToken string
-	accessToken, err = r.GetAccessToken()
-	if err != nil {
-		return
-	}
-	uri := fmt.Sprintf("%s?access_token=%s", messageDelURL, accessToken)
-	var response []byte
-	response, err = util.PostJSON(uri, &ReqRecall{
-		MsgID: msgID,
-	})
-	if err != nil {
-		return
-	}
-	var result util.CommonError
-	err = json.Unmarshal(response, &result)
-	if err != nil {
-		return
-	}
-	if result.ErrCode != 0 {
-		err = fmt.Errorf("template msg send error : errcode=%v , errmsg=%v", result.ErrCode, result.ErrMsg)
-		return
-	}
-	return
-}

work/message/text.go

@@ -1,14 +0,0 @@
-package message
-
-//Text 文本消息
-type Text struct {
-	CommonToken `json:"-"`
-	Content     CDATA `json:"content" xml:"Content"`
-}
-
-//NewText 初始化文本消息
-func NewText(content string) *Text {
-	text := new(Text)
-	text.Content = CDATA(content)
-	return text
-}

work/message/video.go

@@ -1,20 +0,0 @@
-package message
-
-//Video 视频消息
-type Video struct {
-	CommonToken `json:"-"`
-	Video       struct {
-		MediaID     string `xml:"MediaId" json:"media_id"`
-		Title       string `xml:"Title,omitempty" json:"title"`
-		Description string `xml:"Description,omitempty" json:"description"`
-	} `xml:"Video" json:"video"`
-}
-
-//NewVideo 回复图片消息
-func NewVideo(mediaID, title, description string) *Video {
-	video := new(Video)
-	video.Video.MediaID = mediaID
-	video.Video.Title = title
-	video.Video.Description = description
-	return video
-}

work/message/voice.go

@@ -1,16 +0,0 @@
-package message
-
-//Voice 语音消息
-type Voice struct {
-	CommonToken `json:"-"`
-	Voice       struct {
-		MediaID string `xml:"MediaId" json:"media_id"`
-	} `xml:"Voice" json:"voice"`
-}
-
-//NewVoice 回复语音消息
-func NewVoice(mediaID string) *Voice {
-	voice := new(Voice)
-	voice.Voice.MediaID = mediaID
-	return voice
-}

work/oauth/user.go

@@ -1,64 +0,0 @@
-package oauth
-
-import (
-	"encoding/json"
-	"fmt"
-	"github.com/silenceper/wechat/v2/util"
-)
-
-const (
-	code2SessionURL = "https://qyapi.weixin.qq.com/cgi-bin/miniprogram/jscode2session?access_token=%s&js_code=%s&grant_type=authorization_code"
-	launchCode      = "https://qyapi.weixin.qq.com/cgi-bin/get_launch_code?access_token=%s"
-)
-
-func (ctr *Oauth) Code2Session(code string) (result ResUserInfo, err error) {
-	var accessToken string
-	accessToken, err = ctr.GetAccessToken()
-	if err != nil {
-		return
-	}
-	var response []byte
-	response, err = util.HTTPGet(
-		fmt.Sprintf(code2SessionURL, accessToken, code),
-	)
-	if err != nil {
-		return
-	}
-	err = json.Unmarshal(response, &result)
-	if result.ErrCode != 0 {
-		err = fmt.Errorf("GetUserAccessToken error : errcode=%v , errmsg=%v", result.ErrCode, result.ErrMsg)
-		return
-	}
-	return
-}
-
-type RespLaunchCode struct {
-	util.CommonError
-	LaunchCode string `json:"launch_code"`
-}
-
-// GetLaunchCode 用于打开个人聊天窗口schema
-func (ctr *Oauth) GetLaunchCode(userID, other string) (userInfo *RespLaunchCode, err error) {
-	var accessToken string
-	accessToken, err = ctr.GetAccessToken()
-	if err != nil {
-		return
-	}
-
-	uri := fmt.Sprintf(launchCode, accessToken)
-	var response []byte
-	response, err = util.PostJSON(uri, map[string]interface{}{"operator_userid": userID, "single_chat": map[string]string{"userid": other}})
-	if err != nil {
-		return
-	}
-	userInfo = new(RespLaunchCode)
-	err = json.Unmarshal(response, userInfo)
-	if err != nil {
-		return
-	}
-	if userInfo.ErrCode != 0 {
-		err = fmt.Errorf("GetUserInfo Error , errcode=%d , errmsg=%s", userInfo.ErrCode, userInfo.ErrMsg)
-		return
-	}
-	return
-}

work/server/error.go

@@ -1,66 +0,0 @@
-package server
-
-import (
-	"reflect"
-	"strings"
-)
-
-// Error 错误
-type Error string
-
-const (
-	SDKValidateSignatureError Error = "签名验证错误"         //-40001
-	SDKParseJsonError         Error = "xml/json解析失败"   //-40002
-	SDKComputeSignatureError  Error = "sha加密生成签名失败"    //-40003
-	SDKIllegalAesKey          Error = "AESKey 非法"      //-40004
-	SDKValidateCorpidError    Error = "ReceiveId 校验错误" //-40005
-	SDKEncryptAESError        Error = "AES 加密失败"       //-40006
-	SDKDecryptAESError        Error = "AES 解密失败"       //-40007
-	SDKIllegalBuffer          Error = "解密后得到的buffer非法" //-40008
-	SDKEncodeBase64Error      Error = "base64加密失败"     //-40009
-	SDKDecodeBase64Error      Error = "base64解密失败"     //-40010
-	SDKGenJsonError           Error = "生成xml/json失败"   //-40011
-	SDKIllegalProtocolType    Error = "协议类型非法"         //-40012
-	SDKUnknownError           Error = "未知错误"
-)
-
-//Error 输出错误信息
-func (r Error) Error() string {
-	return reflect.ValueOf(r).String()
-}
-
-// NewSDKErr 初始化SDK实例错误信息
-func NewSDKErr(code int64, msgList ...string) Error {
-	switch code {
-	case 40001:
-		return SDKValidateSignatureError
-	case 40002:
-		return SDKParseJsonError
-	case 40003:
-		return SDKComputeSignatureError
-	case 40004:
-		return SDKIllegalAesKey
-	case 40005:
-		return SDKValidateCorpidError
-	case 40006:
-		return SDKEncryptAESError
-	case 40007:
-		return SDKDecryptAESError
-	case 40008:
-		return SDKIllegalBuffer
-	case 40009:
-		return SDKEncodeBase64Error
-	case 40010:
-		return SDKDecodeBase64Error
-	case 40011:
-		return SDKGenJsonError
-	case 40012:
-		return SDKIllegalProtocolType
-	default:
-		//返回未知的自定义错误
-		if len(msgList) > 0 {
-			return Error(strings.Join(msgList, ","))
-		}
-		return SDKUnknownError
-	}
-}

work/server/server.go

@@ -1,228 +0,0 @@
-package server
-
-import (
-	"encoding/xml"
-	"errors"
-	"fmt"
-	"net/http"
-	"reflect"
-	"runtime/debug"
-	"strconv"
-
-	"github.com/silenceper/wechat/v2/work/context"
-	"github.com/silenceper/wechat/v2/work/message"
-	log "github.com/sirupsen/logrus"
-
-	"github.com/silenceper/wechat/v2/util"
-)
-
-//Server struct
-type Server struct {
-	*context.Context
-	Writer  http.ResponseWriter
-	Request *http.Request
-
-	skipValidate bool
-
-	messageHandler func(*message.MixMessage) *message.Reply
-
-	RequestRawXMLMsg  []byte
-	RequestMsg        *message.MixMessage
-	ResponseRawXMLMsg []byte
-	ResponseMsg       interface{}
-
-	random    []byte
-	nonce     string
-	timestamp int64
-}
-
-//NewServer init
-func NewServer(context *context.Context) *Server {
-	srv := new(Server)
-	srv.Context = context
-	return srv
-}
-
-func (srv *Server) VerifyURL() (string, error) {
-	timestamp := srv.Query("timestamp")
-	nonce := srv.Query("nonce")
-	signature := srv.Query("msg_signature")
-	echoStr := srv.Query("echostr")
-	if signature != util.Signature(srv.Token, timestamp, nonce, echoStr) {
-		return "", NewSDKErr(40001)
-	}
-	_, bData, err := util.DecryptMsg(srv.CorpID, echoStr, srv.EncodingAESKey)
-	if err != nil {
-		return "", NewSDKErr(40002)
-	}
-
-	return string(bData), nil
-}
-
-// SkipValidate set skip validate
-func (srv *Server) SkipValidate(skip bool) {
-	srv.skipValidate = skip
-}
-
-//Serve 处理企业微信的请求消息
-func (srv *Server) Serve() error {
-	response, err := srv.handleRequest()
-	if err != nil {
-		return err
-	}
-
-	//debug print request msg
-	log.Debugf("request msg =%s", string(srv.RequestRawXMLMsg))
-	return srv.buildResponse(response)
-}
-
-//Validate 校验请求是否合法
-func (srv *Server) Validate() bool {
-	if srv.skipValidate {
-		return true
-	}
-	timestamp := srv.Query("timestamp")
-	nonce := srv.Query("nonce")
-	signature := srv.Query("msg_signature")
-	log.Debugf("validate signature, timestamp=%s, nonce=%s", timestamp, nonce)
-	return signature == util.Signature(srv.Token, timestamp, nonce)
-}
-
-//HandleRequest 处理企业微信的请求
-func (srv *Server) handleRequest() (reply *message.Reply, err error) {
-
-	var msg interface{}
-	msg, err = srv.getMessage()
-	if err != nil {
-		return
-	}
-	mixMessage, success := msg.(*message.MixMessage)
-	if !success {
-		err = errors.New("消息类型转换失败")
-	}
-	srv.RequestMsg = mixMessage
-	reply = srv.messageHandler(mixMessage)
-	return
-}
-
-//getMessage 解析企业微信返回的消息
-func (srv *Server) getMessage() (interface{}, error) {
-	var rawXMLMsgBytes []byte
-	var err error
-
-	var encryptedXMLMsg message.EncryptedXMLMsg
-	if err := xml.NewDecoder(srv.Request.Body).Decode(&encryptedXMLMsg); err != nil {
-		return nil, fmt.Errorf("从body中解析xml失败,err=%v", err)
-	}
-
-	//验证消息签名
-	timestamp := srv.Query("timestamp")
-	srv.timestamp, err = strconv.ParseInt(timestamp, 10, 32)
-	if err != nil {
-		return nil, err
-	}
-	nonce := srv.Query("nonce")
-	srv.nonce = nonce
-	msgSignature := srv.Query("msg_signature")
-	msgSignatureGen := util.Signature(srv.Token, timestamp, nonce, encryptedXMLMsg.EncryptedMsg)
-	if msgSignature != msgSignatureGen {
-		return nil, fmt.Errorf("消息不合法，验证签名失败")
-	}
-
-	//解密
-	srv.random, rawXMLMsgBytes, err = util.DecryptMsg(srv.CorpID, encryptedXMLMsg.EncryptedMsg, srv.EncodingAESKey)
-	if err != nil {
-		return nil, fmt.Errorf("消息解密失败, err=%v", err)
-	}
-
-	srv.RequestRawXMLMsg = rawXMLMsgBytes
-	return srv.parseRequestMessage(rawXMLMsgBytes)
-}
-
-func (srv *Server) parseRequestMessage(rawXMLMsgBytes []byte) (msg *message.MixMessage, err error) {
-	msg = &message.MixMessage{}
-	err = xml.Unmarshal(rawXMLMsgBytes, msg)
-	return
-}
-
-//SetMessageHandler 设置用户自定义的回调方法
-func (srv *Server) SetMessageHandler(handler func(*message.MixMessage) *message.Reply) {
-	srv.messageHandler = handler
-}
-
-func (srv *Server) buildResponse(reply *message.Reply) (err error) {
-	defer func() {
-		if e := recover(); e != nil {
-			err = fmt.Errorf("panic error: %v\n%s", e, debug.Stack())
-		}
-	}()
-	if reply == nil {
-		//do nothing
-		return nil
-	}
-	msgType := reply.MsgType
-	switch msgType {
-	case message.MsgTypeText:
-	case message.MsgTypeImage:
-	case message.MsgTypeVoice:
-	case message.MsgTypeVideo:
-	case message.MsgTypeNews:
-	case message.MsgTypeUpdateButton:
-	case message.MsgTypeUpdateTemplateCard:
-	default:
-		err = message.ErrUnsupportReply
-		return
-	}
-
-	msgData := reply.MsgData
-	value := reflect.ValueOf(msgData)
-	//msgData must be a ptr
-	kind := value.Kind().String()
-	if kind != "ptr" {
-		return message.ErrUnsupportReply
-	}
-
-	params := make([]reflect.Value, 1)
-	params[0] = reflect.ValueOf(srv.RequestMsg.FromUserName)
-	value.MethodByName("SetToUserName").Call(params)
-
-	params[0] = reflect.ValueOf(srv.RequestMsg.ToUserName)
-	value.MethodByName("SetFromUserName").Call(params)
-
-	params[0] = reflect.ValueOf(msgType)
-	value.MethodByName("SetMsgType").Call(params)
-
-	params[0] = reflect.ValueOf(util.GetCurrTS())
-	value.MethodByName("SetCreateTime").Call(params)
-	srv.ResponseMsg = msgData
-	srv.ResponseRawXMLMsg, err = xml.Marshal(msgData)
-	return
-}
-
-//Send 将自定义的消息发送
-func (srv *Server) Send() (err error) {
-	replyMsg := srv.ResponseMsg
-	log.Debugf("response msg =%+v", replyMsg)
-
-	//安全模式下对消息进行加密
-	var encryptedMsg []byte
-	encryptedMsg, err = util.EncryptMsg(srv.random, srv.ResponseRawXMLMsg, srv.CorpID, srv.EncodingAESKey)
-	if err != nil {
-		return
-	}
-	//TODO 如果获取不到timestamp nonce 则自己生成
-	timestamp := srv.timestamp
-	timestampStr := strconv.FormatInt(timestamp, 10)
-	msgSignature := util.Signature(srv.Token, timestampStr, srv.nonce, string(encryptedMsg))
-	replyMsg = message.ResponseEncryptedXMLMsg{
-		EncryptedMsg: string(encryptedMsg),
-		MsgSignature: msgSignature,
-		Timestamp:    timestamp,
-		Nonce:        srv.nonce,
-	}
-
-	if replyMsg != nil {
-		srv.XML(replyMsg)
-	}
-	return
-}

work/server/util.go

@@ -1,58 +0,0 @@
-package server
-
-import (
-	"encoding/xml"
-	"net/http"
-)
-
-var xmlContentType = []string{"application/xml; charset=utf-8"}
-var plainContentType = []string{"text/plain; charset=utf-8"}
-
-func writeContextType(w http.ResponseWriter, value []string) {
-	header := w.Header()
-	if val := header["Content-Type"]; len(val) == 0 {
-		header["Content-Type"] = value
-	}
-}
-
-//Render render from bytes
-func (srv *Server) Render(bytes []byte) {
-	//debug
-	//fmt.Println("response msg = ", string(bytes))
-	srv.Writer.WriteHeader(200)
-	_, err := srv.Writer.Write(bytes)
-	if err != nil {
-		panic(err)
-	}
-}
-
-//String render from string
-func (srv *Server) String(str string) {
-	writeContextType(srv.Writer, plainContentType)
-	srv.Render([]byte(str))
-}
-
-//XML render to xml
-func (srv *Server) XML(obj interface{}) {
-	writeContextType(srv.Writer, xmlContentType)
-	bytes, err := xml.Marshal(obj)
-	if err != nil {
-		panic(err)
-	}
-	srv.Render(bytes)
-}
-
-// Query returns the keyed url query value if it exists
-func (srv *Server) Query(key string) string {
-	value, _ := srv.GetQuery(key)
-	return value
-}
-
-// GetQuery is like Query(), it returns the keyed url query value
-func (srv *Server) GetQuery(key string) (string, bool) {
-	req := srv.Request
-	if values, ok := req.URL.Query()[key]; ok && len(values) > 0 {
-		return values[0], true
-	}
-	return "", false
-}

work/user/user.go

@@ -1,194 +0,0 @@
-package user
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/url"
-
-	"github.com/silenceper/wechat/v2/util"
-	"github.com/silenceper/wechat/v2/work/context"
-)
-
-const (
-	userInfoURL = "https://qyapi.weixin.qq.com/cgi-bin/user/get?access_token=%s&userid=%s"
-	updateURL   = "https://qyapi.weixin.qq.com/cgi-bin/user/simplelist?access_token=%s&department_id=%s&fetch_child=1"
-	userListURL = "https://qyapi.weixin.qq.com/cgi-bin/user/get"
-)
-
-// User 用户管理
-type User struct {
-	*context.Context
-}
-
-// NewUser 实例化
-func NewUser(context *context.Context) *User {
-	user := new(User)
-	user.Context = context
-	return user
-}
-
-// Info 用户基本信息
-type Info struct {
-	util.CommonError
-	Userid         string `json:"userid"`
-	Name           string `json:"name"`
-	Department     []int  `json:"department"`
-	Order          []int  `json:"order"`
-	Position       string `json:"position"`
-	Mobile         string `json:"mobile"`
-	Gender         string `json:"gender"`
-	Email          string `json:"email"`
-	IsLeaderInDept []int  `json:"is_leader_in_dept"`
-	Avatar         string `json:"avatar"`
-	ThumbAvatar    string `json:"thumb_avatar"`
-	Telephone      string `json:"telephone"`
-	Alias          string `json:"alias"`
-	Address        string `json:"address"`
-	OpenUserid     string `json:"open_userid"`
-	MainDepartment int    `json:"main_department"`
-	Extattr        struct {
-		Attrs []struct {
-			Type int    `json:"type"`
-			Name string `json:"name"`
-			Text struct {
-				Value string `json:"value"`
-			} `json:"text,omitempty"`
-			Web struct {
-				Url   string `json:"url"`
-				Title string `json:"title"`
-			} `json:"web,omitempty"`
-		} `json:"attrs"`
-	} `json:"extattr"`
-	Status           int    `json:"status"`
-	QrCode           string `json:"qr_code"`
-	ExternalPosition string `json:"external_position"`
-	ExternalProfile  struct {
-		ExternalCorpName string `json:"external_corp_name"`
-		WechatChannels   struct {
-			Nickname string `json:"nickname"`
-			Status   int    `json:"status"`
-		} `json:"wechat_channels"`
-		ExternalAttr []struct {
-			Type int    `json:"type"`
-			Name string `json:"name"`
-			Text struct {
-				Value string `json:"value"`
-			} `json:"text,omitempty"`
-			Web struct {
-				Url   string `json:"url"`
-				Title string `json:"title"`
-			} `json:"web,omitempty"`
-			Miniprogram struct {
-				Appid    string `json:"appid"`
-				Pagepath string `json:"pagepath"`
-				Title    string `json:"title"`
-			} `json:"miniprogram,omitempty"`
-		} `json:"external_attr"`
-	} `json:"external_profile"`
-}
-
-// OpenidList 用户列表
-type OpenidList struct {
-	util.CommonError
-
-	Total int `json:"total"`
-	Count int `json:"count"`
-	Data  struct {
-		OpenIDs []string `json:"openid"`
-	} `json:"data"`
-	NextOpenID string `json:"next_openid"`
-}
-
-// GetUserInfo 获取用户基本信息
-func (user *User) GetUserInfo(userID string) (userInfo *Info, err error) {
-	var accessToken string
-	accessToken, err = user.GetAccessToken()
-	if err != nil {
-		return
-	}
-
-	uri := fmt.Sprintf(userInfoURL, accessToken, userID)
-	var response []byte
-	response, err = util.HTTPGet(uri)
-	if err != nil {
-		return
-	}
-	userInfo = new(Info)
-	err = json.Unmarshal(response, userInfo)
-	if err != nil {
-		return
-	}
-	if userInfo.ErrCode != 0 {
-		err = fmt.Errorf("GetUserInfo Error , errcode=%d , errmsg=%s", userInfo.ErrCode, userInfo.ErrMsg)
-		return
-	}
-	return
-}
-
-// Update 更新员工资料
-func (user *User) Update(userID, external_position string) (err error) {
-	var accessToken string
-	accessToken, err = user.GetAccessToken()
-	if err != nil {
-		return
-	}
-
-	uri := fmt.Sprintf(updateURL, accessToken, userID)
-	var response []byte
-	response, err = util.PostJSON(uri, map[string]string{"userid": userID, "external_position": external_position})
-	if err != nil {
-		return
-	}
-
-	return util.DecodeWithCommonError(response, "updateURL")
-}
-
-// ListUserOpenIDs 返回用户列表
-func (user *User) ListUserOpenIDs(nextOpenid ...string) (*OpenidList, error) {
-	accessToken, err := user.GetAccessToken()
-	if err != nil {
-		return nil, err
-	}
-
-	uri, _ := url.Parse(userListURL)
-	q := uri.Query()
-	q.Set("access_token", accessToken)
-	if len(nextOpenid) > 0 && nextOpenid[0] != "" {
-		q.Set("next_openid", nextOpenid[0])
-	}
-	uri.RawQuery = q.Encode()
-
-	response, err := util.HTTPGet(uri.String())
-	if err != nil {
-		return nil, err
-	}
-
-	userlist := OpenidList{}
-
-	err = util.DecodeWithError(response, &userlist, "ListUserOpenIDs")
-	if err != nil {
-		return nil, err
-	}
-
-	return &userlist, nil
-}
-
-// ListAllUserOpenIDs 返回所有用户OpenID列表
-func (user *User) ListAllUserOpenIDs() ([]string, error) {
-	nextOpenid := ""
-	openids := make([]string, 0)
-	count := 0
-	for {
-		ul, err := user.ListUserOpenIDs(nextOpenid)
-		if err != nil {
-			return nil, err
-		}
-		openids = append(openids, ul.Data.OpenIDs...)
-		count += ul.Count
-		if ul.Total > count {
-			nextOpenid = ul.NextOpenID
-		} else {
-			return openids, nil
-		}
-	}
-}

work/work.go

@@ -9,15 +9,13 @@ import (
 	"github.com/silenceper/wechat/v2/work/context"
 	"github.com/silenceper/wechat/v2/work/externalcontact"
 	"github.com/silenceper/wechat/v2/work/invoice"
-	"github.com/silenceper/wechat/v2/work/js"
+	"github.com/silenceper/wechat/v2/work/jsapi"
 	"github.com/silenceper/wechat/v2/work/kf"
 	"github.com/silenceper/wechat/v2/work/material"
 	"github.com/silenceper/wechat/v2/work/message"
 	"github.com/silenceper/wechat/v2/work/msgaudit"
 	"github.com/silenceper/wechat/v2/work/oauth"
 	"github.com/silenceper/wechat/v2/work/robot"
-	"github.com/silenceper/wechat/v2/work/server"
-	"net/http"
 )
 
 // Work 企业微信
@@ -27,7 +25,7 @@ type Work struct {
 
 // NewWork init work
 func NewWork(cfg *config.Config) *Work {
-	defaultAkHandle := credential.NewWorkAccessToken(cfg.CorpID, cfg.CorpSecret, credential.CacheKeyWorkPrefix, cfg.Cache)
+	defaultAkHandle := credential.NewWorkAccessToken(cfg.CorpID, cfg.CorpSecret, cfg.AgentID, credential.CacheKeyWorkPrefix, cfg.Cache)
 	ctx := &context.Context{
 		Config:            cfg,
 		AccessTokenHandle: defaultAkHandle,
@@ -55,6 +53,11 @@ func (wk *Work) GetKF() (*kf.Client, error) {
 	return kf.NewClient(wk.ctx.Config)
 }
 
+// JsSdk get JsSdk
+func (wk *Work) JsSdk() *jsapi.Js {
+	return jsapi.NewJs(wk.ctx)
+}
+
 // GetExternalContact get external_contact
 func (wk *Work) GetExternalContact() *externalcontact.Client {
 	return externalcontact.NewClient(wk.ctx)
@@ -94,16 +97,3 @@ func (wk *Work) GetInvoice() *invoice.Client {
 func (wk *Work) GetCheckin() *checkin.Client {
 	return checkin.NewClient(wk.ctx)
 }
-
-// GetJs js-sdk配置
-func (wk *Work) GetJs() *js.Js {
-	return js.NewJs(wk.ctx)
-}
-
-// GetServer 消息管理：接收事件，被动回复消息管理
-func (wk *Work) GetServer(req *http.Request, writer http.ResponseWriter) *server.Server {
-	srv := server.NewServer(wk.ctx)
-	srv.Request = req
-	srv.Writer = writer
-	return srv
-}