更改大文件上传逻辑

This commit is contained in:
eatMoreApple 2021-04-29 21:13:10 +08:00
parent fac0ede488
commit 3c7fec07f3
6 changed files with 1006 additions and 1021 deletions

View File

@ -5,7 +5,7 @@
[文档](doc.md) [文档](doc/doc.md)

View File

@ -1,295 +1,293 @@
package openwechat package openwechat
import ( import (
"os" "os"
"testing" "testing"
"time" "time"
) )
func defaultBot(modes ...mode) *Bot { func defaultBot(modes ...mode) *Bot {
bot := DefaultBot(modes...) bot := DefaultBot(modes...)
bot.UUIDCallback = PrintlnQrcodeUrl bot.UUIDCallback = PrintlnQrcodeUrl
return bot return bot
} }
func getSelf(modes ...mode) (*Self, error) { func getSelf(modes ...mode) (*Self, error) {
bot := defaultBot(modes...) bot := defaultBot(modes...)
if err := bot.Login(); err != nil { if err := bot.Login(); err != nil {
return nil, err return nil, err
} }
return bot.GetCurrentUser() return bot.GetCurrentUser()
} }
func TestBotLogin(t *testing.T) { func TestBotLogin(t *testing.T) {
bot := defaultBot() bot := defaultBot()
if err := bot.Login(); err != nil { if err := bot.Login(); err != nil {
t.Error(err) t.Error(err)
return return
} }
self, err := bot.GetCurrentUser() self, err := bot.GetCurrentUser()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
} }
t.Log(self.NickName) t.Log(self.NickName)
} }
func TestMessage(t *testing.T) { func TestMessage(t *testing.T) {
bot := defaultBot() bot := defaultBot()
bot.MessageHandler = func(msg *Message) { bot.MessageHandler = func(msg *Message) {
t.Log(msg.MsgType) t.Log(msg.MsgType)
t.Log(msg.Content) t.Log(msg.Content)
if msg.IsMedia() { if msg.IsMedia() {
t.Log(msg.Content) t.Log(msg.Content)
t.Log(msg.FileName) t.Log(msg.FileName)
} }
if msg.IsCard() { if msg.IsCard() {
c, _ := msg.Card() c, _ := msg.Card()
t.Log(c.Alias) t.Log(c.Alias)
} }
if msg.IsSystem() { if msg.IsSystem() {
t.Log(msg.Content) t.Log(msg.Content)
} }
if msg.IsRecalled() { if msg.IsRecalled() {
t.Log(msg.Content) t.Log(msg.Content)
} }
} }
if err := bot.Login(); err != nil { if err := bot.Login(); err != nil {
t.Error(err) t.Error(err)
return return
} }
bot.Block() bot.Block()
} }
func TestFriend(t *testing.T) { func TestFriend(t *testing.T) {
self, err := getSelf() self, err := getSelf()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
} }
friends, err := self.Friends() friends, err := self.Friends()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
} }
t.Log(friends) t.Log(friends)
} }
func TestGroup(t *testing.T) { func TestGroup(t *testing.T) {
self, err := getSelf() self, err := getSelf()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
} }
group, err := self.Groups() group, err := self.Groups()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
} }
t.Log(group) t.Log(group)
g := group.SearchByNickName(1, "杭州Gopher群组") g := group.SearchByNickName(1, "杭州Gopher群组")
if g.First() != nil { if g.First() != nil {
members, err := g.First().Members() members, err := g.First().Members()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
} }
t.Log(members.Count()) t.Log(members.Count())
} }
} }
func TestMps(t *testing.T) { func TestMps(t *testing.T) {
self, err := getSelf() self, err := getSelf()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
} }
mps, err := self.Mps() mps, err := self.Mps()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
} }
t.Log(mps) t.Log(mps)
} }
func TestAddFriendIntoChatRoom(t *testing.T) { func TestAddFriendIntoChatRoom(t *testing.T) {
self, err := getSelf(Desktop) self, err := getSelf(Desktop)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
} }
groups, err := self.Groups() groups, err := self.Groups()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
} }
friends, err := self.Friends() friends, err := self.Friends()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
} }
searchGroups := groups.SearchByNickName(1, "厉害了") searchGroups := groups.SearchByNickName(1, "厉害了")
if g := searchGroups.First(); g != nil { if g := searchGroups.First(); g != nil {
addFriends := friends.SearchByRemarkName(1, "1") addFriends := friends.SearchByRemarkName(1, "1")
if err := g.AddFriendsIn(addFriends...); err != nil { if err := g.AddFriendsIn(addFriends...); err != nil {
t.Error(err) t.Error(err)
} }
} }
} }
func TestRemoveFriendIntoChatRoom(t *testing.T) { func TestRemoveFriendIntoChatRoom(t *testing.T) {
self, err := getSelf() self, err := getSelf()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
} }
groups, err := self.Groups() groups, err := self.Groups()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
} }
friends, err := self.Friends() friends, err := self.Friends()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
} }
searchGroups := groups.SearchByNickName(1, "厉害了") searchGroups := groups.SearchByNickName(1, "厉害了")
if g := searchGroups.First(); g != nil { if g := searchGroups.First(); g != nil {
addFriends := friends.SearchByRemarkName(1, "大爷") addFriends := friends.SearchByRemarkName(1, "大爷")
if f := addFriends.First(); f != nil { if f := addFriends.First(); f != nil {
if err := g.RemoveMembers(Members{f.User}); err != nil { if err := g.RemoveMembers(Members{f.User}); err != nil {
t.Error(err) t.Error(err)
} }
} }
} }
} }
func TestLogout(t *testing.T) { func TestLogout(t *testing.T) {
bot := defaultBot() bot := defaultBot()
bot.MessageHandler = func(msg *Message) { bot.MessageHandler = func(msg *Message) {
if msg.Content == "logout" { if msg.Content == "logout" {
msg.Bot.Logout() msg.Bot.Logout()
} }
} }
if err := bot.Login(); err != nil { if err := bot.Login(); err != nil {
t.Error(err) t.Error(err)
return return
} }
bot.Block() bot.Block()
} }
func TestSendMessage(t *testing.T) { func TestSendMessage(t *testing.T) {
bot := defaultBot() bot := defaultBot()
if err := bot.Login(); err != nil { if err := bot.Login(); err != nil {
t.Error(err) t.Error(err)
return return
} }
self, err := bot.GetCurrentUser() self, err := bot.GetCurrentUser()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
} }
helper, err := self.FileHelper() helper, err := self.FileHelper()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
} }
if _, err = helper.SendText("test message! received ?"); err != nil { if _, err = helper.SendText("test message! received ?"); err != nil {
t.Error(err) t.Error(err)
return return
} }
time.Sleep(time.Second) time.Sleep(time.Second)
if _, err = self.SendTextToFriend(helper, "send test message twice ! received?"); err != nil { if _, err = self.SendTextToFriend(helper, "send test message twice ! received?"); err != nil {
t.Error(err) t.Error(err)
return return
} }
} }
func TestAgreeFriendsAdd(t *testing.T) { func TestAgreeFriendsAdd(t *testing.T) {
bot := defaultBot() bot := defaultBot()
bot.MessageHandler = func(msg *Message) { bot.MessageHandler = func(msg *Message) {
if msg.IsFriendAdd() { if msg.IsFriendAdd() {
if err := msg.Agree(); err != nil { if err := msg.Agree(); err != nil {
t.Error(err) t.Error(err)
} }
bot.Logout() bot.Logout()
} }
} }
if err := bot.Login(); err != nil { if err := bot.Login(); err != nil {
t.Error(err) t.Error(err)
return return
} }
bot.Block() bot.Block()
} }
func TestHotLogin(t *testing.T) { func TestHotLogin(t *testing.T) {
filename := "test.json" filename := "test.json"
bot := defaultBot() bot := defaultBot()
s := NewJsonFileHotReloadStorage(filename) s := NewJsonFileHotReloadStorage(filename)
if err := bot.HotLogin(s); err != nil { if err := bot.HotLogin(s); err != nil {
t.Error(err) t.Error(err)
return return
} }
self, err := bot.GetCurrentUser() self, err := bot.GetCurrentUser()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
} }
t.Log(self.NickName) t.Log(self.NickName)
} }
func TestFriendHelper(t *testing.T) { func TestFriendHelper(t *testing.T) {
bot := defaultBot() bot := defaultBot(Desktop)
if err := bot.HotLogin(NewJsonFileHotReloadStorage("2.json"), true); err != nil { if err := bot.HotLogin(NewJsonFileHotReloadStorage("2.json"), true); err != nil {
t.Error(err) t.Error(err)
return return
} }
self, err := bot.GetCurrentUser() self, err := bot.GetCurrentUser()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
} }
fh, err := self.FileHelper() fh, err := self.FileHelper()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
} }
f, _ := os.Open("webwxgetmsgimg.jpeg") f, _ := os.Open("webwxgetmsgimg.jpg")
//f, _ := os.Open("2.jpeg") defer f.Close()
defer f.Close() msg, err := fh.SendImage(f)
msg, err := fh.SendImage(f) if err != nil {
//msg, err := fh.SendText("hh") t.Error(err)
if err != nil { return
t.Error(err) }
return t.Log(msg.MsgId)
}
t.Log(msg.MsgId)
} }
func TestRevokeMessage(t *testing.T) { func TestRevokeMessage(t *testing.T) {
bot := defaultBot(Desktop) bot := defaultBot(Desktop)
if err := bot.HotLogin(NewJsonFileHotReloadStorage("2.json")); err != nil { if err := bot.HotLogin(NewJsonFileHotReloadStorage("2.json")); err != nil {
t.Error(err) t.Error(err)
return return
} }
self, err := bot.GetCurrentUser() self, err := bot.GetCurrentUser()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
} }
friends, err := self.Friends() friends, err := self.Friends()
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
} }
fs := friends.SearchByRemarkName(1, "1") fs := friends.SearchByRemarkName(1, "1")
ms, err := fs.First().SendText("test") ms, err := fs.First().SendText("test")
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
} }
time.Sleep(time.Second) time.Sleep(time.Second)
if err := ms.Revoke(); err != nil { if err := ms.Revoke(); err != nil {
t.Error(err) t.Error(err)
} }
} }

