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

Merge branch 'master' into master

Browse Source
This commit is contained in:
silenceper
2018-09-24 09:35:42 +08:00
committed by GitHub
parent d926e384c2 6f77a6de82
commit c1f886db25
14 changed files with 272 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
menu/menu.go
View File

@@ -134,15 +134,8 @@ func (menu *Menu) SetMenu(buttons []*Button) error {
if err != nil {
return err
}
var commError util.CommonError
err = json.Unmarshal(response, &commError)
if err != nil {
return err
}
if commError.ErrCode != 0 {
return fmt.Errorf("SetMenu Error , errcode=%d , errmsg=%s", commError.ErrCode, commError.ErrMsg)
}
return nil
return util.DecodeWithCommonError(response, "SetMenu")
}
//GetMenu 获取菜单配置
@@ -180,15 +173,8 @@ func (menu *Menu) DeleteMenu() error {
if err != nil {
return err
}
var commError util.CommonError
err = json.Unmarshal(response, &commError)
if err != nil {
return err
}
if commError.ErrCode != 0 {
return fmt.Errorf("GetMenu Error , errcode=%d , errmsg=%s", commError.ErrCode, commError.ErrMsg)
}
return nil
return util.DecodeWithCommonError(response, "GetMenu")
}
//AddConditional 添加个性化菜单
@@ -208,15 +194,8 @@ func (menu *Menu) AddConditional(buttons []*Button, matchRule *MatchRule) error
if err != nil {
return err
}
var commError util.CommonError
err = json.Unmarshal(response, &commError)
if err != nil {
return err
}
if commError.ErrCode != 0 {
return fmt.Errorf("AddConditional Error , errcode=%d , errmsg=%s", commError.ErrCode, commError.ErrMsg)
}
return nil
return util.DecodeWithCommonError(response, "AddConditional")
}
//DeleteConditional 删除个性化菜单
@@ -235,15 +214,8 @@ func (menu *Menu) DeleteConditional(menuID int64) error {
if err != nil {
return err
}
var commError util.CommonError
err = json.Unmarshal(response, &commError)
if err != nil {
return err
}
if commError.ErrCode != 0 {
return fmt.Errorf("DeleteConditional Error , errcode=%d , errmsg=%s", commError.ErrCode, commError.ErrMsg)
}
return nil
return util.DecodeWithCommonError(response, "DeleteConditional")
}
//MenuTryMatch 菜单匹配
@@ -286,7 +258,6 @@ func (menu *Menu) GetCurrentSelfMenuInfo() (resSelfMenuInfo ResSelfMenuInfo, err
if err != nil {
return
}
fmt.Println(string(response))
err = json.Unmarshal(response, &resSelfMenuInfo)
if err != nil {
return