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

fix golangci-lint failed (#284)

Browse Source 
* fix golangci-lint error
This commit is contained in:
silenceper
2020-06-24 14:36:33 +08:00
committed by GitHub
parent b5c70cc206
commit 868b31cb3d
31 changed files with 175 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
.golangci.yml Normal file
View File

@@ -0,0 +1,53 @@
linters:
# please, do not use `enable-all`: it's deprecated and will be removed soon.
# inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
disable-all: true
enable:
- bodyclose
- deadcode
- depguard
- dogsled
- dupl
- errcheck
- funlen
- goconst
- gocritic
- gocyclo
- gofmt
- goimports
- golint
- goprintffuncname
- gosimple
- govet
- ineffassign
- interfacer
- misspell
- nolintlint
- rowserrcheck
- scopelint
- staticcheck
- structcheck
- stylecheck
- typecheck
- unconvert
- unparam
- unused
- varcheck
- whitespace
issues:
# Excluding configuration per-path, per-linter, per-text and per-source
exclude-rules:
- path: _test\.go
linters:
- gomnd
# https://github.com/go-critic/go-critic/issues/926
- linters:
- gocritic
text: "unnecessaryDefer:"
linters-settings:
funlen:
lines: 66
statements: 40

6
cache/memory.go vendored
View File

@@ -62,13 +62,13 @@ func (mem *Memory) Set(key string, val interface{}, timeout time.Duration) (err
//Delete delete value in memcache. //Delete delete value in memcache.
func (mem *Memory) Delete(key string) error { func (mem *Memory) Delete(key string) error {
return mem.deleteKey(key) mem.deleteKey(key)
return nil
} }
// deleteKey // deleteKey
func (mem *Memory) deleteKey(key string) error { func (mem *Memory) deleteKey(key string) {
mem.Lock() mem.Lock()
defer mem.Unlock() defer mem.Unlock()
delete(mem.data, key) delete(mem.data, key)
return nil
} }

5
cache/redis.go vendored
View File

@@ -95,10 +95,7 @@ func (r *Redis) IsExist(key string) bool {
a, _ := conn.Do("EXISTS", key) a, _ := conn.Do("EXISTS", key)
i := a.(int64) i := a.(int64)
if i > 0 { return i > 0
return true
}
return false
} }
//Delete 删除 //Delete 删除

3
credential/default_js_ticket.go
View File

@@ -68,6 +68,9 @@ func GetTicketFromServer(accessToken string) (ticket ResTicket, err error) {
var response []byte var response []byte
url := fmt.Sprintf(getTicketURL, accessToken) url := fmt.Sprintf(getTicketURL, accessToken)
response, err = util.HTTPGet(url) response, err = util.HTTPGet(url)
if err != nil {
return
}
err = json.Unmarshal(response, &ticket) err = json.Unmarshal(response, &ticket)
if err != nil { if err != nil {
return return

21
miniprogram/encryptor/encryptor.go
View File

@@ -22,7 +22,6 @@ func NewEncryptor(context *context.Context) *Encryptor {
return basic return basic
} }
var ( var (
// ErrAppIDNotMatch appid不匹配 // ErrAppIDNotMatch appid不匹配
ErrAppIDNotMatch = errors.New("app id not match") ErrAppIDNotMatch = errors.New("app id not match")
@@ -36,19 +35,19 @@ var (
// PlainData 用户信息/手机号信息 // PlainData 用户信息/手机号信息
type PlainData struct { type PlainData struct {
OpenID string `json:"openId"` OpenID string `json:"openId"`
UnionID string `json:"unionId"` UnionID string `json:"unionId"`
NickName string `json:"nickName"` NickName string `json:"nickName"`
Gender int `json:"gender"` Gender int `json:"gender"`
City string `json:"city"` City string `json:"city"`
Province string `json:"province"` Province string `json:"province"`
Country string `json:"country"` Country string `json:"country"`
AvatarURL string `json:"avatarUrl"` AvatarURL string `json:"avatarUrl"`
Language string `json:"language"` Language string `json:"language"`
PhoneNumber string `json:"phoneNumber"` PhoneNumber string `json:"phoneNumber"`
PurePhoneNumber string `json:"purePhoneNumber"` PurePhoneNumber string `json:"purePhoneNumber"`
CountryCode string `json:"countryCode"` CountryCode string `json:"countryCode"`
Watermark struct { Watermark struct {
Timestamp int64 `json:"timestamp"` Timestamp int64 `json:"timestamp"`
AppID string `json:"appid"` AppID string `json:"appid"`
} `json:"watermark"` } `json:"watermark"`

10
miniprogram/qrcode/qrcode.go
View File

@@ -74,15 +74,13 @@ func (qrCode *QRCode) fetchCode(urlStr string, body interface{}) (response []byt
err = fmt.Errorf("fetchCode error : errcode=%v , errmsg=%v", result.ErrCode, result.ErrMsg) err = fmt.Errorf("fetchCode error : errcode=%v , errmsg=%v", result.ErrCode, result.ErrMsg)
return nil, err return nil, err
} }
} else if contentType == "image/jpeg" { }
if contentType == "image/jpeg" {
// 返回文件 // 返回文件
return response, nil return response, nil
} else {
err = fmt.Errorf("fetchCode error : unknown response content type - %v", contentType)
return nil, err
} }
err = fmt.Errorf("fetchCode error : unknown response content type - %v", contentType)
return return nil, err
} }
// CreateWXAQRCode 获取小程序二维码，适用于需要的码数量较少的业务场景 // CreateWXAQRCode 获取小程序二维码，适用于需要的码数量较少的业务场景

4
miniprogram/subscribe/subscribe.go
View File

@@ -47,6 +47,8 @@ func (s *Subscribe) Send(msg *Message) (err error) {
} }
uri := fmt.Sprintf("%s?access_token=%s", subscribeSendURL, accessToken) uri := fmt.Sprintf("%s?access_token=%s", subscribeSendURL, accessToken)
response, err := util.PostJSON(uri, msg) response, err := util.PostJSON(uri, msg)
if err != nil {
return
}
return util.DecodeWithCommonError(response, "Send") return util.DecodeWithCommonError(response, "Send")
} }