438
caller.go
View File

@ -1,320 +1,318 @@
package openwechat package openwechat
import ( import (
"errors" "errors"
"fmt" "os"
"os"
) )
// 调用请求和解析请求 // 调用请求和解析请求
// 上层模块可以直接获取封装后的请求结果 // 上层模块可以直接获取封装后的请求结果
type Caller struct { type Caller struct {
Client *Client Client *Client
} }
// Constructor for Caller // Constructor for Caller
func NewCaller(client *Client) *Caller { func NewCaller(client *Client) *Caller {
return &Caller{Client: client} return &Caller{Client: client}
} }
// Default Constructor for Caller // Default Constructor for Caller
func DefaultCaller(urlManager UrlManager) *Caller { func DefaultCaller(urlManager UrlManager) *Caller {
return NewCaller(DefaultClient(urlManager)) return NewCaller(DefaultClient(urlManager))
} }
// 获取登录的uuid // 获取登录的uuid
func (c *Caller) GetLoginUUID() (string, error) { func (c *Caller) GetLoginUUID() (string, error) {
resp := NewReturnResponse(c.Client.GetLoginUUID()) resp := NewReturnResponse(c.Client.GetLoginUUID())
if resp.Err() != nil { if resp.Err() != nil {
return "", resp.Err() return "", resp.Err()
} }
defer resp.Body.Close() defer resp.Body.Close()
data, err := resp.ReadAll() data, err := resp.ReadAll()
if err != nil { if err != nil {
return "", err return "", err
} }
// 正则匹配uuid字符串 // 正则匹配uuid字符串
results := uuidRegexp.FindSubmatch(data) results := uuidRegexp.FindSubmatch(data)
if len(results) != 2 { if len(results) != 2 {
// 如果没有匹配到,可能微信的接口做了修改或者当前机器的ip被加入了黑名单 // 如果没有匹配到,可能微信的接口做了修改或者当前机器的ip被加入了黑名单
return "", errors.New("uuid does not match") return "", errors.New("uuid does not match")
} }
return string(results[1]), nil return string(results[1]), nil
} }
// 检查是否登录成功 // 检查是否登录成功
func (c *Caller) CheckLogin(uuid string) (*CheckLoginResponse, error) { func (c *Caller) CheckLogin(uuid string) (*CheckLoginResponse, error) {
resp := NewReturnResponse(c.Client.CheckLogin(uuid)) resp := NewReturnResponse(c.Client.CheckLogin(uuid))
if resp.Err() != nil { if resp.Err() != nil {
return nil, resp.Err() return nil, resp.Err()
} }
defer resp.Body.Close() defer resp.Body.Close()
data, err := resp.ReadAll() data, err := resp.ReadAll()
if err != nil { if err != nil {
return nil, err return nil, err
} }
// 正则匹配检测的code // 正则匹配检测的code
// 具体code参考global.go // 具体code参考global.go
results := statusCodeRegexp.FindSubmatch(data) results := statusCodeRegexp.FindSubmatch(data)
if len(results) != 2 { if len(results) != 2 {
return nil, errors.New("error status code match") return nil, errors.New("error status code match")
} }
code := string(results[1]) code := string(results[1])
return &CheckLoginResponse{Code: code, Raw: data}, nil return &CheckLoginResponse{Code: code, Raw: data}, nil
} }
// 获取登录信息 // 获取登录信息
func (c *Caller) GetLoginInfo(body []byte) (*LoginInfo, error) { func (c *Caller) GetLoginInfo(body []byte) (*LoginInfo, error) {
// 从响应体里面获取需要跳转的url // 从响应体里面获取需要跳转的url
results := redirectUriRegexp.FindSubmatch(body) results := redirectUriRegexp.FindSubmatch(body)
if len(results) != 2 { if len(results) != 2 {
return nil, errors.New("redirect url does not match") return nil, errors.New("redirect url does not match")
} }
path := string(results[1]) path := string(results[1])
resp := NewReturnResponse(c.Client.GetLoginInfo(path)) resp := NewReturnResponse(c.Client.GetLoginInfo(path))
if resp.Err() != nil { if resp.Err() != nil {
return nil, resp.Err() return nil, resp.Err()
} }
defer resp.Body.Close() defer resp.Body.Close()
var loginInfo LoginInfo var loginInfo LoginInfo
// xml结构体序列化储存 // xml结构体序列化储存
if err := resp.ScanXML(&loginInfo); err != nil { if err := resp.ScanXML(&loginInfo); err != nil {
return nil, err return nil, err
} }
if !loginInfo.Ok() { if !loginInfo.Ok() {
return nil, loginInfo return nil, loginInfo
} }
return &loginInfo, nil return &loginInfo, nil
} }
// 获取初始化信息 // 获取初始化信息
func (c *Caller) WebInit(request *BaseRequest) (*WebInitResponse, error) { func (c *Caller) WebInit(request *BaseRequest) (*WebInitResponse, error) {
resp := NewReturnResponse(c.Client.WebInit(request)) resp := NewReturnResponse(c.Client.WebInit(request))
if resp.Err() != nil { if resp.Err() != nil {
return nil, resp.Err() return nil, resp.Err()
} }
var webInitResponse WebInitResponse var webInitResponse WebInitResponse
defer resp.Body.Close() defer resp.Body.Close()
if err := resp.ScanJSON(&webInitResponse); err != nil { if err := resp.ScanJSON(&webInitResponse); err != nil {
return nil, err return nil, err
} }
return &webInitResponse, nil return &webInitResponse, nil
} }
// 通知手机已登录 // 通知手机已登录
func (c *Caller) WebWxStatusNotify(request *BaseRequest, response *WebInitResponse, info *LoginInfo) error { func (c *Caller) WebWxStatusNotify(request *BaseRequest, response *WebInitResponse, info *LoginInfo) error {
resp := NewReturnResponse(c.Client.WebWxStatusNotify(request, response, info)) resp := NewReturnResponse(c.Client.WebWxStatusNotify(request, response, info))
if resp.Err() != nil { if resp.Err() != nil {
return resp.Err() return resp.Err()
} }
var item struct{ BaseResponse BaseResponse } var item struct{ BaseResponse BaseResponse }
defer resp.Body.Close() defer resp.Body.Close()
if err := resp.ScanJSON(&item); err != nil { if err := resp.ScanJSON(&item); err != nil {
return err return err
} }
if !item.BaseResponse.Ok() { if !item.BaseResponse.Ok() {
return item.BaseResponse return item.BaseResponse
} }
return nil return nil
} }
// 异步获取是否有新的消息 // 异步获取是否有新的消息
func (c *Caller) SyncCheck(info *LoginInfo, response *WebInitResponse) (*SyncCheckResponse, error) { func (c *Caller) SyncCheck(info *LoginInfo, response *WebInitResponse) (*SyncCheckResponse, error) {
resp := NewReturnResponse(c.Client.SyncCheck(info, response)) resp := NewReturnResponse(c.Client.SyncCheck(info, response))
if resp.Err() != nil { if resp.Err() != nil {
return nil, resp.Err() return nil, resp.Err()
} }
defer resp.Body.Close() defer resp.Body.Close()
data, err := resp.ReadAll() data, err := resp.ReadAll()
if err != nil { if err != nil {
return nil, err return nil, err
} }
results := syncCheckRegexp.FindSubmatch(data) results := syncCheckRegexp.FindSubmatch(data)
if len(results) != 3 { if len(results) != 3 {
return nil, errors.New("parse sync key failed") return nil, errors.New("parse sync key failed")
} }
retCode, selector := string(results[1]), string(results[2]) retCode, selector := string(results[1]), string(results[2])
syncCheckResponse := &SyncCheckResponse{RetCode: retCode, Selector: selector} syncCheckResponse := &SyncCheckResponse{RetCode: retCode, Selector: selector}
return syncCheckResponse, nil return syncCheckResponse, nil
} }
// 获取所有的联系人 // 获取所有的联系人
func (c *Caller) WebWxGetContact(info *LoginInfo) (Members, error) { func (c *Caller) WebWxGetContact(info *LoginInfo) (Members, error) {
resp := NewReturnResponse(c.Client.WebWxGetContact(info)) resp := NewReturnResponse(c.Client.WebWxGetContact(info))
if resp.Err() != nil { if resp.Err() != nil {
return nil, resp.Err() return nil, resp.Err()
} }
defer resp.Body.Close() defer resp.Body.Close()
var item WebWxContactResponse var item WebWxContactResponse
if err := resp.ScanJSON(&item); err != nil { if err := resp.ScanJSON(&item); err != nil {
return nil, err return nil, err
} }
if !item.BaseResponse.Ok() { if !item.BaseResponse.Ok() {
return nil, item.BaseResponse return nil, item.BaseResponse
} }
return item.MemberList, nil return item.MemberList, nil
} }
// 获取联系人的详情 // 获取联系人的详情
// 注: Members参数的长度不要大于50 // 注: Members参数的长度不要大于50
func (c *Caller) WebWxBatchGetContact(members Members, request *BaseRequest) (Members, error) { func (c *Caller) WebWxBatchGetContact(members Members, request *BaseRequest) (Members, error) {
resp := NewReturnResponse(c.Client.WebWxBatchGetContact(members, request)) resp := NewReturnResponse(c.Client.WebWxBatchGetContact(members, request))
if resp.Err() != nil { if resp.Err() != nil {
return nil, resp.Err() return nil, resp.Err()
} }
defer resp.Body.Close() defer resp.Body.Close()
var item WebWxBatchContactResponse var item WebWxBatchContactResponse
if err := resp.ScanJSON(&item); err != nil { if err := resp.ScanJSON(&item); err != nil {
return nil, err return nil, err
} }
if !item.BaseResponse.Ok() { if !item.BaseResponse.Ok() {
return nil, item.BaseResponse return nil, item.BaseResponse
} }
return item.ContactList, nil return item.ContactList, nil
} }
// 获取新的消息接口 // 获取新的消息接口
func (c *Caller) WebWxSync(request *BaseRequest, response *WebInitResponse, info *LoginInfo) (*WebWxSyncResponse, error) { func (c *Caller) WebWxSync(request *BaseRequest, response *WebInitResponse, info *LoginInfo) (*WebWxSyncResponse, error) {
resp := NewReturnResponse(c.Client.WebWxSync(request, response, info)) resp := NewReturnResponse(c.Client.WebWxSync(request, response, info))
if resp.Err() != nil { if resp.Err() != nil {
return nil, resp.Err() return nil, resp.Err()
} }
defer resp.Body.Close() defer resp.Body.Close()
var webWxSyncResponse WebWxSyncResponse var webWxSyncResponse WebWxSyncResponse
if err := resp.ScanJSON(&webWxSyncResponse); err != nil { if err := resp.ScanJSON(&webWxSyncResponse); err != nil {
return nil, err return nil, err
} }
return &webWxSyncResponse, nil return &webWxSyncResponse, nil
} }
// 发送消息接口 // 发送消息接口
func (c *Caller) WebWxSendMsg(msg *SendMessage, info *LoginInfo, request *BaseRequest) (*SentMessage, error) { func (c *Caller) WebWxSendMsg(msg *SendMessage, info *LoginInfo, request *BaseRequest) (*SentMessage, error) {
resp := NewReturnResponse(c.Client.WebWxSendMsg(msg, info, request)) resp := NewReturnResponse(c.Client.WebWxSendMsg(msg, info, request))
sendSuccessMsg := &SentMessage{SendMessage: msg} sendSuccessMsg := &SentMessage{SendMessage: msg}
err := parseMessageResponseError(resp, sendSuccessMsg) err := parseMessageResponseError(resp, sendSuccessMsg)
return sendSuccessMsg, err return sendSuccessMsg, err
} }
// 修改用户备注接口 // 修改用户备注接口
func (c *Caller) WebWxOplog(request *BaseRequest, remarkName, toUserName string) error { func (c *Caller) WebWxOplog(request *BaseRequest, remarkName, toUserName string) error {
resp := NewReturnResponse(c.Client.WebWxOplog(request, remarkName, toUserName)) resp := NewReturnResponse(c.Client.WebWxOplog(request, remarkName, toUserName))
return parseBaseResponseError(resp) return parseBaseResponseError(resp)
} }
// 发送图片消息接口 // 发送图片消息接口
func (c *Caller) WebWxSendImageMsg(file *os.File, request *BaseRequest, info *LoginInfo, fromUserName, toUserName string) (*SentMessage, error) { func (c *Caller) WebWxSendImageMsg(file *os.File, request *BaseRequest, info *LoginInfo, fromUserName, toUserName string) (*SentMessage, error) {
// 首先尝试上传图片 // 首先尝试上传图片
sate, err := file.Stat() sate, err := file.Stat()
if err != nil { if err != nil {
return nil, err return nil, err
} }
var resp *ReturnResponse var resp *ReturnResponse
if sate.Size() <= chunkSize { if sate.Size() <= chunkSize {
resp = NewReturnResponse(c.Client.WebWxUploadMedia(file, request, info, fromUserName, toUserName, "pic")) resp = NewReturnResponse(c.Client.WebWxUploadMedia(file, request, info, fromUserName, toUserName, "pic"))
} else { } else {
resp = NewReturnResponse(c.Client.WebWxUploadMediaByChunk(file, request, info, fromUserName, toUserName, "pic")) resp = NewReturnResponse(c.Client.WebWxUploadMediaByChunk(file, request, info, fromUserName, toUserName, "pic"))
} }
// 无错误上传成功之后获取请求结果,判断结果是否正常 // 无错误上传成功之后获取请求结果,判断结果是否正常
if resp.Err() != nil { if resp.Err() != nil {
return nil, resp.Err() return nil, resp.Err()
} }
defer resp.Body.Close() defer resp.Body.Close()
data, _ := resp.ReadAll()
fmt.Println(string(data))
var item struct {
BaseResponse BaseResponse
MediaId string
}
if err = resp.ScanJSON(&item); err != nil { var item struct {
return nil, err BaseResponse BaseResponse
} MediaId string
if !item.BaseResponse.Ok() { }
return nil, item.BaseResponse
}
if len(item.MediaId) == 0 {
return nil, errors.New("upload failed")
}
// 构造新的图片类型的信息
msg := NewMediaSendMessage(ImageMessage, fromUserName, toUserName, item.MediaId)
// 发送图片信息
resp = NewReturnResponse(c.Client.WebWxSendMsgImg(msg, request, info))
sendSuccessMsg := &SentMessage{SendMessage: msg} if err = resp.ScanJSON(&item); err != nil {
err = parseMessageResponseError(resp, sendSuccessMsg) return nil, err
return sendSuccessMsg, err }
if !item.BaseResponse.Ok() {
return nil, item.BaseResponse
}
if len(item.MediaId) == 0 {
return nil, errors.New("upload failed")
}
// 构造新的图片类型的信息
msg := NewMediaSendMessage(ImageMessage, fromUserName, toUserName, item.MediaId)
// 发送图片信息
resp = NewReturnResponse(c.Client.WebWxSendMsgImg(msg, request, info))
sendSuccessMsg := &SentMessage{SendMessage: msg}
err = parseMessageResponseError(resp, sendSuccessMsg)
return sendSuccessMsg, err
} }
// 用户退出 // 用户退出
func (c *Caller) Logout(info *LoginInfo) error { func (c *Caller) Logout(info *LoginInfo) error {
resp := NewReturnResponse(c.Client.Logout(info)) resp := NewReturnResponse(c.Client.Logout(info))
return parseBaseResponseError(resp) return parseBaseResponseError(resp)
} }
// 拉好友入群 // 拉好友入群
func (c *Caller) AddFriendIntoChatRoom(req *BaseRequest, info *LoginInfo, group *Group, friends ...*Friend) error { func (c *Caller) AddFriendIntoChatRoom(req *BaseRequest, info *LoginInfo, group *Group, friends ...*Friend) error {
if len(friends) == 0 { if len(friends) == 0 {
return errors.New("no friends found") return errors.New("no friends found")
} }
resp := NewReturnResponse(c.Client.AddMemberIntoChatRoom(req, info, group, friends...)) resp := NewReturnResponse(c.Client.AddMemberIntoChatRoom(req, info, group, friends...))
return parseBaseResponseError(resp) return parseBaseResponseError(resp)
} }
// 从群聊中移除用户 // 从群聊中移除用户
func (c *Caller) RemoveFriendFromChatRoom(req *BaseRequest, info *LoginInfo, group *Group, users ...*User) error { func (c *Caller) RemoveFriendFromChatRoom(req *BaseRequest, info *LoginInfo, group *Group, users ...*User) error {
if len(users) == 0 { if len(users) == 0 {
return errors.New("no users found") return errors.New("no users found")
} }
resp := NewReturnResponse(c.Client.RemoveMemberFromChatRoom(req, info, group, users...)) resp := NewReturnResponse(c.Client.RemoveMemberFromChatRoom(req, info, group, users...))
return parseBaseResponseError(resp) return parseBaseResponseError(resp)
} }
// 同意加好友请求 // 同意加好友请求
func (c *Caller) WebWxVerifyUser(storage *Storage, info RecommendInfo, verifyContent string) error { func (c *Caller) WebWxVerifyUser(storage *Storage, info RecommendInfo, verifyContent string) error {
resp := NewReturnResponse(c.Client.WebWxVerifyUser(storage, info, verifyContent)) resp := NewReturnResponse(c.Client.WebWxVerifyUser(storage, info, verifyContent))
return parseBaseResponseError(resp) return parseBaseResponseError(resp)
} }
// 撤回消息操作 // 撤回消息操作
func (c *Caller) WebWxRevokeMsg(msg *SentMessage, request *BaseRequest) error { func (c *Caller) WebWxRevokeMsg(msg *SentMessage, request *BaseRequest) error {
resp := NewReturnResponse(c.Client.WebWxRevokeMsg(msg, request)) resp := NewReturnResponse(c.Client.WebWxRevokeMsg(msg, request))
return parseBaseResponseError(resp) return parseBaseResponseError(resp)
} }
// 处理响应返回的结果是否正常 // 处理响应返回的结果是否正常
func parseBaseResponseError(resp *ReturnResponse) error { func parseBaseResponseError(resp *ReturnResponse) error {
if resp.Err() != nil { if resp.Err() != nil {
return resp.Err() return resp.Err()
} }
defer resp.Body.Close() defer resp.Body.Close()
var item struct{ BaseResponse BaseResponse } var item struct{ BaseResponse BaseResponse }
if err := resp.ScanJSON(&item); err != nil { if err := resp.ScanJSON(&item); err != nil {
return err return err
} }
if !item.BaseResponse.Ok() { if !item.BaseResponse.Ok() {
return item.BaseResponse return item.BaseResponse
} }
return nil return nil
} }
func parseMessageResponseError(resp *ReturnResponse, msg *SentMessage) error { func parseMessageResponseError(resp *ReturnResponse, msg *SentMessage) error {
if resp.Err() != nil { if resp.Err() != nil {
return resp.Err() return resp.Err()
} }
defer resp.Body.Close() defer resp.Body.Close()
var messageResp MessageResponse var messageResp MessageResponse
if err := resp.ScanJSON(&messageResp); err != nil { if err := resp.ScanJSON(&messageResp); err != nil {
return err return err
} }
if !messageResp.BaseResponse.Ok() { if !messageResp.BaseResponse.Ok() {
return messageResp.BaseResponse return messageResp.BaseResponse
} }
//// 发送成功之后将msgId赋值给SendMessage //// 发送成功之后将msgId赋值给SendMessage
msg.MsgId = messageResp.MsgID msg.MsgId = messageResp.MsgID
return nil return nil
} }

