优化App类

This commit is contained in:
thinkphp
2016-05-17 23:20:09 +08:00
parent cda738b038
commit 28bf9b2726
2 changed files with 11 additions and 15 deletions

View File

@@ -11,8 +11,16 @@
namespace think;
use think\Config;
use think\Exception;
use think\exception\HttpResponseException;
use think\Hook;
use think\Lang;
use think\Loader;
use think\Log;
use think\Request;
use think\Response;
use think\Route;
/**
* App 应用管理
@@ -137,20 +145,7 @@ class App
{
if (empty($vars)) {
// 自动获取请求变量
switch (REQUEST_METHOD) {
case 'POST':
$vars = array_merge($_GET, $_POST);
break;
case 'PUT':
static $_PUT = null;
if (is_null($_PUT)) {
parse_str(file_get_contents('php://input'), $_PUT);
}
$vars = array_merge($_GET, $_PUT);
break;
default:
$vars = $_GET;
}
$vars = Request::instance()->param();
}
if (is_array($method)) {
$class = is_object($method[0]) ? $method[0] : new $method[0];

View File

@@ -19,6 +19,7 @@ class Response
protected $transform;
// 输出数据
protected $data;
// 输出类型
protected $type;
// 当前的contentType
protected $contentType;
@@ -67,7 +68,7 @@ class Response
{
$type = strtolower($type ?: (IS_AJAX ? 'json' : 'html'));
if (!isset(self::$instance[$type])) {
$class = '\\think\response\\' . ucfirst($type);
$class = '\\think\\response\\' . ucfirst($type);
if (class_exists($class)) {
$response = new $class($data, $type, $options);
} else {