2
miniprogram/tcb/file.go
View File

@@ -130,5 +130,5 @@ func (tcb *Tcb) BatchDeleteFile(env string, fileIDList []string) (*BatchDeleteFi
} }
batchDeleteFileRes := &BatchDeleteFileRes{} batchDeleteFileRes := &BatchDeleteFileRes{}
err = util.DecodeWithError(response, batchDeleteFileRes, "BatchDeleteFile") err = util.DecodeWithError(response, batchDeleteFileRes, "BatchDeleteFile")
return batchDeleteFileRes, nil return batchDeleteFileRes, err
} }

113
officialaccount/broadcast/broadcast.go
View File

@@ -8,9 +8,9 @@ import (
) )
const ( const (
sendURLByTag = "https://api.weixin.qq.com/cgi-bin/message/mass/sendall" sendURLByTag = "https://api.weixin.qq.com/cgi-bin/message/mass/sendall"
sendURLByOpenID = "https://api.weixin.qq.com/cgi-bin/message/mass/send" sendURLByOpenID = "https://api.weixin.qq.com/cgi-bin/message/mass/send"
deleteSendURL ="https://api.weixin.qq.com/cgi-bin/message/mass/delete" deleteSendURL = "https://api.weixin.qq.com/cgi-bin/message/mass/delete"
) )
//MsgType 发送消息类型 //MsgType 发送消息类型
@@ -69,17 +69,17 @@ type sendRequest struct {
//发送图片 //发送图片
Images *Image `json:"images,omitempty"` Images *Image `json:"images,omitempty"`
//发送卡券 //发送卡券
WxCard map[string]interface{} `json:"wxcard,omitempty"` WxCard map[string]interface{} `json:"wxcard,omitempty"`
MsgType MsgType `json:"msgtype"` MsgType MsgType `json:"msgtype"`
SendIgnoreReprint int32 `json:"send_ignore_reprint,omitempty"` SendIgnoreReprint int32 `json:"send_ignore_reprint,omitempty"`
} }
//Image 发送图片 //Image 发送图片
type Image struct{ type Image struct {
MediaIDs []string `json:"media_ids"` MediaIDs []string `json:"media_ids"`
Recommend string `json:"recommend"` Recommend string `json:"recommend"`
NeedOpenComment int32 `json:"need_open_comment"` NeedOpenComment int32 `json:"need_open_comment"`
OnlyFansCanComment int32 `json:"only_fans_can_comment"` OnlyFansCanComment int32 `json:"only_fans_can_comment"`
} }
//SendText 群发文本 //SendText 群发文本
@@ -92,13 +92,13 @@ func (broadcast *Broadcast) SendText(user *User, content string) (*Result, error
return nil, err return nil, err
} }
req := &sendRequest{ req := &sendRequest{
ToUser: nil, ToUser: nil,
MsgType: MsgTypeText, MsgType: MsgTypeText,
} }
req.Text=map[string]interface{}{ req.Text = map[string]interface{}{
"content":content, "content": content,
} }
req,sendURL:=broadcast.chooseTagOrOpenID(user,req) req, sendURL := broadcast.chooseTagOrOpenID(user, req)
url := fmt.Sprintf("%s?access_token=%s", sendURL, ak) url := fmt.Sprintf("%s?access_token=%s", sendURL, ak)
data, err := util.PostJSON(url, req) data, err := util.PostJSON(url, req)
if err != nil { if err != nil {
@@ -110,22 +110,22 @@ func (broadcast *Broadcast) SendText(user *User, content string) (*Result, error
} }
//SendNews 发送图文 //SendNews 发送图文
func (broadcast *Broadcast) SendNews(user *User, mediaID string,ignoreReprint bool) (*Result, error) { func (broadcast *Broadcast) SendNews(user *User, mediaID string, ignoreReprint bool) (*Result, error) {
ak, err := broadcast.GetAccessToken() ak, err := broadcast.GetAccessToken()
if err != nil { if err != nil {
return nil, err return nil, err
} }
req := &sendRequest{ req := &sendRequest{
ToUser: nil, ToUser: nil,
MsgType: MsgTypeNews, MsgType: MsgTypeNews,
} }
if ignoreReprint{ if ignoreReprint {
req.SendIgnoreReprint=1 req.SendIgnoreReprint = 1
} }
req.Mpnews=map[string]interface{}{ req.Mpnews = map[string]interface{}{
"media_id":mediaID, "media_id": mediaID,
} }
req,sendURL:=broadcast.chooseTagOrOpenID(user,req) req, sendURL := broadcast.chooseTagOrOpenID(user, req)
url := fmt.Sprintf("%s?access_token=%s", sendURL, ak) url := fmt.Sprintf("%s?access_token=%s", sendURL, ak)
data, err := util.PostJSON(url, req) data, err := util.PostJSON(url, req)
if err != nil { if err != nil {
@@ -136,7 +136,6 @@ func (broadcast *Broadcast) SendNews(user *User, mediaID string,ignoreReprint bo
return res, err return res, err
} }
//SendVoice 发送语音 //SendVoice 发送语音
func (broadcast *Broadcast) SendVoice(user *User, mediaID string) (*Result, error) { func (broadcast *Broadcast) SendVoice(user *User, mediaID string) (*Result, error) {
ak, err := broadcast.GetAccessToken() ak, err := broadcast.GetAccessToken()
@@ -144,13 +143,13 @@ func (broadcast *Broadcast) SendVoice(user *User, mediaID string) (*Result, erro
return nil, err return nil, err
} }
req := &sendRequest{ req := &sendRequest{
ToUser: nil, ToUser: nil,
MsgType: MsgTypeVoice, MsgType: MsgTypeVoice,
} }
req.Voice=map[string]interface{}{ req.Voice = map[string]interface{}{
"media_id":mediaID, "media_id": mediaID,
} }
req,sendURL:=broadcast.chooseTagOrOpenID(user,req) req, sendURL := broadcast.chooseTagOrOpenID(user, req)
url := fmt.Sprintf("%s?access_token=%s", sendURL, ak) url := fmt.Sprintf("%s?access_token=%s", sendURL, ak)
data, err := util.PostJSON(url, req) data, err := util.PostJSON(url, req)
if err != nil { if err != nil {
@@ -168,11 +167,11 @@ func (broadcast *Broadcast) SendImage(user *User, images *Image) (*Result, error
return nil, err return nil, err
} }
req := &sendRequest{ req := &sendRequest{
ToUser: nil, ToUser: nil,
MsgType: MsgTypeImage, MsgType: MsgTypeImage,
} }
req.Images=images req.Images = images
req,sendURL:=broadcast.chooseTagOrOpenID(user,req) req, sendURL := broadcast.chooseTagOrOpenID(user, req)
url := fmt.Sprintf("%s?access_token=%s", sendURL, ak) url := fmt.Sprintf("%s?access_token=%s", sendURL, ak)
data, err := util.PostJSON(url, req) data, err := util.PostJSON(url, req)
if err != nil { if err != nil {
@@ -183,23 +182,22 @@ func (broadcast *Broadcast) SendImage(user *User, images *Image) (*Result, error
return res, err return res, err
} }
//SendVideo 发送视频 //SendVideo 发送视频
func (broadcast *Broadcast) SendVideo(user *User, mediaID string,title,description string) (*Result, error) { func (broadcast *Broadcast) SendVideo(user *User, mediaID string, title, description string) (*Result, error) {
ak, err := broadcast.GetAccessToken() ak, err := broadcast.GetAccessToken()
if err != nil { if err != nil {
return nil, err return nil, err
} }
req := &sendRequest{ req := &sendRequest{
ToUser: nil, ToUser: nil,
MsgType: MsgTypeVideo, MsgType: MsgTypeVideo,
} }
req.Voice=map[string]interface{}{ req.Voice = map[string]interface{}{
"media_id":mediaID, "media_id": mediaID,
"title":title, "title": title,
"description":description, "description": description,
} }
req,sendURL:=broadcast.chooseTagOrOpenID(user,req) req, sendURL := broadcast.chooseTagOrOpenID(user, req)
url := fmt.Sprintf("%s?access_token=%s", sendURL, ak) url := fmt.Sprintf("%s?access_token=%s", sendURL, ak)
data, err := util.PostJSON(url, req) data, err := util.PostJSON(url, req)
if err != nil { if err != nil {
@@ -210,7 +208,6 @@ func (broadcast *Broadcast) SendVideo(user *User, mediaID string,title,descripti
return res, err return res, err
} }
//SendWxCard 发送卡券 //SendWxCard 发送卡券
func (broadcast *Broadcast) SendWxCard(user *User, cardID string) (*Result, error) { func (broadcast *Broadcast) SendWxCard(user *User, cardID string) (*Result, error) {
ak, err := broadcast.GetAccessToken() ak, err := broadcast.GetAccessToken()
@@ -218,13 +215,13 @@ func (broadcast *Broadcast) SendWxCard(user *User, cardID string) (*Result, erro
return nil, err return nil, err
} }
req := &sendRequest{ req := &sendRequest{
ToUser: nil, ToUser: nil,
MsgType: MsgTypeWxCard, MsgType: MsgTypeWxCard,
} }
req.WxCard=map[string]interface{}{ req.WxCard = map[string]interface{}{
"card_id":cardID, "card_id": cardID,
} }
req,sendURL:=broadcast.chooseTagOrOpenID(user,req) req, sendURL := broadcast.chooseTagOrOpenID(user, req)
url := fmt.Sprintf("%s?access_token=%s", sendURL, ak) url := fmt.Sprintf("%s?access_token=%s", sendURL, ak)
data, err := util.PostJSON(url, req) data, err := util.PostJSON(url, req)
if err != nil { if err != nil {
@@ -234,11 +231,12 @@ func (broadcast *Broadcast) SendWxCard(user *User, cardID string) (*Result, erro
err = util.DecodeWithError(data, res, "SendWxCard") err = util.DecodeWithError(data, res, "SendWxCard")
return res, err return res, err
} }
//Delete 删除群发消息 //Delete 删除群发消息
func (broadcast *Broadcast) Delete(msgID int64 ,articleIDx int64) error { func (broadcast *Broadcast) Delete(msgID int64, articleIDx int64) error {
ak, err := broadcast.GetAccessToken() ak, err := broadcast.GetAccessToken()
if err != nil { if err != nil {
return err return err
} }
req := map[string]interface{}{ req := map[string]interface{}{
"msg_id": msgID, "msg_id": msgID,
@@ -247,33 +245,32 @@ func (broadcast *Broadcast) Delete(msgID int64 ,articleIDx int64) error {
url := fmt.Sprintf("%s?access_token=%s", deleteSendURL, ak) url := fmt.Sprintf("%s?access_token=%s", deleteSendURL, ak)
data, err := util.PostJSON(url, req) data, err := util.PostJSON(url, req)
if err != nil { if err != nil {
return err return err
} }
return util.DecodeWithCommonError(data, "Delete") return util.DecodeWithCommonError(data, "Delete")
} }
//TODO 发送预览，群发消息状态，发送速度 //TODO 发送预览，群发消息状态，发送速度
func (broadcast *Broadcast) chooseTagOrOpenID(user *User,req *sendRequest)(ret *sendRequest,url string){ func (broadcast *Broadcast) chooseTagOrOpenID(user *User, req *sendRequest) (ret *sendRequest, url string) {
sendURL:="" sendURL := ""
if user == nil { if user == nil {
req.Filter=map[string]interface{}{ req.Filter = map[string]interface{}{
"is_to_all":true, "is_to_all": true,
} }
sendURL=sendURLByTag sendURL = sendURLByTag
} else { } else {
if user.TagID != 0 { if user.TagID != 0 {
req.Filter=map[string]interface{}{ req.Filter = map[string]interface{}{
"is_to_all":false, "is_to_all": false,
"tag_id":user.TagID, "tag_id": user.TagID,
} }
sendURL=sendURLByTag sendURL = sendURLByTag
} }
if len(user.OpenID) != 0 { if len(user.OpenID) != 0 {
req.ToUser = user.OpenID req.ToUser = user.OpenID
sendURL=sendURLByOpenID sendURL = sendURLByOpenID
} }
} }
return req,sendURL return req, sendURL
} }

1
officialaccount/datacube/broadcast.go
View File

@@ -2,6 +2,7 @@ package datacube
import ( import (
"fmt" "fmt"
"github.com/silenceper/wechat/v2/util" "github.com/silenceper/wechat/v2/util"
) )

1
officialaccount/datacube/interface.go
View File

@@ -2,6 +2,7 @@ package datacube
import ( import (
"fmt" "fmt"
"github.com/silenceper/wechat/v2/util" "github.com/silenceper/wechat/v2/util"
) )

1
officialaccount/datacube/message.go
View File

@@ -2,6 +2,7 @@ package datacube
import ( import (
"fmt" "fmt"
"github.com/silenceper/wechat/v2/util" "github.com/silenceper/wechat/v2/util"
) )

50
officialaccount/datacube/publisher.go
View File

@@ -1,11 +1,11 @@
package datacube package datacube
import ( import (
"encoding/json"
"fmt" "fmt"
"github.com/silenceper/wechat/v2/util"
"net/url" "net/url"
"strconv" "strconv"
"github.com/silenceper/wechat/v2/util"
) )
//AdSlot 广告位类型 //AdSlot 广告位类型
@@ -55,9 +55,8 @@ type BaseResp struct {
//ResPublisherAdPos 公众号分广告位数据响应 //ResPublisherAdPos 公众号分广告位数据响应
type ResPublisherAdPos struct { type ResPublisherAdPos struct {
util.CommonError util.CommonError
BaseResp
Base BaseResp `json:"base_resp"` BaseResp BaseResp `json:"base_resp"`
List []ResAdPosList `json:"list"` List []ResAdPosList `json:"list"`
Summary ResAdPosSummary `json:"summary"` Summary ResAdPosSummary `json:"summary"`
TotalNum int `json:"total_num"` TotalNum int `json:"total_num"`
@@ -91,9 +90,8 @@ type ResAdPosSummary struct {
//ResPublisherCps 公众号返佣商品数据响应 //ResPublisherCps 公众号返佣商品数据响应
type ResPublisherCps struct { type ResPublisherCps struct {
util.CommonError util.CommonError
BaseResp
Base BaseResp `json:"base_resp"` BaseResp BaseResp `json:"base_resp"`
List []ResCpsList `json:"list"` List []ResCpsList `json:"list"`
Summary ResCpsSummary `json:"summary"` Summary ResCpsSummary `json:"summary"`
TotalNum int `json:"total_num"` TotalNum int `json:"total_num"`
@@ -125,9 +123,8 @@ type ResCpsSummary struct {
//ResPublisherSettlement 公众号结算收入数据及结算主体信息响应 //ResPublisherSettlement 公众号结算收入数据及结算主体信息响应
type ResPublisherSettlement struct { type ResPublisherSettlement struct {
util.CommonError util.CommonError
BaseResp
Base BaseResp `json:"base_resp"` BaseResp BaseResp `json:"base_resp"`
Body string `json:"body"` Body string `json:"body"`
PenaltyAll int `json:"penalty_all"` PenaltyAll int `json:"penalty_all"`
RevenueAll int64 `json:"revenue_all"` RevenueAll int64 `json:"revenue_all"`
@@ -208,25 +205,15 @@ func (cube *DataCube) GetPublisherAdPosGeneral(startDate, endDate string, page,
return return
} }
err = json.Unmarshal(response, &resPublisherAdPos) err = util.DecodeWithError(response, &resPublisherAdPos, "GetPublisherAdPosGeneral")
if err != nil { if err != nil {
return return
} }
if resPublisherAdPos.CommonError.ErrCode != 0 {
err = fmt.Errorf("GetPublisherAdPosGeneral Error , errcode=%d , errmsg=%s", resPublisherAdPos.CommonError.ErrCode, resPublisherAdPos.CommonError.ErrMsg)
return
}
if resPublisherAdPos.BaseResp.Ret != 0 { if resPublisherAdPos.BaseResp.Ret != 0 {
err = fmt.Errorf("GetPublisherAdPosGeneral Error , errcode=%d , errmsg=%s", resPublisherAdPos.BaseResp.Ret, resPublisherAdPos.BaseResp.ErrMsg) err = fmt.Errorf("GetPublisherAdPosGeneral Error , errcode=%d , errmsg=%s", resPublisherAdPos.BaseResp.Ret, resPublisherAdPos.BaseResp.ErrMsg)
return return
} }
if resPublisherAdPos.Base.Ret != 0 {
err = fmt.Errorf("GetPublisherAdPosGeneral Error , errcode=%d , errmsg=%s", resPublisherAdPos.Base.Ret, resPublisherAdPos.Base.ErrMsg)
return
}
return return
} }
@@ -245,26 +232,15 @@ func (cube *DataCube) GetPublisherCpsGeneral(startDate, endDate string, page, pa
return return
} }
err = json.Unmarshal(response, &resPublisherCps) err = util.DecodeWithError(response, &resPublisherCps, "GetPublisherCpsGeneral")
if err != nil { if err != nil {
return return
} }
if resPublisherCps.CommonError.ErrCode != 0 {
err = fmt.Errorf("GetPublisherCpsGeneral Error , errcode=%d , errmsg=%s", resPublisherCps.CommonError.ErrCode, resPublisherCps.CommonError.ErrMsg)
return
}
if resPublisherCps.BaseResp.Ret != 0 { if resPublisherCps.BaseResp.Ret != 0 {
err = fmt.Errorf("GetPublisherCpsGeneral Error , errcode=%d , errmsg=%s", resPublisherCps.BaseResp.Ret, resPublisherCps.BaseResp.ErrMsg) err = fmt.Errorf("GetPublisherCpsGeneral Error , errcode=%d , errmsg=%s", resPublisherCps.BaseResp.Ret, resPublisherCps.BaseResp.ErrMsg)
return return
} }
if resPublisherCps.Base.Ret != 0 {
err = fmt.Errorf("GetPublisherCpsGeneral Error , errcode=%d , errmsg=%s", resPublisherCps.Base.Ret, resPublisherCps.Base.ErrMsg)
return
}
return return
} }
@@ -283,24 +259,14 @@ func (cube *DataCube) GetPublisherSettlement(startDate, endDate string, page, pa
return return
} }
err = json.Unmarshal(response, &resPublisherSettlement) err = util.DecodeWithError(response, &resPublisherSettlement, "GetPublisherSettlement")
if err != nil { if err != nil {
return return
} }
if resPublisherSettlement.CommonError.ErrCode != 0 {
err = fmt.Errorf("GetPublisherSettlement Error , errcode=%d , errmsg=%s", resPublisherSettlement.CommonError.ErrCode, resPublisherSettlement.CommonError.ErrMsg)
return
}
if resPublisherSettlement.BaseResp.Ret != 0 { if resPublisherSettlement.BaseResp.Ret != 0 {
err = fmt.Errorf("GetPublisherSettlement Error , errcode=%d , errmsg=%s", resPublisherSettlement.BaseResp.Ret, resPublisherSettlement.BaseResp.ErrMsg) err = fmt.Errorf("GetPublisherSettlement Error , errcode=%d , errmsg=%s", resPublisherSettlement.BaseResp.Ret, resPublisherSettlement.BaseResp.ErrMsg)
return return
} }
if resPublisherSettlement.Base.Ret != 0 {
err = fmt.Errorf("GetPublisherSettlement Error , errcode=%d , errmsg=%s", resPublisherSettlement.Base.Ret, resPublisherSettlement.Base.ErrMsg)
return
}
return return
} }

1
officialaccount/datacube/user.go
View File

@@ -2,6 +2,7 @@ package datacube
import ( import (
"fmt" "fmt"
"github.com/silenceper/wechat/v2/util" "github.com/silenceper/wechat/v2/util"
) )

4
officialaccount/device/authorize.go
View File

@@ -41,7 +41,7 @@ type ReqDevice struct {
// ble – 3 // ble – 3
// wifi -- 4 // wifi -- 4
// 一个设备可以支持多种连接类型，用符号"|"做分割，客户端优先选择靠前的连接方式（优先级按|关系的排序依次降低），举例： // 一个设备可以支持多种连接类型，用符号"|"做分割，客户端优先选择靠前的连接方式（优先级按|关系的排序依次降低），举例：
// 1：表示设备仅支持andiod classic bluetooth 1|2：表示设备支持andiod 和ios 两种classic bluetooth，但是客户端优先选择andriod classic bluetooth 协议，如果andriod classic bluetooth协议连接失败，再选择ios classic bluetooth协议进行连接 // 1：表示设备仅支持andiod classic bluetooth 1|2：表示设备支持android 和ios 两种classic bluetooth，但是客户端优先选择android classic bluetooth 协议，如果android classic bluetooth协议连接失败，再选择ios classic bluetooth协议进行连接
// （注：安卓平台不同时支持BLE和classic类型） // （注：安卓平台不同时支持BLE和classic类型）
ConnectProtocol string `json:"connect_protocol"` ConnectProtocol string `json:"connect_protocol"`
//auth及通信的加密key，第三方需要将key烧制在设备上（128bit），格式采用16进制串的方式（长度为32字节），不需要0X前缀，如： 1234567890ABCDEF1234567890ABCDEF //auth及通信的加密key，第三方需要将key烧制在设备上（128bit），格式采用16进制串的方式（长度为32字节），不需要0X前缀，如： 1234567890ABCDEF1234567890ABCDEF
@@ -56,7 +56,7 @@ type ReqDevice struct {
// 0：不加密的version // 0：不加密的version
// 1：version 1 // 1：version 1
AuthVer string `json:"auth_ver"` AuthVer string `json:"auth_ver"`
// 表示mac地址在厂商广播manufature data里含有mac地址的偏移，取值如下： // 表示mac地址在厂商广播manufacture data里含有mac地址的偏移，取值如下：
// -1：在尾部、 // -1：在尾部、
// -2：表示不包含mac地址 其他：非法偏移 // -2：表示不包含mac地址 其他：非法偏移
ManuMacPos string `json:"manu_mac_pos"` ManuMacPos string `json:"manu_mac_pos"`

2
officialaccount/js/js.go
View File

@@ -52,7 +52,7 @@ func (js *Js) GetConfig(uri string) (config *Config, err error) {
} }
nonceStr := util.RandomStr(16) nonceStr := util.RandomStr(16)
timestamp := util.GetCurrTs() timestamp := util.GetCurrTS()
str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s&timestamp=%d&url=%s", ticketStr, nonceStr, timestamp, uri) str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s&timestamp=%d&url=%s", ticketStr, nonceStr, timestamp, uri)
sigStr := util.Signature(str) sigStr := util.Signature(str)

9
officialaccount/material/material.go
View File

@@ -10,10 +10,10 @@ import (
) )
const ( const (
addNewsURL = "https://api.weixin.qq.com/cgi-bin/material/add_news" addNewsURL = "https://api.weixin.qq.com/cgi-bin/material/add_news"
addMaterialURL = "https://api.weixin.qq.com/cgi-bin/material/add_material" addMaterialURL = "https://api.weixin.qq.com/cgi-bin/material/add_material"
delMaterialURL = "https://api.weixin.qq.com/cgi-bin/material/del_material" delMaterialURL = "https://api.weixin.qq.com/cgi-bin/material/del_material"
getMaterialURL = "https://api.weixin.qq.com/cgi-bin/material/get_material" getMaterialURL = "https://api.weixin.qq.com/cgi-bin/material/get_material"
batchGetMaterialURL = "https://api.weixin.qq.com/cgi-bin/material/batchget_material" batchGetMaterialURL = "https://api.weixin.qq.com/cgi-bin/material/batchget_material"
) )
@@ -30,6 +30,7 @@ const (
//PermanentMaterialTypeNews 永久素材图文类型（news） //PermanentMaterialTypeNews 永久素材图文类型（news）
PermanentMaterialTypeNews PermanentMaterialType = "news" PermanentMaterialTypeNews PermanentMaterialType = "news"
) )
//Material 素材管理 //Material 素材管理
type Material struct { type Material struct {
*context.Context *context.Context

1
officialaccount/material/media.go
View File

@@ -106,5 +106,4 @@ func (material *Material) ImageUpload(filename string) (url string, err error) {
} }
url = image.URL url = image.URL
return return
} }

8
officialaccount/menu/menu.go
View File

@@ -102,12 +102,12 @@ type ButtonNew struct {
//MatchRule 个性化菜单规则 //MatchRule 个性化菜单规则
type MatchRule struct { type MatchRule struct {
GroupID string `json:"group_id,omitempty"` GroupID string `json:"group_id,omitempty"`
Sex string `json:"sex,omitempty"` Sex string `json:"sex,omitempty"`
Country string `json:"country,omitempty"` Country string `json:"country,omitempty"`
Province string `json:"province,omitempty"` Province string `json:"province,omitempty"`
City string `json:"city,omitempty"` City string `json:"city,omitempty"`
ClientPlatformType string `json:"client_platform_type,omitempty"` ClientPlatformType string `json:"client_platform_type,omitempty"`
Language string `json:"language,omitempty"` Language string `json:"language,omitempty"`
} }
@@ -138,7 +138,6 @@ func (menu *Menu) SetMenu(buttons []*Button) error {
return util.DecodeWithCommonError(response, "SetMenu") return util.DecodeWithCommonError(response, "SetMenu")
} }
//SetMenuByJSON 设置按钮 //SetMenuByJSON 设置按钮
func (menu *Menu) SetMenuByJSON(jsonInfo string) error { func (menu *Menu) SetMenuByJSON(jsonInfo string) error {
accessToken, err := menu.GetAccessToken() accessToken, err := menu.GetAccessToken()
@@ -216,7 +215,6 @@ func (menu *Menu) AddConditional(buttons []*Button, matchRule *MatchRule) error
return util.DecodeWithCommonError(response, "AddConditional") return util.DecodeWithCommonError(response, "AddConditional")
} }
//AddConditionalByJSON 添加个性化菜单 //AddConditionalByJSON 添加个性化菜单
func (menu *Menu) AddConditionalByJSON(jsonInfo string) error { func (menu *Menu) AddConditionalByJSON(jsonInfo string) error {
accessToken, err := menu.GetAccessToken() accessToken, err := menu.GetAccessToken()

3
officialaccount/message/customer_message.go
View File

@@ -147,6 +147,9 @@ func (manager *Manager) Send(msg *CustomerMessage) error {
} }
uri := fmt.Sprintf("%s?access_token=%s", customerSendMessage, accessToken) uri := fmt.Sprintf("%s?access_token=%s", customerSendMessage, accessToken)
response, err := util.PostJSON(uri, msg) response, err := util.PostJSON(uri, msg)
if err != nil {
return err
}
var result util.CommonError var result util.CommonError
err = json.Unmarshal(response, &result) err = json.Unmarshal(response, &result)
if err != nil { if err != nil {

4
officialaccount/message/template.go
View File

@@ -59,7 +59,9 @@ func (tpl *Template) Send(msg *TemplateMessage) (msgID int64, err error) {
} }
uri := fmt.Sprintf("%s?access_token=%s", templateSendURL, accessToken) uri := fmt.Sprintf("%s?access_token=%s", templateSendURL, accessToken)
response, err := util.PostJSON(uri, msg) response, err := util.PostJSON(uri, msg)
if err != nil {
return
}
var result resTemplateSend var result resTemplateSend
err = json.Unmarshal(response, &result) err = json.Unmarshal(response, &result)
if err != nil { if err != nil {

6
officialaccount/message/transfer_customer.go
View File

@@ -13,11 +13,11 @@ type TransInfo struct {
} }
//NewTransferCustomer 实例化 //NewTransferCustomer 实例化
func NewTransferCustomer(KfAccount string) *TransferCustomer { func NewTransferCustomer(kfAccount string) *TransferCustomer {
tc := new(TransferCustomer) tc := new(TransferCustomer)
if KfAccount != "" { if kfAccount != "" {
transInfo := new(TransInfo) transInfo := new(TransInfo)
transInfo.KfAccount = KfAccount transInfo.KfAccount = kfAccount
tc.TransInfo = transInfo tc.TransInfo = transInfo
} }
return tc return tc

2
officialaccount/oauth/oauth.go
View File

@@ -50,7 +50,7 @@ func (oauth *Oauth) Redirect(writer http.ResponseWriter, req *http.Request, redi
if err != nil { if err != nil {
return err return err
} }
http.Redirect(writer, req, location, 302) http.Redirect(writer, req, location, http.StatusFound)
return nil return nil
} }

3
officialaccount/officialaccount.go
View File

@@ -1,9 +1,10 @@
package officialaccount package officialaccount
import ( import (
"github.com/silenceper/wechat/v2/officialaccount/datacube"
"net/http" "net/http"
"github.com/silenceper/wechat/v2/officialaccount/datacube"
"github.com/silenceper/wechat/v2/credential" "github.com/silenceper/wechat/v2/credential"
"github.com/silenceper/wechat/v2/officialaccount/basic" "github.com/silenceper/wechat/v2/officialaccount/basic"
"github.com/silenceper/wechat/v2/officialaccount/broadcast" "github.com/silenceper/wechat/v2/officialaccount/broadcast"

4
officialaccount/server/server.go
View File

@@ -199,7 +199,7 @@ func (srv *Server) buildResponse(reply *message.Reply) (err error) {
value := reflect.ValueOf(msgData) value := reflect.ValueOf(msgData)
//msgData must be a ptr //msgData must be a ptr
kind := value.Kind().String() kind := value.Kind().String()
if "ptr" != kind { if kind != "ptr" {
return message.ErrUnsupportReply return message.ErrUnsupportReply
} }
@@ -213,7 +213,7 @@ func (srv *Server) buildResponse(reply *message.Reply) (err error) {
params[0] = reflect.ValueOf(msgType) params[0] = reflect.ValueOf(msgType)
value.MethodByName("SetMsgType").Call(params) value.MethodByName("SetMsgType").Call(params)
params[0] = reflect.ValueOf(util.GetCurrTs()) params[0] = reflect.ValueOf(util.GetCurrTS())
value.MethodByName("SetCreateTime").Call(params) value.MethodByName("SetCreateTime").Call(params)
srv.ResponseMsg = msgData srv.ResponseMsg = msgData

4
openplatform/context/accessToken.go
View File

@@ -15,9 +15,9 @@ const (
refreshTokenURL = "https://api.weixin.qq.com/cgi-bin/component/api_authorizer_token?component_access_token=%s" refreshTokenURL = "https://api.weixin.qq.com/cgi-bin/component/api_authorizer_token?component_access_token=%s"
getComponentInfoURL = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_info?component_access_token=%s" getComponentInfoURL = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_info?component_access_token=%s"
//TODO 获取授权方选项信息 //TODO 获取授权方选项信息
getComponentConfigURL = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_option?component_access_token=%s" //getComponentConfigURL = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_option?component_access_token=%s"
//TODO 获取已授权的账号信息 //TODO 获取已授权的账号信息
getuthorizerListURL = "POST https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_list?component_access_token=%s" //getuthorizerListURL = "POST https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_list?component_access_token=%s"
) )
// ComponentAccessToken 第三方平台 // ComponentAccessToken 第三方平台

1
openplatform/officialaccount/officialaccount.go
View File

@@ -12,7 +12,6 @@ type OfficialAccount struct {
//授权的公众号的appID //授权的公众号的appID
appID string appID string
*officialaccount.OfficialAccount *officialaccount.OfficialAccount
opContext *opContext.Context
} }
//NewOfficialAccount 实例化 //NewOfficialAccount 实例化

2
util/crypto.go
View File

@@ -65,7 +65,7 @@ func AESEncryptMsg(random, rawXMLMsg []byte, appID string, aesKey []byte) (ciphe
} }
// 加密 // 加密
block, err := aes.NewCipher(aesKey[:]) block, err := aes.NewCipher(aesKey)
if err != nil { if err != nil {
panic(err) panic(err)
} }

2
util/signature.go
View File

@@ -12,7 +12,7 @@ func Signature(params ...string) string {
sort.Strings(params) sort.Strings(params)
h := sha1.New() h := sha1.New()
for _, s := range params { for _, s := range params {
io.WriteString(h, s) _, _ = io.WriteString(h, s)
} }
return fmt.Sprintf("%x", h.Sum(nil)) return fmt.Sprintf("%x", h.Sum(nil))
} }

2
util/time.go
View File

@@ -3,6 +3,6 @@ package util
import "time" import "time"
//GetCurrTs return current timestamps //GetCurrTs return current timestamps
func GetCurrTs() int64 { func GetCurrTS() int64 {
return time.Now().Unix() return time.Now().Unix()
} }

2
wechat.go
View File

@@ -16,7 +16,6 @@ import (
) )
func init() { func init() {
// Log as JSON instead of the default ASCII formatter. // Log as JSON instead of the default ASCII formatter.
log.SetFormatter(&log.TextFormatter{}) log.SetFormatter(&log.TextFormatter{})
@@ -26,7 +25,6 @@ func init() {
// Only log the warning severity or above. // Only log the warning severity or above.
log.SetLevel(log.DebugLevel) log.SetLevel(log.DebugLevel)
} }
// Wechat struct // Wechat struct