From a3e6c0cd22da676cc351fad26e436f7f95d3c07d Mon Sep 17 00:00:00 2001 From: Anyon Date: Thu, 10 May 2018 18:28:26 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E7=B4=A0=E6=9D=90=E4=BA=8C?= =?UTF-8?q?=E8=BF=9B=E5=88=B6=E6=96=87=E4=BB=B6=E5=85=81=E8=AE=B8=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E8=BE=93=E5=87=BA=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WeChat/Media.php | 22 ++++++++++++++++------ WeMini/Qrcode.php | 24 ++++++++++++++++++------ 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/WeChat/Media.php b/WeChat/Media.php index 7dd8511..684b568 100644 --- a/WeChat/Media.php +++ b/WeChat/Media.php @@ -46,15 +46,20 @@ class Media extends BasicWeChat /** * 获取临时素材 * @param string $media_id - * @return bool|string + * @param string $outType 返回处理函数 + * @return array|string * @throws Exceptions\LocalCacheException * @throws InvalidResponseException */ - public function get($media_id) + public function get($media_id, $outType = null) { $url = "https://api.weixin.qq.com/cgi-bin/media/get?access_token=ACCESS_TOKEN&media_id={$media_id}"; $this->registerApi($url, __FUNCTION__, func_get_args()); - return Tools::get($url); + $result = Tools::get($url); + if (($json = Tools::json2arr($result))) { + return $json; + } + return is_null($outType) ? $result : $outType($result); } /** @@ -124,15 +129,20 @@ class Media extends BasicWeChat /** * 获取永久素材 * @param string $media_id - * @return array + * @param null|string $outType 输出类型 + * @return array|string * @throws Exceptions\LocalCacheException * @throws InvalidResponseException */ - public function getMaterial($media_id) + public function getMaterial($media_id, $outType = null) { $url = "https://api.weixin.qq.com/cgi-bin/material/get_material?access_token=ACCESS_TOKEN"; $this->registerApi($url, __FUNCTION__, func_get_args()); - return $this->httpPostForJson($url, ['media_id' => $media_id]); + $result = Tools::post($url, ['media_id' => $media_id]); + if (($json = Tools::json2arr($result))) { + return $json; + } + return is_null($outType) ? $result : $outType($result); } /** diff --git a/WeMini/Qrcode.php b/WeMini/Qrcode.php index e8252e3..aa70129 100644 --- a/WeMini/Qrcode.php +++ b/WeMini/Qrcode.php @@ -32,17 +32,21 @@ class Qrcode extends BasicWeChat * @param integer $width 二维码的宽度 * @param bool $auto_color 自动配置线条颜色，如果颜色依然是黑色，则说明不建议配置主色调 * @param array $line_color auto_color 为 false 时生效 + * @param null|string $outType 输出类型 * @return array|string * @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\LocalCacheException */ - public function createMiniPath($path, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"]) + public function createMiniPath($path, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"], $outType = null) { $url = 'https://api.weixin.qq.com/wxa/getwxacode?access_token=ACCESS_TOKEN'; $this->registerApi($url, __FUNCTION__, func_get_args()); $data = ['path' => $path, 'width' => $width, 'auto_color' => $auto_color, 'line_color' => $line_color]; $result = Tools::post($url, Tools::arr2json($data)); - return strlen($result) > 256 ? $result : Tools::json2arr($result); + if (($json = Tools::json2arr($result))) { + return $json; + } + return is_null($outType) ? $result : $outType($result); } /** @@ -53,17 +57,21 @@ class Qrcode extends BasicWeChat * @param integer $width 二维码的宽度 * @param bool $auto_color 自动配置线条颜色，如果颜色依然是黑色，则说明不建议配置主色调 * @param array $line_color auto_color 为 false 时生效 + * @param null|string $outType 输出类型 * @return array|string * @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\LocalCacheException */ - public function createMiniScene($scene, $page, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"]) + public function createMiniScene($scene, $page, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"], $outType = null) { $url = 'https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=ACCESS_TOKEN'; $data = ['scene' => $scene, 'width' => $width, 'auto_color' => $auto_color, 'page' => $page, 'line_color' => $line_color]; $this->registerApi($url, __FUNCTION__, func_get_args()); $result = Tools::post($url, Tools::arr2json($data)); - return strlen($result) > 256 ? $result : Tools::json2arr($result); + if (($json = Tools::json2arr($result))) { + return $json; + } + return is_null($outType) ? $result : $outType($result); } /** @@ -71,16 +79,20 @@ class Qrcode extends BasicWeChat * 接口C：适用于需要的码数量较少的业务场景 * @param string $path 不能为空，最大长度 128 字节 * @param integer $width 二维码的宽度 + * @param null|string $outType 输出类型 * @return array|string * @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\LocalCacheException */ - public function createDefault($path, $width = 430) + public function createDefault($path, $width = 430, $outType = null) { $url = 'https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=ACCESS_TOKEN'; $this->registerApi($url, __FUNCTION__, func_get_args()); $result = Tools::post($url, Tools::arr2json(['path' => $path, 'width' => $width])); - return strlen($result) > 256 ? $result : Tools::json2arr($result); + if (($json = Tools::json2arr($result))) { + return $json; + } + return is_null($outType) ? $result : $outType($result); } } \ No newline at end of file