refactor(Helpers): Remove JsonHelper

Rhilip · Mar 8, 2019 · df5d57e · df5d57e
1 parent ae2a7b7
commit df5d57e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 98 deletions.
diff --git a/apps/config/http_base.php b/apps/config/http_base.php
@@ -52,18 +52,6 @@
             'class'         => Rid\Http\Response::class,
             // 默认输出格式
             'defaultFormat' => Rid\Http\Response::FORMAT_HTML,
-            // json
-            'json'          => [
-                // 类路径
-                'class' => Rid\Http\Json::class,
-            ],
-            // jsonp
-            'jsonp'         => [
-                // 类路径
-                'class' => Rid\Http\Jsonp::class,
-                // callback键名
-                'name'  => 'callback',
-            ],
             // xml
             'xml'           => [
                 // 类路径

diff --git a/framework/Helpers/JsonHelper.php b/framework/Helpers/JsonHelper.php
diff --git a/framework/Http/BaseResponse.php b/framework/Http/BaseResponse.php
@@ -20,16 +20,6 @@ class BaseResponse extends Component
     // 默认输出格式
     public $defaultFormat = self::FORMAT_HTML;
 
-    /**
-     * @var \Rid\Http\Json
-     */
-    public $json;
-
-    /**
-     * @var \Rid\Http\Jsonp
-     */
-    public $jsonp;
-
     /**
      * @var \Rid\Http\Xml
      */
@@ -92,11 +82,15 @@ protected function prepare()
         if (is_array($content) || is_object($content)) {
             switch ($this->format) {
                 case self::FORMAT_JSON:
-                    $content = $this->json->encode($content);
+                    $content = json_encode($content, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
                     break;
                 case self::FORMAT_JSONP:
-                    $content = $this->jsonp->encode($content);
-                    break;
+                    {
+                        $callback_key = app()->request->get('callback', 'callback');
+                        $content = json_encode($content, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+                        $content = $callback_key . '(' . $content . ')';
+                        break;
+                    }
                 case self::FORMAT_XML:
                     $content = $this->xml->encode($content);
                     break;

diff --git a/framework/Http/Json.php b/framework/Http/Json.php
diff --git a/framework/Http/Jsonp.php b/framework/Http/Jsonp.php