991
client.go

File diff suppressed because it is too large Load Diff

View File

View File

@ -1,100 +1,88 @@
package openwechat package openwechat
import ( import (
"bytes" "bytes"
"encoding/json" "encoding/json"
"net/http" "net/http"
"os" "os"
) )
// 身份信息, 维持整个登陆的Session会话 // 身份信息, 维持整个登陆的Session会话
type Storage struct { type Storage struct {
LoginInfo *LoginInfo LoginInfo *LoginInfo
Request *BaseRequest Request *BaseRequest
Response *WebInitResponse Response *WebInitResponse
} }
// 热登陆存储接口 // 热登陆存储接口
type HotReloadStorage interface { type HotReloadStorage interface {
GetCookie() map[string][]*http.Cookie // 获取client.cookie GetCookie() map[string][]*http.Cookie // 获取client.cookie
GetBaseRequest() *BaseRequest // 获取BaseRequest GetBaseRequest() *BaseRequest // 获取BaseRequest
GetLoginInfo() *LoginInfo // 获取LoginInfo GetLoginInfo() *LoginInfo // 获取LoginInfo
Dump(cookies map[string][]*http.Cookie, req *BaseRequest, info *LoginInfo) error // 实现该方法, 将必要信息进行序列化 Dump(cookies map[string][]*http.Cookie, req *BaseRequest, info *LoginInfo) error // 实现该方法, 将必要信息进行序列化
Load() error // 实现该方法, 将存储媒介的内容反序列化 Load() error // 实现该方法, 将存储媒介的内容反序列化
} }
// 实现HotReloadStorage接口 // 实现HotReloadStorage接口
// 默认以json文件的形式存储 // 默认以json文件的形式存储
type JsonFileHotReloadStorage struct { type JsonFileHotReloadStorage struct {
Cookie map[string][]*http.Cookie Cookie map[string][]*http.Cookie
Req *BaseRequest Req *BaseRequest
Info *LoginInfo Info *LoginInfo
filename string filename string
} }
// 将信息写入json文件 // 将信息写入json文件
func (f *JsonFileHotReloadStorage) Dump(cookies map[string][]*http.Cookie, req *BaseRequest, info *LoginInfo) error { func (f *JsonFileHotReloadStorage) Dump(cookies map[string][]*http.Cookie, req *BaseRequest, info *LoginInfo) error {
var (
file *os.File
err error
)
_, err = os.Stat(f.filename)
if err != nil {
if os.IsNotExist(err) {
file, err = os.Create(f.filename)
if err != nil {
return err
}
}
}
if file == nil { file, err := os.OpenFile(f.filename, os.O_RDWR|os.O_CREATE|os.O_TRUNC, os.ModePerm)
file, err = os.Open(f.filename)
}
if err != nil { if err != nil {
return err return err
} }
defer file.Close()
f.Cookie = cookies defer file.Close()
f.Req = req
f.Info = info
data, err := json.Marshal(f) f.Cookie = cookies
if err != nil { f.Req = req
return err f.Info = info
}
_, err = file.Write(data) data, err := json.Marshal(f)
return err if err != nil {
return err
}
_, err = file.Write(data)
return err
} }
// 从文件中读取信息 // 从文件中读取信息
func (f *JsonFileHotReloadStorage) Load() error { func (f *JsonFileHotReloadStorage) Load() error {
file, err := os.Open(f.filename) file, err := os.Open(f.filename)
if err != nil {
return err if err != nil {
} return err
defer file.Close() }
var buffer bytes.Buffer defer file.Close()
if _, err := buffer.ReadFrom(file); err != nil { var buffer bytes.Buffer
return err if _, err := buffer.ReadFrom(file); err != nil {
} return err
return json.Unmarshal(buffer.Bytes(), f) }
err = json.Unmarshal(buffer.Bytes(), f)
return err
} }
func (f *JsonFileHotReloadStorage) GetCookie() map[string][]*http.Cookie { func (f *JsonFileHotReloadStorage) GetCookie() map[string][]*http.Cookie {
return f.Cookie return f.Cookie
} }
func (f *JsonFileHotReloadStorage) GetBaseRequest() *BaseRequest { func (f *JsonFileHotReloadStorage) GetBaseRequest() *BaseRequest {
return f.Req return f.Req
} }
func (f *JsonFileHotReloadStorage) GetLoginInfo() *LoginInfo { func (f *JsonFileHotReloadStorage) GetLoginInfo() *LoginInfo {
return f.Info return f.Info
} }
func NewJsonFileHotReloadStorage(filename string) *JsonFileHotReloadStorage { func NewJsonFileHotReloadStorage(filename string) *JsonFileHotReloadStorage {
return &JsonFileHotReloadStorage{filename: filename} return &JsonFileHotReloadStorage{filename: filename}
} }