github/openwechat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'eatmoreapple:master' into master

Browse Source
This commit is contained in:
suntong 2021-08-01 16:01:26 -04:00 committed by GitHub
commit 914bde7591
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
bot.go
View File

@ -71,23 +71,17 @@ func (b *Bot) HotLogin(storage HotReloadStorage, retry ...bool) error {
if _, err := buffer.ReadFrom(storage); err != nil { if _, err := buffer.ReadFrom(storage); err != nil {
return b.Login() return b.Login()
} }
defer b.HotReloadStorage.Close()
var item HotReloadStorageItem var item HotReloadStorageItem
if err = json.NewDecoder(&buffer).Decode(&item); err != nil { if err = json.NewDecoder(&buffer).Decode(&item); err != nil {
return err return err
} }
cookies := item.Cookies if err = b.hotLoginInit(item); err != nil {
for u, ck := range cookies { return err
path, err := url.Parse(u)
if err != nil {
return err
}
b.Caller.Client.Jar.SetCookies(path, ck)
} }
b.storage.LoginInfo = item.LoginInfo
b.storage.Request = item.BaseRequest
b.Caller.Client.domain = item.WechatDomain
// 如果webInit出错,则说明可能身份信息已经失效 // 如果webInit出错,则说明可能身份信息已经失效
// 如果retry为True的话,则进行正常登陆 // 如果retry为True的话,则进行正常登陆
@ -100,21 +94,20 @@ func (b *Bot) HotLogin(storage HotReloadStorage, retry ...bool) error {
} }
// 热登陆初始化 // 热登陆初始化
//func (b *Bot) hotLoginInit() error { func (b *Bot) hotLoginInit(item HotReloadStorageItem) error {
// item := b.hotReloadStorage.GetHotReloadStorageItem() cookies := item.Cookies
// cookies := item.Cookies for u, ck := range cookies {
// for u, ck := range cookies { path, err := url.Parse(u)
// path, err := url.Parse(u) if err != nil {
// if err != nil { return err
// return err }
// } b.Caller.Client.Jar.SetCookies(path, ck)
// b.Caller.Client.Jar.SetCookies(path, ck) }
// } b.storage.LoginInfo = item.LoginInfo
// b.storage.LoginInfo = item.LoginInfo b.storage.Request = item.BaseRequest
// b.storage.Request = item.BaseRequest b.Caller.Client.domain = item.WechatDomain
// b.Caller.Client.domain = item.WechatDomain return nil
// return nil }
//}
// Login 用户登录 // Login 用户登录
// 该方法会一直阻塞，直到用户扫码登录，或者二维码过期 // 该方法会一直阻塞，直到用户扫码登录，或者二维码过期
@ -328,9 +321,10 @@ func (b *Bot) DumpHotReloadStorage() error {
if err != nil { if err != nil {
return err return err
} }
_, err = b.HotReloadStorage.Write(data) if _, err = b.HotReloadStorage.Write(data); err != nil {
return err return err
}
return b.HotReloadStorage.Close()
} }
// OnLogin is a setter for LoginCallBack // OnLogin is a setter for LoginCallBack

24
stroage.go
View File

@ -21,7 +21,7 @@ type HotReloadStorageItem struct {
} }
// HotReloadStorage 热登陆存储接口 // HotReloadStorage 热登陆存储接口
type HotReloadStorage io.ReadWriter type HotReloadStorage io.ReadWriteCloser
// JsonFileHotReloadStorage 实现HotReloadStorage接口 // JsonFileHotReloadStorage 实现HotReloadStorage接口
// 默认以json文件的形式存储 // 默认以json文件的形式存储
@ -37,22 +37,26 @@ func (j *JsonFileHotReloadStorage) Read(p []byte) (n int, err error) {
return 0, err return 0, err
} }
} }
n, err = j.file.Read(p) return j.file.Read(p)
if err == io.EOF {
j.file.Close()
}
return n, err
} }
func (j *JsonFileHotReloadStorage) Write(p []byte) (n int, err error) { func (j *JsonFileHotReloadStorage) Write(p []byte) (n int, err error) {
file, err := os.Create(j.FileName) j.file, err = os.Create(j.FileName)
if err != nil { if err != nil {
return 0, err return 0, err
} }
defer file.Close() return j.file.Write(p)
return file.Write(p)
} }
func NewJsonFileHotReloadStorage(filename string) *JsonFileHotReloadStorage { func (j *JsonFileHotReloadStorage) Close() error {
if j.file != nil {
return j.file.Close()
}
return nil
}
func NewJsonFileHotReloadStorage(filename string) HotReloadStorage {
return &JsonFileHotReloadStorage{FileName: filename} return &JsonFileHotReloadStorage{FileName: filename}
} }
var _ HotReloadStorage = &JsonFileHotReloadStorage{}