app模式重构

library/think/controller/rest.php

@@ -72,20 +72,6 @@ abstract class rest {
         }
     }
 
-    /**
-     * 设置页面输出的CONTENT_TYPE和编码
-     * @access public
-     * @param string $type content_type 类型对应的扩展名
-     * @param string $charset 页面输出编码
-     * @return void
-     */
-    public function setContentType($type, $charset='utf-8'){
-        if(headers_sent()) return;
-        $type = strtolower($type);
-        if(isset($this->restOutputType[$type])) //过滤content_type
-            header('Content-Type: '.$this->restOutputType[$type].'; charset='.$charset);
-    }
-
     /**
      * 输出返回数据
      * @access protected
@@ -95,96 +81,15 @@ abstract class rest {
      * @return void
      */
     protected function response($data,$type='',$code=200) {
-        $this->sendHttpStatus($code);
-        exit($this->encodeData($data,strtolower($type)));
-    }
-
-    /**
-     * 编码数据
-     * @access protected
-     * @param mixed $data 要返回的数据
-     * @param String $type 返回类型 JSON XML
-     * @return void
-     */
-    protected function encodeData($data,$type='') {
-        if(empty($data))  return '';
-        if('json' == $type) {
-            // 返回JSON数据格式到客户端 包含状态信息
-            $data = json_encode($data, JSON_UNESCAPED_UNICODE);
-        }elseif('xml' == $type){
-            // 返回xml格式数据
-            $data = xml_encode($data);
-        }elseif('php'==$type){
-            $data = serialize($data);
-        }// 默认直接输出
-        $this->setContentType($type);
-        header('Content-Length: ' . strlen($data));
-        return $data;
-    }
-
-    // 发送Http状态信息
-    protected function sendHttpStatus($status) {
-        static $_status = [
-            // Informational 1xx
-            100 => 'Continue',
-            101 => 'Switching Protocols',
-            // Success 2xx
-            200 => 'OK',
-            201 => 'Created',
-            202 => 'Accepted',
-            203 => 'Non-Authoritative Information',
-            204 => 'No Content',
-            205 => 'Reset Content',
-            206 => 'Partial Content',
-            // Redirection 3xx
-            300 => 'Multiple Choices',
-            301 => 'Moved Permanently',
-            302 => 'Moved Temporarily ',  // 1.1
-            303 => 'See Other',
-            304 => 'Not Modified',
-            305 => 'Use Proxy',
-            // 306 is deprecated but reserved
-            307 => 'Temporary Redirect',
-            // Client Error 4xx
-            400 => 'Bad Request',
-            401 => 'Unauthorized',
-            402 => 'Payment Required',
-            403 => 'Forbidden',
-            404 => 'Not Found',
-            405 => 'Method Not Allowed',
-            406 => 'Not Acceptable',
-            407 => 'Proxy Authentication Required',
-            408 => 'Request Timeout',
-            409 => 'Conflict',
-            410 => 'Gone',
-            411 => 'Length Required',
-            412 => 'Precondition Failed',
-            413 => 'Request Entity Too Large',
-            414 => 'Request-URI Too Long',
-            415 => 'Unsupported Media Type',
-            416 => 'Requested Range Not Satisfiable',
-            417 => 'Expectation Failed',
-            // Server Error 5xx
-            500 => 'Internal Server Error',
-            501 => 'Not Implemented',
-            502 => 'Bad Gateway',
-            503 => 'Service Unavailable',
-            504 => 'Gateway Timeout',
-            505 => 'HTTP Version Not Supported',
-            509 => 'Bandwidth Limit Exceeded'
-        ];
-        if(isset($_status[$code])) {
-            header('HTTP/1.1 '.$code.' '.$_status[$code]);
-            // 确保FastCGI模式下正常
-            header('Status:'.$code.' '.$_status[$code]);
-        }
+        Response::sendHttpStatus($code);
+        Response::returnData($data,strtolower($type)));
     }
 
     /**
      * 获取当前请求的Accept头信息
      * @return string
      */
-    protected function getAcceptType(){
+    static public function getAcceptType(){
         $type = [
             'html'  =>  'text/html,application/xhtml+xml,*/*',
             'xml'   =>  'application/xml,text/xml,application/x-xml',