topnuomi
/
TOP-framework
mirror of https://gitee.com/topnuomi/TOP-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

完善了Request类、路由作用单一化

This commit is contained in:
TOP糯米 2019-07-08 16:07:59 +08:00
parent 8f540fdb27
commit ba9c63baa3
25 changed files with 546 additions and 294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -0,0 +1 @@
### TOP-Framework

2
application/home/config/config.php
View File

@ -22,7 +22,7 @@ return [
'view' => [ 'view' => [
'engine' => 'Top', 'engine' => 'Top',
'ext' => 'html', 'ext' => 'html',
'dir' => '../application/home/view/', 'dir' => APP_PATH . 'home/view/',
'cacheDir' => './runtime/cache/application/home/', 'cacheDir' => './runtime/cache/application/home/',
'compileDir' => './runtime/compile/application/home/', 'compileDir' => './runtime/compile/application/home/',
'left' => '{', 'left' => '{',

20
application/home/controller/Index.php
View File

@ -2,23 +2,25 @@
namespace app\home\controller; namespace app\home\controller;
use app\home\model\Users; use top\blocks\Json;
class Index extends Common class Index extends Common
{ {
use Json;
public function index() public function index()
{ {
$model = model(Users::class); return request()->module();
$lists = $model->all;
return [
'lists' => $lists
];
} }
public function hello() public function hello()
{ {
// return $this->fetch(); return 'hello';
return true;
} }
}
public function testPage()
{
// return $this->fetch();
return [];
}
}

4
application/home/view/Index/index.html
View File

@ -3,12 +3,12 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Title</title> <title>Title</title>
<script src="https://libs.baidu.com/jquery/1.11.1/jquery.min.js"></script> <script src="/resource/jquery.min.js"></script>
</head> </head>
<body> <body>
{view name="Index/hello"} {view name="Index/hello"}
{loop $lists as $value} {loop $lists as $value}
{$value->name} {$value}
{/loop} {/loop}
</body> </body>
</html> </html>

13
application/home/view/Index/testPage.html Normal file
View File

@ -0,0 +1,13 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Document</title>
</head>
<body>
</body>
</html>

2
framework/Framework.php
View File

@ -45,7 +45,7 @@ class Framework
self::frameworkPath(); self::frameworkPath();
require 'library/App.php'; require 'library/App.php';
App::start(self::$type, self::$defaultModule); App::run(self::$type, self::$defaultModule);
} else { } else {
echo '请使用Framework::appPath()指定应用目录'; echo '请使用Framework::appPath()指定应用目录';
} }

19
framework/blocks/Json.php Normal file
View File

@ -0,0 +1,19 @@
<?php
namespace top\blocks;
trait Json {
public function returnJson($msg, $code = 0, $data = [])
{
if (is_array($msg)) {
return json_encode($msg);
} else {
return json_encode([
'msg' => $msg,
'code' => $code,
'data' => $data
]);
}
}
}

5
framework/decorator/InitDecorator.php
View File

@ -21,8 +21,6 @@ class InitDecorator implements DecoratorIfs
*/ */
public function before() public function before()
{ {
$route = Register::get('Router');
$sessionConfig = Register::get('Config')->get('session'); $sessionConfig = Register::get('Config')->get('session');
if (!empty($sessionConfig) && $sessionConfig['open'] === true) { if (!empty($sessionConfig) && $sessionConfig['open'] === true) {
session_start(); session_start();
@ -60,7 +58,7 @@ class InitDecorator implements DecoratorIfs
require FRAMEWORK_PATH . 'library/functions/functions.php'; require FRAMEWORK_PATH . 'library/functions/functions.php';
// 加载用户函数库 // 加载用户函数库
$funcFile = APP_PATH . $route->module . '/functions.php'; $funcFile = APP_PATH . request()->module() . '/functions.php';
if (file_exists($funcFile)) { if (file_exists($funcFile)) {
require $funcFile; require $funcFile;
} }
@ -71,6 +69,5 @@ class InitDecorator implements DecoratorIfs
*/ */
public function after($data) public function after($data)
{ {
// TODO Auto-generated method stub
} }
} }

41
framework/decorator/ReturnDecorator.php
View File

@ -1,41 +0,0 @@
<?php
namespace top\decorator;
use top\decorator\ifs\DecoratorIfs;
use top\library\Register;
/**
* 辅助控制器的装饰器
*
* @author topnuomi 2018年11月22日
*/
class ReturnDecorator implements DecoratorIfs
{
public function before()
{
// TODO Auto-generated method stub
}
/**
* 布尔或数组则显示视图
* @param array $data
* @throws \Exception
*/
public function after($data)
{
// TODO Auto-generated method stub
if (is_bool($data) && $data === true)
$data = [];
if (is_array($data)) {
if (request()->isAjax()) { // 如果是ajax请求，则将数组转json，echo出去
echo json_encode($data);
} else { // 显示视图
$route = Register::get('Router');
$view = Register::get('View');
echo $view->fetch($route->ctrl . '/' . $route->action, $data);
}
}
}
}

31
framework/decorator/StringDecorator.php
View File

@ -1,31 +0,0 @@
<?php
namespace top\decorator;
use top\decorator\ifs\DecoratorIfs;
/**
* 辅助控制器的装饰器
* @author topnuomi 2018年11月22日
*/
class StringDecorator implements DecoratorIfs
{
public function before()
{
// TODO Auto-generated method stub
}
/**
* 字符串则直接输出
* @param array $data
*/
public function after($data)
{
// TODO Auto-generated method stub
// 如果是字符串，直接echo
if (!is_array($data) && !is_bool($data) && !is_object($data)) {
echo $data;
}
}
}

52
framework/library/App.php
View File

@ -2,18 +2,20 @@
namespace top\library; namespace top\library;
use top\library\route\Command; use top\library\http\Request;
use top\library\route\Pathinfo; use top\library\error\BaseError;
use top\library\exception\BaseException;
use top\library\http\Response;
class App class App
{ {
/** /**
* start * 开始执行程序
* @param int $type * @param int $type
* @param string $defaultModule * @param string $defaultModule
*/ */
public static function start($type = 1, $defaultModule = 'home') public static function run($type = 1, $defaultModule = 'home')
{ {
// 注册框架自动加载 // 注册框架自动加载
require 'Loader.php'; require 'Loader.php';
@ -29,30 +31,26 @@ class App
} }
// 使用whoops美化异常输出 // 使用whoops美化异常输出
$whoops = new \Whoops\Run; // $whoops = new \Whoops\Run;
$whoops->pushHandler(new \Whoops\Handler\PrettyPageHandler); // $whoops->pushHandler(new \Whoops\Handler\PrettyPageHandler);
$whoops->register(); // $whoops->register();
// if (PHP_VERSION > 5.6) { if (PHP_VERSION > 5.6) {
// set_error_handler([new BaseError(), 'handler']); set_error_handler([new BaseError(), 'handler']);
// } }
// set_exception_handler([new BaseException(), 'handler']); set_exception_handler([new BaseException(), 'handler']);
$routeDriver = ''; $request = Request::instance();
if (php_sapi_name() == 'cli') { $response = Response::instance();
// 命令行运行程序
$routeDriver = new Command(); // 处理请求并得到数据
} else { $responseData = $response->dispatch($request->execute($type, $defaultModule));
// 其他方式
switch ($type) { // 输出内容
case 1: echo $responseData;
$routeDriver = new Pathinfo();
break; if (function_exists('fastcgi_finish_request')) {
default: fastcgi_finish_request();
// 其他
}
} }
// 实例化路由
(new Router($routeDriver, $defaultModule))->handler();
} }
} }

4
framework/library/Config.php
View File

@ -2,6 +2,8 @@
namespace top\library; namespace top\library;
use top\library\http\Request;
/** /**
* 配置类 * 配置类
* @author topnuomi 2018年11月20日 * @author topnuomi 2018年11月20日
@ -58,7 +60,7 @@ class Config
public function get($name = '') public function get($name = '')
{ {
// 加载文件 // 加载文件
$module = Register::get('Router')->module; $module = Request::instance()->module();
$file = APP_PATH . $module . '/config/config.php'; $file = APP_PATH . $module . '/config/config.php';
if (!isset(self::$files[$file])) { if (!isset(self::$files[$file])) {
if (file_exists($file)) { if (file_exists($file)) {

108
framework/library/Router.php
View File

@ -2,10 +2,6 @@
namespace top\library; namespace top\library;
use top\decorator\ifs\DecoratorIfs;
use top\decorator\InitDecorator;
use top\decorator\ReturnDecorator;
use top\decorator\StringDecorator;
use top\library\exception\RouteException; use top\library\exception\RouteException;
use top\library\route\ifs\RouteIfs; use top\library\route\ifs\RouteIfs;
@ -15,12 +11,11 @@ use top\library\route\ifs\RouteIfs;
*/ */
class Router class Router
{ {
/**
// 路由实例 * 路由实现
private $route; * @var RouteIfs
*/
// 装饰器 private $driver;
private $decorator = [];
public $module = ''; public $module = '';
@ -30,66 +25,19 @@ class Router
public $action = ''; public $action = '';
public $param = []; public $params = [];
/** /**
* 实例化时注入具体路由实现和默认位置 * 实例化时注入具体路由实现和默认位置
* Route constructor. * Router constructor.
* @param RouteIfs $route * @param RouteIfs $driver
* @param $default * @param $default
* @throws RouteException
*/ */
public function __construct(RouteIfs $route, $default) public function __construct(RouteIfs $driver, $default)
{ {
$this->route = $route; $this->driver = $driver;
$this->route->default = $default; $this->driver->default = $default;
$this->route->processing(); $this->driver->processing();
$this->module = $this->route->module;
$this->class = $this->route->class;
$this->ctrl = $this->route->ctrl;
$this->action = $this->route->action;
$this->param = $this->route->param;
$this->check();
Register::set('Router', function () {
return $this->route;
});
Register::set('Config', function () {
return Config::instance();
});
}
/**
* 指定装饰器
* @param DecoratorIfs $decorator
*/
private function decorator(DecoratorIfs $decorator)
{
$this->decorator[] = $decorator;
}
/**
* 装饰器前置方法
*/
private function beforeRoute()
{
foreach ($this->decorator as $decorator) {
$decorator->before();
}
}
/**
* 装饰器后置方法
* @param $data
*/
private function afterRoute($data)
{
$this->decorator = array_reverse($this->decorator);
foreach ($this->decorator as $decorator) {
$decorator->after($data);
}
} }
/** /**
@ -113,30 +61,24 @@ class Router
} }
/** /**
* 调用方法并执行程序 * 处理结果返回
* @return $this
* @throws RouteException
*/ */
public function handler() public function handler()
{ {
$userDecorators = Register::get('Config')->get('decorator'); $this->module = $this->driver->module;
$systemDecorators = [InitDecorator::class, ReturnDecorator::class, StringDecorator::class]; $this->class = $this->driver->class;
$this->ctrl = $this->driver->ctrl;
$this->action = $this->driver->action;
$this->params = $this->driver->params;
$decorators = array_merge($systemDecorators, $userDecorators); $this->check();
foreach ($decorators as $key => $value) {
$this->decorator(new $value());
}
$this->beforeRoute(); Register::set('Config', function () {
return Config::instance();
});
$object = new $this->class(); return $this;
$reflectionClass = new \ReflectionClass($this->class);
if ($reflectionClass->hasMethod('_init')) {
$data = $object->_init();
}
if (!isset($data) || $data == null) {
$reflectionMethod = new \ReflectionMethod($this->class, $this->action);
$data = $reflectionMethod->invokeArgs($object, $this->param);
}
$this->afterRoute($data);
} }
} }

3
framework/library/View.php
View File

@ -75,8 +75,7 @@ class View
public function fetch($file = '', $param = [], $cache = false) public function fetch($file = '', $param = [], $cache = false)
{ {
if (!$file) { if (!$file) {
$route = Register::get('Router'); $file = request()->controller() . '/' . request()->method();
$file = $route->ctrl . '/' . $route->action;
} }
return $this->template->fetch($file, $param, $cache); return $this->template->fetch($file, $param, $cache);
} }

1
framework/library/exception/BaseException.php
View File

@ -244,7 +244,6 @@ class BaseException extends \Exception
EOF; EOF;
header("HTTP/1.1 404 Not Found"); header("HTTP/1.1 404 Not Found");
echo $content; echo $content;
exit;
} }
public function translateMessage($message) public function translateMessage($message)

