From d0877f695a45a911a4a40b6ef8e59e5c261c1b6c Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 19 Apr 2018 18:18:10 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Test/mini-qrc.php | 9 +++++----
 WeMini/Qrcode.php | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Test/mini-qrc.php b/Test/mini-qrc.php
index 380785b..f636610 100644
--- a/Test/mini-qrc.php
+++ b/Test/mini-qrc.php
@@ -10,11 +10,12 @@ $config = [
 
 $mini = new WeMini\Qrcode($config);
 
-echo '<pre>';
+//echo '<pre>';
 try {
-//    var_dump($mini->getCode('pages/index?query=1'));
-//    var_dump($mini->getCodeUnlimit('432432', 'pages/index/index'));
-    var_dump($mini->createQrcode('pages/index?query=1'));
+    header('Content-type:image/jpeg');//输出的类型
+//    echo $mini->createDefault('pages/index?query=1');
+//    echo $mini->createMiniScene('432432', 'pages/index/index');
+    echo $mini->createMiniPath('pages/index?query=1');
 } catch (Exception $e) {
     var_dump($e->getMessage());
 }
diff --git a/WeMini/Qrcode.php b/WeMini/Qrcode.php
index 7fec035..e8252e3 100644
--- a/WeMini/Qrcode.php
+++ b/WeMini/Qrcode.php
@@ -36,7 +36,7 @@ class Qrcode extends BasicWeChat
      * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      */
-    public function getCode($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"])
     {
         $url = 'https://api.weixin.qq.com/wxa/getwxacode?access_token=ACCESS_TOKEN';
         $this->registerApi($url, __FUNCTION__, func_get_args());
@@ -57,7 +57,7 @@ class Qrcode extends BasicWeChat
      * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      */
-    public function getCodeUnlimit($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"])
     {
         $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];
@@ -75,11 +75,11 @@ class Qrcode extends BasicWeChat
      * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      */
-    public function createQrcode($path, $width = 430)
+    public function createDefault($path, $width = 430)
     {
         $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' => urlencode($path), 'width' => $width]));
+        $result = Tools::post($url, Tools::arr2json(['path' => $path, 'width' => $width]));
         return strlen($result) > 256 ? $result : Tools::json2arr($result);
     }