diff --git a/library/think/Model.php b/library/think/Model.php index 166445d9..d51160d0 100644 --- a/library/think/Model.php +++ b/library/think/Model.php @@ -631,16 +631,16 @@ abstract class Model implements \JsonSerializable, \ArrayAccess * 保存多个数据到当前数据对象 * @access public * @param array $data 数据 - * @return integer + * @return array|false */ public function saveAll($dataSet) { - $result = 0; + $result = []; $db = $this->db(); $db->startTrans(); try { foreach ($dataSet as $data) { - $result = $this->isUpdate(false)->save($data, [], false); + $result[] = $this->isUpdate(false)->save($data, [], true); } $db->commit(); return $result; diff --git a/library/think/Response.php b/library/think/Response.php index 0165694f..4568aa0f 100644 --- a/library/think/Response.php +++ b/library/think/Response.php @@ -90,23 +90,20 @@ class Response */ public function send() { - // 处理输出数据 $data = $this->getContent(); // 监听response_data Hook::listen('response_data', $data, $this); - // 发送头部信息 if (!headers_sent() && !empty($this->header)) { // 发送状态码 http_response_code($this->code); - + // 发送头部信息 foreach ($this->header as $name => $val) { header($name . ':' . $val); } } - echo $data; if (function_exists('fastcgi_finish_request')) { @@ -151,7 +148,6 @@ class Response return $this; } - /** * 设置响应头 * @access public @@ -264,17 +260,16 @@ class Response $content = $this->output($this->data); if (null !== $content && !is_string($content) && !is_numeric($content) && !is_callable([ - $content, - '__toString' - ]) + $content, + '__toString', + ]) ) { throw new \InvalidArgumentException(sprintf('variable type error: %s', gettype($content))); } - return (string)$content; + return (string) $content; } - /** * 获取状态码 * @return integer