65
framework/library/functions/functions.php
View File

@ -89,12 +89,69 @@ function get_table_name($classname)
} }
/** /**
* 获取客户端IP * 创建HTTP请求
* @return NULL|number|string * @param $url
* @param array $data
* @param array $header
* @return bool|mixed
*/ */
function get_client_ip() function create_http_request($url, $data = [], $header = [])
{ {
return request()->ip(); $curl = curl_init();
curl_setopt($curl, CURLOPT_URL, $url);
if (!empty($data)) {
curl_setopt($curl, CURLOPT_POST, true);
curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
}
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
curl_setopt($curl, CURLOPT_HEADER, $header);
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);
$res = curl_exec($curl);
curl_close($curl);
if ($res) {
return $res;
}
return false;
}
/**
* 获取客户端IP
* @param int $type
* @param bool $client
* @return mixed
*/
function get_client_ip($type = 0, $client = true)
{
$type = $type ? 1 : 0;
static $ip = NULL;
if ($ip !== NULL)
return $ip[$type];
if ($client) {
if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
$arr = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
$pos = array_search('unknown', $arr);
if (false !== $pos) {
unset($arr[$pos]);
}
$ip = trim($arr[0]);
} elseif (isset($_SERVER['HTTP_CLIENT_IP'])) {
$ip = $_SERVER['HTTP_CLIENT_IP'];
} elseif (isset($_SERVER['REMOTE_ADDR'])) {
$ip = $_SERVER['REMOTE_ADDR'];
}
} elseif (isset($_SERVER['REMOTE_ADDR'])) {
$ip = $_SERVER['REMOTE_ADDR'];
}
$long = sprintf("%u", ip2long($ip));
$ip = $long ? [
$ip,
$long
] : [
'0.0.0.0',
0
];
return $ip[$type];
} }
/** /**

286
framework/library/http/Request.php
View File

@ -2,6 +2,13 @@
namespace top\library\http; namespace top\library\http;
use top\decorator\ifs\DecoratorIfs;
use top\decorator\InitDecorator;
use top\library\Register;
use top\library\route\Command;
use top\library\route\Pathinfo;
use top\library\Router;
/** /**
* 请求类 * 请求类
* @author topnuomi 2018年11月23日 * @author topnuomi 2018年11月23日
@ -9,10 +16,57 @@ namespace top\library\http;
class Request class Request
{ {
/**
* 当前实例
* @var null
*/
private static $instance = null;
/**
* 保存$_SERVER变量
* @var array
*/
private $server = []; private $server = [];
private static $instance; /**
* 装饰器
* @var array
*/
private $decorator = [];
/**
* 路由实例
* @var null
*/
private $router = null;
/**
* 模块名
* @var string
*/
private $module = '';
/**
* 控制器完整类名
* @var string
*/
private $class = '';
/**
* 控制器名
* @var string
*/
private $ctrl = '';
/**
* 请求参数
* @var array
*/
private $params = [];
/**
* @return null|Request
*/
public static function instance() public static function instance()
{ {
if (!self::$instance) { if (!self::$instance) {
@ -30,84 +84,80 @@ class Request
{ {
} }
public function method() /**
* 当前请求方式
* @return mixed|string
*/
private function requestMethod()
{ {
return (isset($this->server['REQUEST_METHOD']) && $this->server['REQUEST_METHOD'] != '') ? $this->server['REQUEST_METHOD'] : ''; return (isset($this->server['REQUEST_METHOD']) && $this->server['REQUEST_METHOD'] != '') ? $this->server['REQUEST_METHOD'] : '';
} }
/** /**
* POST * POST
*
* @return boolean * @return boolean
*/ */
public function isPost() public function isPost()
{ {
return $this->method() == 'POST'; return $this->requestMethod() == 'POST';
} }
/** /**
* GET * GET
*
* @return boolean * @return boolean
*/ */
public function isGet() public function isGet()
{ {
return $this->method() == 'GET'; return $this->requestMethod() == 'GET';
} }
/** /**
* PUT * PUT
*
* @return boolean * @return boolean
*/ */
public function isPut() public function isPut()
{ {
return $this->method() == 'PUT'; return $this->requestMethod() == 'PUT';
} }
/** /**
* DELETE * DELETE
*
* @return boolean * @return boolean
*/ */
public function isDelete() public function isDelete()
{ {
return $this->method() == 'DELETE'; return $this->requestMethod() == 'DELETE';
} }
/** /**
* HEAD * HEAD
*
* @return boolean * @return boolean
*/ */
public function isHead() public function isHead()
{ {
return $this->method() == 'HEAD'; return $this->requestMethod() == 'HEAD';
} }
/** /**
* HEAD * HEAD
*
* @return boolean * @return boolean
*/ */
public function isPatch() public function isPatch()
{ {
return $this->method() == 'PATCH'; return $this->requestMethod() == 'PATCH';
} }
/** /**
* HEAD * HEAD
*
* @return boolean * @return boolean
*/ */
public function isOptions() public function isOptions()
{ {
return $this->method() == 'OPTIONS'; return $this->requestMethod() == 'OPTIONS';
} }
/** /**
* AJAX * AJAX
*
* @return boolean * @return boolean
*/ */
public function isAjax() public function isAjax()
@ -117,7 +167,6 @@ class Request
/** /**
* 创建一个请求（post或get取决于data是否有值且不为空或空数组） * 创建一个请求（post或get取决于data是否有值且不为空或空数组）
*
* @param string $url * @param string $url
* @param array $data * @param array $data
* @param array $header * @param array $header
@ -125,22 +174,7 @@ class Request
*/ */
public function create($url, $data = [], $header = []) public function create($url, $data = [], $header = [])
{ {
$curl = curl_init(); return create_http_request($url, $data, $header);
curl_setopt($curl, CURLOPT_URL, $url);
if (!empty($data)) {
curl_setopt($curl, CURLOPT_POST, true);
curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
}
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
curl_setopt($curl, CURLOPT_HEADER, $header);
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);
$res = curl_exec($curl);
curl_close($curl);
if ($res) {
return $res;
}
return false;
} }
/** /**
@ -151,56 +185,158 @@ class Request
*/ */
public function ip($type = 0, $client = true) public function ip($type = 0, $client = true)
{ {
$type = $type ? 1 : 0; return get_client_ip($type, $client);
static $ip = NULL; }
if ($ip !== NULL)
return $ip[$type]; /**
if ($client) { * 模块名称
if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) { * @return mixed
$arr = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']); */
$pos = array_search('unknown', $arr); public function module()
if (false !== $pos) {
unset($arr[$pos]); return $this->router->module;
$ip = trim($arr[0]); }
} elseif (isset($_SERVER['HTTP_CLIENT_IP'])) {
$ip = $_SERVER['HTTP_CLIENT_IP']; /**
} elseif (isset($_SERVER['REMOTE_ADDR'])) { * 控制器完整类名
$ip = $_SERVER['REMOTE_ADDR']; * @return mixed
} */
} elseif (isset($_SERVER['REMOTE_ADDR'])) { public function classname()
$ip = $_SERVER['REMOTE_ADDR']; {
return $this->router->class;
}
/**
* 控制器名称
* @return mixed
*/
public function controller()
{
return $this->router->ctrl;
}
/**
* 方法名称
* @return mixed
*/
public function method()
{
return $this->router->action;
}
/**
* 参数
* @return mixed
*/
public function params()
{
return $this->router->params;
}
/**
* 指定装饰器
* @param DecoratorIfs $decorator
*/
private function decorator(DecoratorIfs $decorator)
{
$this->decorator[] = $decorator;
}
/**
* 装饰器前置方法
*/
private function beforeRoute()
{
foreach ($this->decorator as $decorator) {
$decorator->before();
} }
$long = sprintf("%u", ip2long($ip));
$ip = $long ? [
$ip,
$long
] : [
'0.0.0.0',
0
];
return $ip[$type];
} }
public function post($name) /**
* 装饰器后置方法
* @param $data
*/
private function afterRoute($data)
{ {
$data = (isset($_POST[$name])) ? $_POST[$name] : ''; $this->decorator = array_reverse($this->decorator);
return $this->checkData($data); foreach ($this->decorator as $decorator) {
$decorator->after($data);
}
} }
public function get($name) /**
* 指定路由驱动
* @param $type
* @return string|Command|Pathinfo
*/
private function routeDriver($type)
{ {
$data = (isset($_GET[$name])) ? $_GET[$name] : ''; $routeDriver = '';
return $this->checkData($data); if (php_sapi_name() == 'cli') {
} // 命令行运行程序
$routeDriver = new Command();
public function checkData($data)
{
if (is_array($data)) {
foreach ($data as $k => $v)
$data[$k] = filter($v);
} else { } else {
$data = filter($data); // 其他方式
switch ($type) {
case 1:
$routeDriver = new Pathinfo();
break;
default:
// 其他
}
} }
return $routeDriver;
}
/**
* 设置路由并执行程序
* @param $type
* @param $defaultModule
* @return mixed
* @throws \top\library\exception\RouteException
*/
public function execute($type, $defaultModule)
{
// 实例化路由，并执行对应方法
$routeDriver = $this->routeDriver($type);
$this->router = (new Router($routeDriver, $defaultModule))->handler();
$data = $this->runAction();
return $data;
}
/**
* 调用对应方法
* @return mixed
* @throws \ReflectionException
*/
private function runAction()
{
$userDecorators = Register::get('Config')->get('decorator');
$systemDecorators = [InitDecorator::class];
$decorators = array_merge($systemDecorators, $userDecorators);
foreach ($decorators as $key => $value) {
$this->decorator(new $value());
}
$this->beforeRoute();
$ctrl = $this->router->class;
$action = $this->router->action;
$params = $this->router->params;
$object = new $ctrl();
$reflectionClass = new \ReflectionClass($ctrl);
if ($reflectionClass->hasMethod('_init')) {
$data = $object->_init();
}
if (!isset($data)) {
$reflectionMethod = new \ReflectionMethod($ctrl, $action);
$data = $reflectionMethod->invokeArgs($object, $params);
}
$this->afterRoute($data);
return $data; return $data;
} }

77
framework/library/http/Response.php Normal file
View File

@ -0,0 +1,77 @@
<?php
namespace top\library\http;
use top\library\http\response\ResponseData;
/**
* 响应类
* Class Response
* @package top\library\http
*/
class Response
{
/**
* 当前类实例
* @var null
*/
private static $instance = null;
/**
* 响应内容
* @var null
*/
private $content = null;
/**
* 响应头
* @var array
*/
private $header = [];
private function __construct()
{
}
private function __clone()
{
}
/**
* 获取当前类单例
* @return null|Response
*/
public static function instance()
{
if (!self::$instance) {
self::$instance = new self();
}
return self::$instance;
}
/**
* 设置Header
* @param array $header
* @return $this
*/
public function header($header = [])
{
return $this;
}
/**
* 返回内容
* @param $data
* @return false|int|null|string
*/
public function dispatch($data)
{
// 处理响应数据，并返回
$responseData = new ResponseData($data);
$this->content = $responseData->dispatch();
return $this->content;
}
}

71
framework/library/http/response/ResponseData.php Normal file
View File

@ -0,0 +1,71 @@
<?php
namespace top\library\http\response;
use top\blocks\Json;
use top\library\Register;
/**
* 处理响应数据
* Class FormatResponse
* @package top\library\http
*/
class ResponseData
{
use Json;
/**
* 执行程序后返回的实际数据
* @var false|int|null|string
*/
public $data = null;
public function __construct($data)
{
if (DEBUG === false) {
ob_clean();
}
$this->data = $this->checkData($data);
}
/**
* 检查并处理数据
* @param $data
* @return false|int|null|string
*/
private function checkData($data)
{
$responseData = null;
if (is_array($data)) {
if (request()->isAjax()) {
$responseData = $this->returnJson($data);
} else {
$view = Register::get('View');
$filename = request()->controller() . '/' . request()->method();
$responseData = $view->fetch($filename, $data);
unset($filename);
}
} elseif (is_bool($data)) {
if ($data) {
$responseData = 1;
} else {
$responseData = 0;
}
} else if (is_object($data)) {
$responseData = '[OBJECT]';
} else {
// 否则数据作为字符串处理
$responseData = $data;
}
return $responseData;
}
/**
* 返回处理后的数据
* @return false|int|null|string
*/
public function dispatch()
{
return $this->data;
}
}

12
framework/library/route/Pathinfo.php
View File

@ -36,7 +36,7 @@ class Pathinfo implements RouteIfs
public $action = ''; public $action = '';
// 参数 // 参数
public $param = []; public $params = [];
// 类名 // 类名
public $class = ''; public $class = '';
@ -84,7 +84,7 @@ class Pathinfo implements RouteIfs
* @return array * @return array
* @throws \ReflectionException * @throws \ReflectionException
*/ */
public function param() public function params()
{ {
unset($this->uriArray[0], $this->uriArray[1], $this->uriArray[2]); unset($this->uriArray[0], $this->uriArray[1], $this->uriArray[2]);
$this->uriArray = array_merge($this->uriArray, []); $this->uriArray = array_merge($this->uriArray, []);
@ -94,17 +94,17 @@ class Pathinfo implements RouteIfs
for ($i = 0; $i < count($paramName); $i++) { for ($i = 0; $i < count($paramName); $i++) {
$paramNameArray[$paramName[$i]->name] = ''; $paramNameArray[$paramName[$i]->name] = '';
} }
$param = []; $params = [];
for ($i = 0; $i < count($this->uriArray); $i = $i + 2) { for ($i = 0; $i < count($this->uriArray); $i = $i + 2) {
if (isset($this->uriArray[$i + 1]) && $this->uriArray[$i + 1] != '') { if (isset($this->uriArray[$i + 1]) && $this->uriArray[$i + 1] != '') {
$_GET[$this->uriArray[$i]] = $this->uriArray[$i + 1]; $_GET[$this->uriArray[$i]] = $this->uriArray[$i + 1];
if (isset($paramNameArray[$this->uriArray[$i]])) { if (isset($paramNameArray[$this->uriArray[$i]])) {
$param[$this->uriArray[$i]] = $this->uriArray[$i + 1]; $params[$this->uriArray[$i]] = $this->uriArray[$i + 1];
} }
} }
} }
unset($paramName, $paramNameArray); unset($paramName, $paramNameArray);
return $param; return $params;
} }
return []; return [];
} }
@ -173,7 +173,7 @@ class Pathinfo implements RouteIfs
$this->ctrl = $this->ctrl(); $this->ctrl = $this->ctrl();
$this->class = '\\' . APP_NS . '\\' . $this->module . '\\controller\\' . $this->ctrl; $this->class = '\\' . APP_NS . '\\' . $this->module . '\\controller\\' . $this->ctrl;
$this->action = $this->action(); $this->action = $this->action();
$this->param = $this->param(); $this->params = $this->params();
unset($this->uriArray); unset($this->uriArray);
} }
} }

