mirror
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

新增配置默认输出格式 

修复在JSONP请求下不响应输出的BUG
pull/48/head
Karson 2018-03-09 00:27:46 +08:00
parent d2a523e462
commit 3c09a3f918
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
application/common/controller/Api.php
View File

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