From c37c4b2dfa6b6a5272022a37aed791c5bf8a8463 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 26 Feb 2016 14:22:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0response=5Fauto=5Foutput?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=94=A8=E4=BA=8E=E6=8E=A7=E5=88=B6=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E8=87=AA=E5=8A=A8=E8=B0=83=E7=94=A8Response=E7=B1=BB?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=E8=BE=93=E5=87=BA=20=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BAfalse=20=E5=88=99=E7=94=B1=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=99=A8=E8=87=AA=E8=A1=8C=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 convention.php        | 2 ++
 library/think/App.php | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/convention.php b/convention.php
index a392d4ff..bab1a497 100644
--- a/convention.php
+++ b/convention.php
@@ -37,6 +37,8 @@ return [
     'lang_cookie_var'        => 'think_lang',
     // 默认全局过滤方法 用逗号分隔多个
     'default_filter'         => '',
+    // 自动Response输出
+    'response_auto_output'   => true,
 
     // +----------------------------------------------------------------------
     // | 模块设置
diff --git a/library/think/App.php b/library/think/App.php
index 3aad92a7..d7483012 100644
--- a/library/think/App.php
+++ b/library/think/App.php
@@ -103,7 +103,10 @@ class App
         // 监听app_end
         APP_HOOK && Hook::listen('app_end', $data);
         // 输出数据到客户端
-        return Response::send($data, Response::type(), Config::get('response_return'));
+        if (Config::get('response_auto_output')) {
+            // 自动响应输出
+            return Response::send($data, Response::type(), Config::get('response_return'));
+        }
     }
 
     // 执行函数或者闭包方法 支持参数调用