diff --git a/helper.php b/helper.php index 18d8c86e..8e549b02 100644 --- a/helper.php +++ b/helper.php @@ -356,15 +356,15 @@ function request() } /** - * 创建Response对象实例 + * 创建普通 Response 对象实例 * @param mixed $data 输出数据 - * @param string $type 输出类型 - * @param array $options 参数 + * @param string $code 状态码 + * @param array $header 头信息 * @return Response */ -function response($data = [], $type = '', $options = []) +function response($data = [], $code = 200, $header = [], $type = 'html') { - return Response::create($data, $type, $options); + return Response::create($data, $type)->code($code)->header($header); } /** diff --git a/library/think/Model.php b/library/think/Model.php index 7f23f479..664caf3a 100644 --- a/library/think/Model.php +++ b/library/think/Model.php @@ -321,12 +321,10 @@ abstract class Model implements \JsonSerializable, \ArrayAccess $value = json_encode($value, JSON_FORCE_OBJECT); } break; - case 'array': $value = (array) $value; case 'json': $value = json_encode($value, JSON_UNESCAPED_UNICODE); - break; } return $value; diff --git a/library/think/Response.php b/library/think/Response.php index d3d6d7eb..1feec722 100644 --- a/library/think/Response.php +++ b/library/think/Response.php @@ -216,13 +216,17 @@ class Response /** * 设置响应头 * @access public - * @param string $name 参数名 + * @param string|array $name 参数名 * @param string $value 参数值 * @return $this */ - public function header($name, $value) + public function header($name, $value = null) { - $this->header[$name] = $value; + if (is_array($name)) { + $this->header = $name; + } else { + $this->header[$name] = $value; + } return $this; }