git/wechat
1
0
Fork 0
mirror of https://github.com/silenceper/wechat.git synced 2026-02-08 22:52:27 +08:00
Code Issues Projects Releases Wiki Activity

feat: modify redis version to v8.11.5 (#582)

Browse Source 
* [feature] Format the code and improve Mini Program authorization to obtain openid（miniprogram/auth/auth.go Code2Session）

* [feature] CheckEncryptedData (https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/user-info/auth.checkEncryptedData.html)

* upgrade json error

* upgrade json error

* [feature] Wallet Transfer returns the pointer object

* feat:Adaptation of new go-redis components

* improve code

* feat:upgrade golangci-lint-action version

* fix

* test ci

* fix

* test ci

* fix

* test

* improve code

* feat:GetPhoneNumber return ptr

* fix: ptr Elem() error

* improve code

* improve code

* improve code

* improve code

* upgrade go version v1.15

* improve .golangci.yml

* feat:modify redis version v8.11.5

Co-authored-by: houseme <houseme@outlook.com>
This commit is contained in:
houseme
2022-07-20 11:25:15 +08:00
committed by GitHub
parent ded5a10f9f
commit adf142dac2
25 changed files with 92 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
work/externalcontact/external_user.go
View File

@@ -27,7 +27,6 @@ type ExternalUserListResponse struct {
// GetExternalUserList 获取客户列表
// @see https://developer.work.weixin.qq.com/document/path/92113
func (r *Client) GetExternalUserList(userID string) ([]string, error) {
var accessToken string
accessToken, err := r.GetAccessToken()
if err != nil {
return nil, err
@@ -98,7 +97,6 @@ type WechatChannel struct {
// GetExternalUserDetail 获取外部联系人详情
func (r *Client) GetExternalUserDetail(externalUserID string, nextCursor ...string) (*ExternalUser, error) {
var accessToken string
accessToken, err := r.GetAccessToken()
if err != nil {
return nil, err
@@ -130,7 +128,6 @@ type ExternalUserDetailListResponse struct {
// BatchGetExternalUserDetails 批量获取外部联系人详情
func (r *Client) BatchGetExternalUserDetails(request BatchGetExternalUserDetailsRequest) ([]ExternalUser, error) {
var accessToken string
accessToken, err := r.GetAccessToken()
if err != nil {
return nil, err
@@ -157,12 +154,11 @@ type UpdateUserRemarkRequest struct {
Description string `json:"description"`
RemarkCompany string `json:"remark_company"`
RemarkMobiles []string `json:"remark_mobiles"`
RemarkPicMediaid string `json:"remark_pic_mediaid"`
RemarkPicMediaID string `json:"remark_pic_mediaid"`
}
// UpdateUserRemark 修改客户备注信息
func (r *Client) UpdateUserRemark(request UpdateUserRemarkRequest) error {
var accessToken string
accessToken, err := r.GetAccessToken()
if err != nil {
return err

5
work/externalcontact/follow_user.go
View File

@@ -17,10 +17,9 @@ type followerUserResponse struct {
FollowUser []string `json:"follow_user"`
}
//GetFollowUserList 获取配置了客户联系功能的成员列表
//@see https://developer.work.weixin.qq.com/document/path/92571
// GetFollowUserList 获取配置了客户联系功能的成员列表
// @see https://developer.work.weixin.qq.com/document/path/92571
func (r *Client) GetFollowUserList() ([]string, error) {
var accessToken string
accessToken, err := r.GetAccessToken()
if err != nil {
return nil, err

4
work/externalcontact/tag.go
View File

@@ -54,7 +54,6 @@ type TagGroupTagItem struct {
// GetCropTagList 获取企业标签库
// @see https://developer.work.weixin.qq.com/document/path/92117
func (r *Client) GetCropTagList(req GetCropTagRequest) ([]TagGroup, error) {
var accessToken string
accessToken, err := r.GetAccessToken()
if err != nil {
return nil, err
@@ -127,7 +126,6 @@ type EditCropTagRequest struct {
// EditCropTag 修改企业客户标签
// @see https://developer.work.weixin.qq.com/document/path/92117
func (r *Client) EditCropTag(req EditCropTagRequest) error {
var accessToken string
accessToken, err := r.GetAccessToken()
if err != nil {
return err
@@ -151,7 +149,6 @@ type DeleteCropTagRequest struct {
// DeleteCropTag 删除企业客户标签
// @see https://developer.work.weixin.qq.com/document/path/92117
func (r *Client) DeleteCropTag(req DeleteCropTagRequest) error {
var accessToken string
accessToken, err := r.GetAccessToken()
if err != nil {
return err
@@ -177,7 +174,6 @@ type MarkTagRequest struct {
// MarkTag 为客户打上标签
// @see https://developer.work.weixin.qq.com/document/path/92118
func (r *Client) MarkTag(request MarkTagRequest) error {
var accessToken string
accessToken, err := r.GetAccessToken()
if err != nil {
return err

30
work/kf/account.go
View File

@@ -38,12 +38,10 @@ func (r *Client) AccountAdd(options AccountAddOptions) (info AccountAddSchema, e
accessToken string
data []byte
)
accessToken, err = r.ctx.GetAccessToken()
if err != nil {
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
return
}
data, err = util.PostJSON(fmt.Sprintf(accountAddAddr, accessToken), options)
if err != nil {
if data, err = util.PostJSON(fmt.Sprintf(accountAddAddr, accessToken), options); err != nil {
return
}
if err = json.Unmarshal(data, &info); err != nil {
@@ -66,12 +64,10 @@ func (r *Client) AccountDel(options AccountDelOptions) (info util.CommonError, e
accessToken string
data []byte
)
accessToken, err = r.ctx.GetAccessToken()
if err != nil {
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
return
}
data, err = util.PostJSON(fmt.Sprintf(accountDelAddr, accessToken), options)
if err != nil {
if data, err = util.PostJSON(fmt.Sprintf(accountDelAddr, accessToken), options); err != nil {
return
}
if err = json.Unmarshal(data, &info); err != nil {
@@ -96,12 +92,10 @@ func (r *Client) AccountUpdate(options AccountUpdateOptions) (info util.CommonEr
accessToken string
data []byte
)
accessToken, err = r.ctx.GetAccessToken()
if err != nil {
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
return
}
data, err = util.PostJSON(fmt.Sprintf(accountUpdateAddr, accessToken), options)
if err != nil {
if data, err = util.PostJSON(fmt.Sprintf(accountUpdateAddr, accessToken), options); err != nil {
return
}
if err = json.Unmarshal(data, &info); err != nil {
@@ -132,12 +126,10 @@ func (r *Client) AccountList() (info AccountListSchema, err error) {
accessToken string
data []byte
)
accessToken, err = r.ctx.GetAccessToken()
if err != nil {
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
return
}
data, err = util.HTTPGet(fmt.Sprintf(accountListAddr, accessToken))
if err != nil {
if data, err = util.HTTPGet(fmt.Sprintf(accountListAddr, accessToken)); err != nil {
return
}
if err = json.Unmarshal(data, &info); err != nil {
@@ -171,12 +163,10 @@ func (r *Client) AddContactWay(options AddContactWayOptions) (info AddContactWay
accessToken string
data []byte
)
accessToken, err = r.ctx.GetAccessToken()
if err != nil {
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
return
}
data, err = util.PostJSON(fmt.Sprintf(addContactWayAddr, accessToken), options)
if err != nil {
if data, err = util.PostJSON(fmt.Sprintf(addContactWayAddr, accessToken), options); err != nil {
return
}
if err = json.Unmarshal(data, &info); err != nil {

6
work/kf/customer.go
View File

@@ -38,12 +38,10 @@ func (r *Client) CustomerBatchGet(options CustomerBatchGetOptions) (info Custome
accessToken string
data []byte
)
accessToken, err = r.ctx.GetAccessToken()
if err != nil {
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
return
}
data, err = util.PostJSON(fmt.Sprintf(customerBatchGetAddr, accessToken), options)
if err != nil {
if data, err = util.PostJSON(fmt.Sprintf(customerBatchGetAddr, accessToken), options); err != nil {
return
}
if err = json.Unmarshal(data, &info); err != nil {

6
work/kf/other.go
View File

@@ -31,12 +31,10 @@ func (r *Client) GetCorpQualification() (info CorpQualificationSchema, err error
accessToken string
data []byte
)
accessToken, err = r.ctx.GetAccessToken()
if err != nil {
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
return
}
data, err = util.HTTPGet(fmt.Sprintf(corpQualification, accessToken))
if err != nil {
if data, err = util.HTTPGet(fmt.Sprintf(corpQualification, accessToken)); err != nil {
return info, err
}
if err = json.Unmarshal(data, &info); err != nil {

6
work/kf/sendmsg.go
View File

@@ -31,12 +31,10 @@ func (r *Client) SendMsg(options interface{}) (info SendMsgSchema, err error) {
accessToken string
data []byte
)
accessToken, err = r.ctx.GetAccessToken()
if err != nil {
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
return
}
data, err = util.PostJSON(fmt.Sprintf(sendMsgAddr, accessToken), options)
if err != nil {
if data, err = util.PostJSON(fmt.Sprintf(sendMsgAddr, accessToken), options); err != nil {
return
}
if err = json.Unmarshal(data, &info); err != nil {

6
work/kf/sendmsgonevent.go
View File

@@ -38,12 +38,10 @@ func (r *Client) SendMsgOnEvent(options interface{}) (info SendMsgOnEventSchema,
accessToken string
data []byte
)
accessToken, err = r.ctx.GetAccessToken()
if err != nil {
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
return
}
data, err = util.PostJSON(fmt.Sprintf(sendMsgOnEventAddr, accessToken), options)
if err != nil {
if data, err = util.PostJSON(fmt.Sprintf(sendMsgOnEventAddr, accessToken), options); err != nil {
return
}
if err = json.Unmarshal(data, &info); err != nil {

6
work/kf/servicer.go
View File

@@ -37,12 +37,10 @@ func (r *Client) ReceptionistAdd(options ReceptionistOptions) (info Receptionist
accessToken string
data []byte
)
accessToken, err = r.ctx.GetAccessToken()
if err != nil {
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
return
}
data, err = util.PostJSON(fmt.Sprintf(receptionistAddAddr, accessToken), options)
if err != nil {
if data, err = util.PostJSON(fmt.Sprintf(receptionistAddAddr, accessToken), options); err != nil {
return
}
if err = json.Unmarshal(data, &info); err != nil {

12
work/kf/servicestate.go
View File

@@ -39,12 +39,10 @@ func (r *Client) ServiceStateGet(options ServiceStateGetOptions) (info ServiceSt
accessToken string
data []byte
)
accessToken, err = r.ctx.GetAccessToken()
if err != nil {
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
return
}
data, err = util.PostJSON(fmt.Sprintf(serviceStateGetAddr, accessToken), options)
if err != nil {
if data, err = util.PostJSON(fmt.Sprintf(serviceStateGetAddr, accessToken), options); err != nil {
return
}
if err = json.Unmarshal(data, &info); err != nil {
@@ -76,12 +74,10 @@ func (r *Client) ServiceStateTrans(options ServiceStateTransOptions) (info Servi
accessToken string
data []byte
)
accessToken, err = r.ctx.GetAccessToken()
if err != nil {
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
return
}
data, err = util.PostJSON(fmt.Sprintf(serviceStateTransAddr, accessToken), options)
if err != nil {
if data, err = util.PostJSON(fmt.Sprintf(serviceStateTransAddr, accessToken), options); err != nil {
return
}
if err = json.Unmarshal(data, &info); err != nil {

6
work/kf/syncmsg.go
View File

@@ -45,12 +45,10 @@ func (r *Client) SyncMsg(options SyncMsgOptions) (info SyncMsgSchema, err error)
accessToken string
data []byte
)
accessToken, err = r.ctx.GetAccessToken()
if err != nil {
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
return
}
data, err = util.PostJSON(fmt.Sprintf(syncMsgAddr, accessToken), options)
if err != nil {
if data, err = util.PostJSON(fmt.Sprintf(syncMsgAddr, accessToken), options); err != nil {
return
}
originInfo := syncMsgSchema{}

24
work/kf/upgrade.go
View File

@@ -34,12 +34,10 @@ func (r *Client) UpgradeServiceConfig() (info UpgradeServiceConfigSchema, err er
accessToken string
data []byte
)
accessToken, err = r.ctx.GetAccessToken()
if err != nil {
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
return
}
data, err = util.HTTPGet(fmt.Sprintf(upgradeServiceConfigAddr, accessToken))
if err != nil {
if data, err = util.HTTPGet(fmt.Sprintf(upgradeServiceConfigAddr, accessToken)); err != nil {
return
}
if err = json.Unmarshal(data, &info); err != nil {
@@ -72,12 +70,10 @@ func (r *Client) UpgradeService(options UpgradeServiceOptions) (info util.Common
accessToken string
data []byte
)
accessToken, err = r.ctx.GetAccessToken()
if err != nil {
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
return
}
data, err = util.PostJSON(fmt.Sprintf(upgradeService, accessToken), options)
if err != nil {
if data, err = util.PostJSON(fmt.Sprintf(upgradeService, accessToken), options); err != nil {
return
}
if err = json.Unmarshal(data, &info); err != nil {
@@ -106,12 +102,10 @@ func (r *Client) UpgradeMemberService(options UpgradeMemberServiceOptions) (info
accessToken string
data []byte
)
accessToken, err = r.ctx.GetAccessToken()
if err != nil {
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
return
}
data, err = util.PostJSON(fmt.Sprintf(upgradeService, accessToken), options)
if err != nil {
if data, err = util.PostJSON(fmt.Sprintf(upgradeService, accessToken), options); err != nil {
return
}
if err = json.Unmarshal(data, &info); err != nil {
@@ -169,12 +163,10 @@ func (r *Client) UpgradeServiceCancel(options UpgradeServiceCancelOptions) (info
accessToken string
data []byte
)
accessToken, err = r.ctx.GetAccessToken()
if err != nil {
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
return
}
data, err = util.PostJSON(fmt.Sprintf(upgradeServiceCancel, accessToken), options)
if err != nil {
if data, err = util.PostJSON(fmt.Sprintf(upgradeServiceCancel, accessToken), options); err != nil {
return
}
if err = json.Unmarshal(data, &info); err != nil {

14
work/oauth/oauth.go
View File

@@ -33,23 +33,21 @@ func NewOauth(ctx *context.Context) *Oauth {
// GetTargetURL 获取授权地址
func (ctr *Oauth) GetTargetURL(callbackURL string) string {
// url encode
urlStr := url.QueryEscape(callbackURL)
return fmt.Sprintf(
oauthTargetURL,
ctr.CorpID,
urlStr,
url.QueryEscape(callbackURL),
)
}
// GetQrContentTargetURL 构造独立窗口登录二维码
func (ctr *Oauth) GetQrContentTargetURL(callbackURL string) string {
// url encode
urlStr := url.QueryEscape(callbackURL)
return fmt.Sprintf(
oauthQrContentTargetURL,
ctr.CorpID,
ctr.AgentID,
urlStr,
url.QueryEscape(callbackURL),
util.RandomStr(16),
)
}
@@ -68,15 +66,11 @@ type ResUserInfo struct {
// UserFromCode 根据code获取用户信息
func (ctr *Oauth) UserFromCode(code string) (result ResUserInfo, err error) {
var accessToken string
accessToken, err = ctr.GetAccessToken()
if err != nil {
if accessToken, err = ctr.GetAccessToken(); err != nil {
return
}
var response []byte
response, err = util.HTTPGet(
fmt.Sprintf(oauthUserInfoURL, accessToken, code),
)
if err != nil {
if response, err = util.HTTPGet(fmt.Sprintf(oauthUserInfoURL, accessToken, code)); err != nil {
return
}
err = json.Unmarshal(response, &result)