From 541553f3bcfa74086112d790e545572377f2762b Mon Sep 17 00:00:00 2001
From: huangdijia <huangdijia@gmail.com>
Date: Wed, 23 Dec 2015 14:04:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83Response=E4=B8=ADresult/succe?=
 =?UTF-8?q?ss/error=E6=96=B9=E6=B3=95=E4=BD=BF=E7=94=A8=EF=BC=8C=E4=B8=8Ev?=
 =?UTF-8?q?iew=E4=BD=BF=E7=94=A8=E6=96=B9=E6=B3=95=E4=BF=9D=E6=8C=81?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=EF=BC=8C=E5=90=8C=E6=97=B6=E5=AE=8C=E7=BE=8E?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95=20?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=96=B9=E6=B3=95=EF=BC=9A=20if(false){=20?=
 =?UTF-8?q?=20=20=20=20return=20Response::error('error=20msg');=20}else{?=
 =?UTF-8?q?=20=20=20=20=20return=20Response::success('success=20msg');=20}?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/think/app.php b/library/think/app.php
index c28bf47a..ddfa715d 100644
--- a/library/think/app.php
+++ b/library/think/app.php
@@ -124,7 +124,7 @@ class App
                 // 操作方法执行完成监听
                 APP_HOOK && Hook::listen('action_end', $data);
                 // 输出数据
-                return Response::send($data, '', Config::get('response_return'));
+                return Response::send($data, Config::get('default_return_type'), Config::get('response_return'));
             } else {
                 throw new Exception('method [ ' . (new \ReflectionClass($instance))->getName() . '->' . $action . ' ] not exists ', 10002);
             }