修正Query类 改进Response类 改进异常输出

library/think/response/Html.php

@@ -18,9 +18,11 @@ use think\View;
 class Html extends Response
 {
     // 输出参数
-    protected $options = [];
-    protected $vars    = [];
-    protected $replace = [];
+    protected $options     = [];
+    protected $vars        = [];
+    protected $replace     = [];
+    protected $contentType = 'text/html';
+    protected $render      = false;
 
     /**
      * 处理数据
@@ -31,8 +33,25 @@ class Html extends Response
     protected function output($data)
     {
         // 返回JSON数据格式到客户端 包含状态信息
-        return View::instance(Config::get('template'), Config::get('view_replace_str'))
-            ->fetch($data, $this->vars, $this->replace);
+        if ($this->render) {
+            // 渲染模板输出
+            return View::instance(Config::get('template'), Config::get('view_replace_str'))
+                ->fetch($data, $this->vars, $this->replace, [], false, false);
+        } else {
+            return $data;
+        }
+    }
+
+    /**
+     * 是否需要进行视图渲染
+     * @access protected
+     * @param bool $render 是否渲染
+     * @return $this
+     */
+    public function render($render = true)
+    {
+        $this->render = $render;
+        return $this;
     }
 
     /**

library/think/response/Json.php

@@ -19,7 +19,7 @@ class Json extends Response
     protected $options = [
         'json_encode_param' => JSON_UNESCAPED_UNICODE,
     ];
-
+    protected $contentType = 'application/json';
     /**
      * 处理数据
      * @access protected

library/think/response/Jsonp.php

@@ -21,6 +21,7 @@ class Jsonp extends Response
         'default_jsonp_handler' => 'jsonpReturn',
         'json_encode_param'     => JSON_UNESCAPED_UNICODE,
     ];
+    protected $contentType = 'application/json';
 
     /**
      * 处理数据