fix:GetAccessTokenContext从cache中获取字符窜为空时,从微信服务器获取 (#721)

Co-authored-by: markwang <www.wang61@qq.com>

credential/default_access_token.go

@@ -66,8 +66,9 @@ func (ak *DefaultAccessToken) GetAccessToken() (accessToken string, err error) {
 func (ak *DefaultAccessToken) GetAccessTokenContext(ctx context.Context) (accessToken string, err error) {
 	// 先从cache中取
 	accessTokenCacheKey := fmt.Sprintf("%s_access_token_%s", ak.cacheKeyPrefix, ak.appID)
-	if val := ak.cache.Get(accessTokenCacheKey); val != nil {
-		return val.(string), nil
+	val := ak.cache.Get(accessTokenCacheKey)
+	if accessToken = val.(string); accessToken != "" {
+		return
 	}
 
 	// 加上lock，是为了防止在并发获取token时，cache刚好失效，导致从微信服务器上获取到不同token
@@ -75,8 +76,9 @@ func (ak *DefaultAccessToken) GetAccessTokenContext(ctx context.Context) (access
 	defer ak.accessTokenLock.Unlock()
 
 	// 双检，防止重复从微信服务器获取
-	if val := ak.cache.Get(accessTokenCacheKey); val != nil {
-		return val.(string), nil
+	val = ak.cache.Get(accessTokenCacheKey)
+	if accessToken = val.(string); accessToken != "" {
+		return
 	}
 
 	// cache失效，从微信服务器获取

work/addresslist/department.go

@@ -13,6 +13,8 @@ const (
 	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"
+	// departmentGetURL 获取单个部门详情 https://qyapi.weixin.qq.com/cgi-bin/department/get?access_token=ACCESS_TOKEN&id=ID
+	departmentGetURL = "https://qyapi.weixin.qq.com/cgi-bin/department/get?access_token=%s&id=%d"
 )
 
 type (
@@ -121,3 +123,24 @@ func (r *Client) DepartmentList() ([]*Department, error) {
 	// 返回数据
 	return result.Department, err
 }
+
+// DepartmentGet 获取单个部门详情
+// see https://developer.work.weixin.qq.com/document/path/95351
+func (r *Client) DepartmentGet(departmentID int) (*Department, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.HTTPGet(fmt.Sprintf(departmentGetURL, accessToken, departmentID)); err != nil {
+		return nil, err
+	}
+	result := &Department{}
+	if err = util.DecodeWithError(response, result, "DepartmentGet"); err != nil {
+		return nil, err
+	}
+	return result, nil
+}

work/addresslist/user.go

@@ -221,7 +221,7 @@ type UserGetResponse struct {
 	} `json:"external_profile"` // 成员对外属性，字段详情见对外属性；代开发自建应用需要管理员授权才返回；第三方仅通讯录应用可获取；对于非第三方创建的成员，第三方通讯录应用也不可获取；上游企业不可获取下游企业成员该字段
 }
 
-// UserGet 获取部门成员
+// UserGet 读取成员
 // @see https://developer.work.weixin.qq.com/document/path/90196
 func (r *Client) UserGet(UserID string) (*UserGetResponse, error) {
 	var (
@@ -237,8 +237,8 @@ func (r *Client) UserGet(UserID string) (*UserGetResponse, error) {
 		strings.Join([]string{
 			userGetURL,
 			util.Query(map[string]interface{}{
-				"access_token":  accessToken,
-				"department_id": UserID,
+				"access_token": accessToken,
+				"userid":       UserID,
 			}),
 		}, "?")); err != nil {
 		return nil, err

work/checkin/checkin.go

@@ -0,0 +1,69 @@
+package checkin
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	// getCheckinDataURL 获取打卡记录数据
+	getCheckinDataURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/getcheckindata?access_token=%s"
+)
+
+type (
+	// GetCheckinDataRequest 获取打卡记录数据请求
+	GetCheckinDataRequest struct {
+		OpenCheckinDataType int64    `json:"opencheckindatatype"`
+		StartTime           int64    `json:"starttime"`
+		EndTime             int64    `json:"endtime"`
+		UserIDList          []string `json:"useridlist"`
+	}
+	// GetCheckinDataResponse 获取打卡记录数据响应
+	GetCheckinDataResponse struct {
+		util.CommonError
+		CheckinData []*GetCheckinDataItem `json:"checkindata"`
+	}
+	// GetCheckinDataItem 打卡记录数据
+	GetCheckinDataItem struct {
+		UserID         string   `json:"userid"`
+		GroupName      string   `json:"groupname"`
+		CheckinType    string   `json:"checkin_type"`
+		ExceptionType  string   `json:"exception_type"`
+		CheckinTime    int64    `json:"checkin_time"`
+		LocationTitle  string   `json:"location_title"`
+		LocationDetail string   `json:"location_detail"`
+		WifiName       string   `json:"wifiname"`
+		Notes          string   `json:"notes"`
+		WifiMac        string   `json:"wifimac"`
+		MediaIDs       []string `json:"mediaids"`
+		SchCheckinTime int64    `json:"sch_checkin_time"`
+		GroupID        int64    `json:"groupid"`
+		ScheduleID     int64    `json:"schedule_id"`
+		TimelineID     int64    `json:"timeline_id"`
+		Lat            int64    `json:"lat,omitempty"`
+		Lng            int64    `json:"lng,omitempty"`
+		DeviceID       string   `json:"deviceid,omitempty"`
+	}
+)
+
+// GetCheckinData 获取打卡记录数据
+// @see https://developer.work.weixin.qq.com/document/path/90262
+func (r *Client) GetCheckinData(req *GetCheckinDataRequest) (*GetCheckinDataResponse, 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(getCheckinDataURL, accessToken), req); err != nil {
+		return nil, err
+	}
+	result := &GetCheckinDataResponse{}
+	if err = util.DecodeWithError(response, result, "GetCheckinData"); err != nil {
+		return nil, err
+	}
+	return result, nil
+}

work/checkin/client.go

@@ -0,0 +1,17 @@
+package checkin
+
+import (
+	"github.com/silenceper/wechat/v2/work/context"
+)
+
+// Client 打卡接口实例
+type Client struct {
+	*context.Context
+}
+
+// NewClient 初始化实例
+func NewClient(ctx *context.Context) *Client {
+	return &Client{
+		ctx,
+	}
+}

work/externalcontact/groupchat.go

@@ -70,6 +70,7 @@ type (
 		GroupNickname string  `json:"group_nickname"`    //在群里的昵称
 		Name          string  `json:"name"`              //名字。仅当 need_name = 1 时返回 如果是微信用户，则返回其在微信中设置的名字 如果是企业微信联系人，则返回其设置对外展示的别名或实名
 		UnionID       string  `json:"unionid,omitempty"` //外部联系人在微信开放平台的唯一身份标识（微信unionid），通过此字段企业可将外部联系人与公众号/小程序用户关联起来。仅当群成员类型是微信用户（包括企业成员未添加好友），且企业绑定了微信开发者ID有此字段（查看绑定方法）。第三方不可获取，上游企业不可获取下游企业客户的unionid字段
+		State         string  `json:"state,omitempty"`   //如果在配置入群方式时，配置了state参数，那么在获取客户群详情时，通过该方式入群的成员，会额外获取到相应的state参数
 	}
 	//GroupChatAdmin 群管理员
 	GroupChatAdmin struct {

work/material/media.go

@@ -11,6 +11,8 @@ const (
 	uploadImgURL = "https://qyapi.weixin.qq.com/cgi-bin/media/uploadimg?access_token=%s"
 	// uploadTempFile 上传临时素材
 	uploadTempFile = "https://qyapi.weixin.qq.com/cgi-bin/media/upload?access_token=%s&type=%s"
+	// uploadAttachment 上传附件资源
+	uploadAttachment = "https://qyapi.weixin.qq.com/cgi-bin/media/upload_attachment?access_token=%s&media_type=%s&attachment_type=%d"
 )
 
 // UploadImgResponse 上传图片响应
@@ -27,6 +29,14 @@ type UploadTempFileResponse struct {
 	Type     string `json:"type"`
 }
 
+// UploadAttachmentResponse 上传资源附件响应
+type UploadAttachmentResponse struct {
+	util.CommonError
+	MediaID  string `json:"media_id"`
+	CreateAt int64  `json:"created_at"`
+	Type     string `json:"type"`
+}
+
 // UploadImg 上传图片
 // @see https://developer.work.weixin.qq.com/document/path/90256
 func (r *Client) UploadImg(filename string) (*UploadImgResponse, error) {
@@ -69,3 +79,26 @@ func (r *Client) UploadTempFile(filename string, mediaType string) (*UploadTempF
 	}
 	return result, nil
 }
+
+// UploadAttachment 上传附件资源
+// @see https://developer.work.weixin.qq.com/document/path/95098
+// @mediaType 媒体文件类型，分别有图片（image）、视频（video）、普通文件（file）
+// @attachment_type 附件类型，不同的附件类型用于不同的场景。1：朋友圈；2:商品图册
+func (r *Client) UploadAttachment(filename string, mediaType string, attachmentType int) (*UploadAttachmentResponse, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.PostFile("media", filename, fmt.Sprintf(uploadAttachment, accessToken, mediaType, attachmentType)); err != nil {
+		return nil, err
+	}
+	result := &UploadAttachmentResponse{}
+	if err = util.DecodeWithError(response, result, "UploadAttachment"); err != nil {
+		return nil, err
+	}
+	return result, nil
+}

work/work.go

@@ -4,6 +4,7 @@ import (
 	"github.com/silenceper/wechat/v2/credential"
 	"github.com/silenceper/wechat/v2/work/addresslist"
 	"github.com/silenceper/wechat/v2/work/appchat"
+	"github.com/silenceper/wechat/v2/work/checkin"
 	"github.com/silenceper/wechat/v2/work/config"
 	"github.com/silenceper/wechat/v2/work/context"
 	"github.com/silenceper/wechat/v2/work/externalcontact"
@@ -85,3 +86,8 @@ func (wk *Work) GetAppChat() *appchat.Client {
 func (wk *Work) GetInvoice() *invoice.Client {
 	return invoice.NewClient(wk.ctx)
 }
+
+// GetCheckin 获取打卡接口实例
+func (wk *Work) GetCheckin() *checkin.Client {
+	return checkin.NewClient(wk.ctx)
+}