From 243caecbbaaa46bf83299f0d3da51c54c5051576 Mon Sep 17 00:00:00 2001
From: vone <admin@szvone.cn>
Date: Mon, 28 Oct 2019 15:18:59 +0800
Subject: [PATCH] =?UTF-8?q?V1.10.1=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md               |  5 ++++-
 config/app.php          |  2 +-
 public/qr-code/test.php | 27 ++++++++++++++++-----------
 ver                     |  2 +-
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 8a8acd8..7e8593e 100644
--- a/README.md
+++ b/README.md
@@ -122,7 +122,10 @@ V免签为完全开源项目，开源项目意味着作者没有任何收入来
     + 微信店员收款推送通知
            
 ## 更新记录
-    
+ + v1.11（2019.10.28）
+    + 修复上传二维码一直卡在处理中
+    + 如二维码无法正常识别，请给/public/qr-code/test.php设置777权限
+        
  + v1.10.1（2019.09.16）
     + 增加版本更新提示
     
diff --git a/config/app.php b/config/app.php
index 3ce8eac..c6b9478 100644
--- a/config/app.php
+++ b/config/app.php
@@ -142,5 +142,5 @@
     'show_error_msg'         => false,
     // 异常处理handle类 留空使用 \think\exception\Handle
     'exception_handle'       => '',
-    'ver'                    => '1.10.1',
+    'ver'                    => '1.11',
 ];
diff --git a/public/qr-code/test.php b/public/qr-code/test.php
index 9f2ddc9..fe5f6f5 100644
--- a/public/qr-code/test.php
+++ b/public/qr-code/test.php
@@ -1,4 +1,5 @@
 <?php
+error_reporting(0);
 ini_set ('memory_limit', '256M');
 header("Content-type:text/html;charset=utf-8");
 
@@ -8,6 +9,8 @@
     echo "error";
     exit();
 }
+
+
 function getCurl($url, $post = 0, $cookie = 0, $header = 0, $nobaody = 0)
 {
     $ch = curl_init();
@@ -42,19 +45,21 @@ function getCurl($url, $post = 0, $cookie = 0, $header = 0, $nobaody = 0)
 }
 
 
-if (isset($_POST['base64'])){
-    $b64 = $_POST['base64'];
-    $s = base64_decode($b64);
-    $img_path = './image/'.md5($s).'.jpg';
-    file_put_contents($img_path, $s,LOCK_EX);
-}else{
-    $s = file_get_contents($_FILES["file"]["tmp_name"]);
-    $img_path = './image/'.md5($s).'.jpg';
-    file_put_contents($img_path, $s,LOCK_EX);
-}
-$url='http://'.$_SERVER['SERVER_NAME'].str_replace("/test.php","",$_SERVER["REQUEST_URI"]).str_replace("./","/",$img_path);
 
 try{
+    if (isset($_POST['base64'])){
+        $b64 = $_POST['base64'];
+        $s = base64_decode($b64);
+        $img_path = './image/'.md5($s).'.jpg';
+        file_put_contents($img_path, $s,LOCK_EX);
+    }else{
+        $s = file_get_contents($_FILES["file"]["tmp_name"]);
+        $img_path = './image/'.md5($s).'.jpg';
+        file_put_contents($img_path, $s,LOCK_EX);
+    }
+    $url='http://'.$_SERVER['SERVER_NAME'].str_replace("/test.php","",$_SERVER["REQUEST_URI"]).str_replace("./","/",$img_path);
+
+
     $res = getCurl("https://cli.im/apis/up/deqrimg","img=".urlencode($url));
     $obj = json_decode($res);
     $text = $obj->info->data[0];
diff --git a/ver b/ver
index fb1d091..aee6885 100644
--- a/ver
+++ b/ver
@@ -1 +1 @@
-1.10.1|2019-09-16
\ No newline at end of file
+1.11|2019-10-28
\ No newline at end of file