diff --git a/const.go b/const.go index 97a2f36..16e3e32 100644 --- a/const.go +++ b/const.go @@ -3,5 +3,5 @@ package wechatopen const ( apiUrl = "https://api.weixin.qq.com" logTable = "wechatopen" - Version = "1.0.21" + Version = "1.0.22" ) diff --git a/go.mod b/go.mod index 13bb53b..f883d39 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/mitchellh/mapstructure v1.5.0 go.dtapp.net/dorm v1.0.30 - go.dtapp.net/golog v1.0.49 + go.dtapp.net/golog v1.0.50 go.dtapp.net/gorequest v1.0.27 ) diff --git a/go.sum b/go.sum index 242b5c3..d54675c 100644 --- a/go.sum +++ b/go.sum @@ -521,8 +521,8 @@ go.dtapp.net/dorm v1.0.30 h1:B2gwSe1ov4S+LPUv1ijFm4XE2KEeNn85eCP4WLilsCU= go.dtapp.net/dorm v1.0.30/go.mod h1:7ysGN47mW3u0EDAzXI3oUYZZHA3uasf2spugHeANPW8= go.dtapp.net/goip v1.0.28 h1:wZt+wbzNhOLRUJnepG4c8HhUr4V9jNXOF6wJ1h7jUvU= go.dtapp.net/goip v1.0.28/go.mod h1:ZqPPUvpOSzdtB/dEZFiaD0CBRZmvIzjDmm3XkpMC9Bo= -go.dtapp.net/golog v1.0.49 h1:I2X1JQcCp2Sorq64NKCw9Gl+8vPbAjph0oc65qv5vzY= -go.dtapp.net/golog v1.0.49/go.mod h1:QHP4MZoUZUtw1/pgBu7V5RIw766g2KrI44W0q6sj/40= +go.dtapp.net/golog v1.0.50 h1:J+ji1rso4GSN5gR2/ugyQNa8Akp9kY0zx+CkaWKimVk= +go.dtapp.net/golog v1.0.50/go.mod h1:QHP4MZoUZUtw1/pgBu7V5RIw766g2KrI44W0q6sj/40= go.dtapp.net/gorandom v1.0.1 h1:IWfMClh1ECPvyUjlqD7MwLq4mZdUusD1qAwAdsvEJBs= go.dtapp.net/gorandom v1.0.1/go.mod h1:ZPdgalKpvFV/ATQqR0k4ns/F/IpITAZpx6WkWirr5Y8= go.dtapp.net/gorequest v1.0.27 h1:Hip1mfSZJDNcmE2iZgB3PYa0C/7BAMEJLsCaMd6t9iE= diff --git a/wxa.get_qrcode.go b/wxa.get_qrcode.go index e6fb3e0..5835366 100644 --- a/wxa.get_qrcode.go +++ b/wxa.get_qrcode.go @@ -47,9 +47,13 @@ func (c *Client) WxaGetQrcode(ctx context.Context, path string) (*WxaGetQrcodeRe } // 定义 var response WxaGetQrcodeResponse - err = json.Unmarshal(request.ResponseBody, &response) - if err != nil { - return nil, err + // 判断内容是否为图片 + if request.ResponseHeader.Get("Content-Type") == "image/jpeg" || request.ResponseHeader.Get("Content-Type") == "image/png" || request.ResponseHeader.Get("Content-Type") == "image/jpg" { + } else { + err = json.Unmarshal(request.ResponseBody, &response) + if err != nil { + return nil, err + } } return newWxaGetQrcodeResult(response, request.ResponseBody, request), nil }