更新 NetworkErr 判断逻辑

This commit is contained in:
eatmoreapple 2022-11-12 21:01:38 +08:00
parent bb0e909654
commit 6d7541a8ed
3 changed files with 3 additions and 15 deletions

View File

@ -88,7 +88,7 @@ func (c *Client) do(req *http.Request) (*http.Response, error) {
} }
} }
if err != nil { if err != nil {
err = ErrorWrapper(NetworkErr, err.Error()) err = fmt.Errorf("%w: %s", NetworkErr, err.Error())
} }
for _, hook := range c.HttpHooks { for _, hook := range c.HttpHooks {
hook.AfterRequest(resp, err) hook.AfterRequest(resp, err)

View File

@ -4,19 +4,6 @@ import (
"errors" "errors"
) )
type errorWrapper struct {
err error
msg string
}
func (e errorWrapper) Unwrap() error { return e.err }
func (e errorWrapper) Error() string { return e.msg }
func ErrorWrapper(err error, msg string) error {
return &errorWrapper{msg: msg, err: err}
}
var NetworkErr = errors.New("wechat network error") var NetworkErr = errors.New("wechat network error")
func IsNetworkError(err error) bool { func IsNetworkError(err error) bool {

View File

@ -2,12 +2,13 @@ package openwechat
import ( import (
"errors" "errors"
"fmt"
"testing" "testing"
) )
func TestIsNetworkError(t *testing.T) { func TestIsNetworkError(t *testing.T) {
var err = errors.New("test error") var err = errors.New("test error")
err = ErrorWrapper(NetworkErr, err.Error()) err = fmt.Errorf("%w: %s", NetworkErr, err.Error())
if !IsNetworkError(err) { if !IsNetworkError(err) {
t.Error("err is not network error") t.Error("err is not network error")
} }