From 3c09a3f918fa90b8ffa51571415a6c833eab7173 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Fri, 9 Mar 2018 00:27:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=85=8D=E7=BD=AE=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E8=BE=93=E5=87=BA=E6=A0=BC=E5=BC=8F=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=9C=A8JSONP=E8=AF=B7=E6=B1=82=E4=B8=8B=E4=B8=8D?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=E8=BE=93=E5=87=BA=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common/controller/Api.php | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/application/common/controller/Api.php b/application/common/controller/Api.php
index 9085d5a0..46122a46 100644
--- a/application/common/controller/Api.php
+++ b/application/common/controller/Api.php
@@ -54,6 +54,12 @@ class Api
      */
     protected $auth = null;
 
+    /**
+     * 默认响应输出类型,支持json/xml
+     * @var string 
+     */
+    protected $responseType = 'json';
+
     /**
      * 构造方法
      * @access public
@@ -145,7 +151,7 @@ class Api
      * @param string $type  输出类型
      * @param array $header 发送的 Header 信息
      */
-    protected function success($msg = '', $data = null, $code = 1, $type = 'json', array $header = [])
+    protected function success($msg = '', $data = null, $code = 1, $type = null, array $header = [])
     {
         $this->result($msg, $data, $code, $type, $header);
     }
@@ -158,7 +164,7 @@ class Api
      * @param string $type  输出类型
      * @param array $header 发送的 Header 信息
      */
-    protected function error($msg = '', $data = null, $code = 0, $type = 'json', array $header = [])
+    protected function error($msg = '', $data = null, $code = 0, $type = null, array $header = [])
     {
         $this->result($msg, $data, $code, $type, $header);
     }
@@ -168,13 +174,13 @@ class Api
      * @access protected
      * @param mixed  $msg    提示信息
      * @param mixed  $data   要返回的数据
-     * @param int    $code   返回的 code
-     * @param string $type   返回数据格式
+     * @param int    $code   错误码，默认为0
+     * @param string $type   输出类型，支持json/xml/jsonp
      * @param array  $header 发送的 Header 信息
      * @return void
      * @throws HttpResponseException
      */
-    protected function result($msg, $data = null, $code = 0, $type = 'json', array $header = [])
+    protected function result($msg, $data = null, $code = 0, $type = null, array $header = [])
     {
         $result = [
             'code' => $code,
@@ -182,7 +188,9 @@ class Api
             'time' => Request::instance()->server('REQUEST_TIME'),
             'data' => $data,
         ];
-        $type = $type ?: $this->getResponseType();
+        // 如果未设置类型则自动判断
+        $type = $type ? $type : ($this->request->param(config('var_jsonp_handler')) ? 'jsonp' : $this->responseType);
+
         if (isset($header['statuscode']))
         {
             $code = $header['statuscode'];
@@ -190,10 +198,10 @@ class Api
         }
         else
         {
-            $code = $code >= 1000 ? 200 : $code;
+            //未设置状态码,根据code值判断
+            $code = $code >= 1000 || $code < 200 ? 200 : $code;
         }
         $response = Response::create($result, $type, $code)->header($header);
-
         throw new HttpResponseException($response);
     }