2
framework/library/route/ifs/RouteIfs.php
View File

@ -32,5 +32,5 @@ interface RouteIfs
/** /**
* 解析参数 * 解析参数
*/ */
public function param(); public function params();
} }

2
framework/library/template/driver/tags/Tags.php
View File

@ -156,7 +156,7 @@ class Tags
$this->setTags($this->selfTags); $this->setTags($this->selfTags);
// 加载自定义模板标签 // 加载自定义模板标签
// 文件位置固定 // 文件位置固定
$tagsFile = APP_PATH . Register::get('Router')->module . '/config/tags.php'; $tagsFile = APP_PATH . request()->module() . '/config/tags.php';
if (file_exists($tagsFile)) { if (file_exists($tagsFile)) {
$tags = require $tagsFile; $tags = require $tagsFile;
$this->setTags($tags); $this->setTags($tags);

2
public/index.php
View File

@ -33,6 +33,4 @@ require '../framework/Framework.php';
// Framework::runType(1); // Framework::runType(1);
Framework::appPath('../application/'); Framework::appPath('../application/');
// 执行程序
Framework::startApp(); Framework::startApp();

4
public/runtime/compile/application/home/8b6903ea105d9a35bb03114244786eb8.php
View File

@ -3,9 +3,9 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Title</title> <title>Title</title>
<script src="https://libs.baidu.com/jquery/1.11.1/jquery.min.js"></script> <script src="/resource/jquery.min.js"></script>
</head> </head>
<body> <body>
<h1>Hello</h1> <?php $i = 0; foreach ($lists as $value): $i++; echo $value->name; endforeach; ?> <h1>Hello</h1> <?php $i = 0; foreach ($lists as $value): $i++; echo $value; endforeach; ?>
</body> </body>
</html> </html>

13
public/runtime/compile/application/home/db8e1fab73a5242fff69f47577172ec2.php Normal file
View File

@ -0,0 +1,13 @@
<?php /* topnuomi */ (!defined('APP_PATH')) && exit(0); ?><!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Document</title>
</head>
<body>
</body>
</html>