diff --git a/framework/Framework.php b/framework/Framework.php index 19b2350..015777c 100644 --- a/framework/Framework.php +++ b/framework/Framework.php @@ -2,7 +2,10 @@ namespace top; -use top\library\App; +use top\library\Application; + +// 定义简写文件分割符号常量 +!defined('DS') && define('DS', DIRECTORY_SEPARATOR); /** * 框架入口 @@ -18,31 +21,32 @@ class Framework /** * 框架入口 * @param string $callable + * @param array $namespaceMap */ - public static function startApp($callable = '') + public static function startApp($callable = '', $namespaceMap = []) { - if (is_callable($callable)) { - $callable(self::class); - } + (is_callable($callable)) && $callable(self::class); // 指定时区 date_default_timezone_set('PRC'); - self::debug(); // 强制在入口文件指定应用目录 if (defined('APP_PATH')) { + self::debug(); // self::appPath(); + self::bindModule(); self::appNameSpace(); self::resourcePath(); self::frameworkPath(); self::sessionPath(); - require 'library/App.php'; - App::run(); - } else { - echo '请使用Framework::appPath()指定应用目录'; - } + // 配置文件目录 + !defined('CONFIG_DIR') && define('CONFIG_DIR', APP_PATH . BIND_MODULE . DS . 'config' . DS); + + require 'library/Application.php'; + Application::run($namespaceMap); + } else echo '请使用Framework::appPath()指定应用目录'; } /** @@ -52,10 +56,8 @@ class Framework public static function appPath($path = '') { if (!defined('APP_PATH')) { - if (!$path) { - $path = './application/'; - } - define('APP_PATH', $path); + (!$path) && $path = '.' . DS . 'application' . DS; + define('APP_PATH', str_replace('/', DS, $path)); } } @@ -65,8 +67,18 @@ class Framework */ public static function debug($status = false) { - if (!defined('DEBUG')) { - define('DEBUG', $status); + (!defined('DEBUG')) && define('DEBUG', $status); + } + + /** + * 绑定模块 + * @param string $module + */ + public static function bindModule($module = '') + { + if (!defined('BIND_MODULE')) { + (!$module) && $module = 'home'; + define('BIND_MODULE', $module); } } @@ -77,19 +89,19 @@ class Framework public static function frameworkPath($path = '') { if (!defined('FRAMEWORK_PATH')) { - if (!$path) { - $path = __DIR__ . '/'; - } - define('FRAMEWORK_PATH', $path); + (!$path) && $path = __DIR__ . DS; + define('FRAMEWORK_PATH', str_replace('/', DS, $path)); } } + /** + * 应用命名空间 + * @param string $namespace + */ public static function appNameSpace($namespace = '') { if (!defined('APP_NS')) { - if (!$namespace) { - $namespace = 'app'; - } + (!$namespace) && $namespace = 'app'; define('APP_NS', $namespace); } } @@ -105,9 +117,9 @@ class Framework $scriptName = $_SERVER['SCRIPT_NAME']; $pos = strrpos($scriptName, '/'); $root = substr($scriptName, 0, $pos + 1); - $path = $root . 'resource/'; + $path = $root . 'resource' . DS; } - define('RESOURCE', $path); + define('RESOURCE', str_replace('/', DS, $path)); } } @@ -118,13 +130,9 @@ class Framework public static function sessionPath($path = '') { if (!defined('SESSION_PATH')) { - if (!$path) { - $path = './runtime/session/'; - } - if (!is_dir($path)) { - mkdir($path, 0755, true); - } - define('SESSION_PATH', $path); + (!$path) && $path = '.' . DS . 'runtime' . DS . 'session' . DS; + (!is_dir($path)) && mkdir($path, 0755, true); + define('SESSION_PATH', str_replace('/', DS, $path)); } } diff --git a/framework/config/config.php b/framework/config/config.php index 4820e82..077a97b 100644 --- a/framework/config/config.php +++ b/framework/config/config.php @@ -2,11 +2,15 @@ // 默认配置 return [ + 'default_controller' => 'Index', + 'default_method' => 'index', + 'compel_route' => false, + 'complete_parameter' => true, 'register' => [ 'Top' => \top\library\template\driver\Top::class, ], 'middleware' => [ - \top\middleware\Init::class, + \top\middleware\Action::class, \top\middleware\View::class, ], 'session' => [ diff --git a/framework/create/create.php b/framework/create/create.php index 338dc5c..14fe234 100644 --- a/framework/create/create.php +++ b/framework/create/create.php @@ -14,10 +14,10 @@ class Create private $name = ''; /** - * 命名空间 + * 应用目录 * @var string */ - private $namespace = ''; + private $path = ''; /** * 入口文件名 @@ -43,15 +43,15 @@ class Create */ private $projectPath; - public function __construct($start, $namespace, $name) + public function __construct($start, $path, $name) { $this->name = $name; - $this->dir = __DIR__ . '/'; - $this->namespace = $namespace; - $this->base = $this->dir . '../../'; + $this->dir = __DIR__ . DIRECTORY_SEPARATOR; + $this->path = $path; + $this->base = $this->dir . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR; if ($start) - $this->start = $this->base . $start . '.php'; - $this->projectPath = $this->base . $this->namespace . '/' . $this->name . '/'; + $this->start = $this->base . $start; + $this->projectPath = $this->base . $this->path . DIRECTORY_SEPARATOR . $this->name . DIRECTORY_SEPARATOR; $this->create(); } @@ -63,10 +63,8 @@ class Create public function replaceContent($content) { return str_replace([ - '{namespace}', '{name}' ], [ - $this->namespace, $this->name ], $content); } @@ -78,7 +76,7 @@ class Create public function createStartFile() { if ($this->start && !is_file($this->start)) { - $content = file_get_contents($this->dir . 'tpl/index.tpl'); + $content = file_get_contents($this->dir . 'tpl' . DIRECTORY_SEPARATOR . 'index.tpl'); $content = $this->replaceContent($content); if (file_put_contents($this->start, $content)) { return true; @@ -93,15 +91,14 @@ class Create */ public function createConfig() { - $configPath = $this->projectPath . 'config/'; + $configPath = $this->projectPath . 'config' . DIRECTORY_SEPARATOR; $configFile = $configPath . 'config.php'; if (!is_dir($configPath)) { mkdir($configPath, 0755, true); } if (!is_file($configFile)) { - $content = file_get_contents($this->dir . 'tpl/config/config.tpl'); + $content = file_get_contents($this->dir . 'tpl' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'config.tpl'); $content = $this->replaceContent($content); - $realConfigFile = $this->base . '/' . $this->namespace . '/' . $this->name . '/config/config.php'; if (!file_put_contents($configPath . 'config.php', $content)) { exit('error -2'); } @@ -111,7 +108,7 @@ class Create /** * 创建MVC目录及文件 */ - public function createMVC() + public function createControllerAndView() { $dirArray = [ 'controller', @@ -119,33 +116,25 @@ class Create 'view' ]; for ($i = 0; $i < count($dirArray); $i++) { - if (!is_dir($this->projectPath . $dirArray[$i] . '/')) { - mkdir($this->projectPath . $dirArray[$i] . '/', 0755, true); + if (!is_dir($this->projectPath . $dirArray[$i] . DIRECTORY_SEPARATOR)) { + mkdir($this->projectPath . $dirArray[$i] . DIRECTORY_SEPARATOR, 0755, true); } } - $controllerFile = $this->projectPath . 'controller/index.php'; + $controllerFile = $this->projectPath . 'controller' . DIRECTORY_SEPARATOR . 'index.php'; if (!is_file($controllerFile)) { - $content = file_get_contents($this->dir . 'tpl/controller/index.tpl'); + $content = file_get_contents($this->dir . 'tpl' . DIRECTORY_SEPARATOR . 'controller' . DIRECTORY_SEPARATOR . 'index.tpl'); $content = $this->replaceContent($content); - if (!file_put_contents($this->projectPath . 'controller/Index.php', $content)) { + if (!file_put_contents($this->projectPath . 'controller' . DIRECTORY_SEPARATOR . 'Index.php', $content)) { exit('error -4'); } } - $modelFile = $this->projectPath . 'model/demo.php'; - if (!is_file($modelFile)) { - $content = file_get_contents($this->dir . 'tpl/model/demo.tpl'); - $content = $this->replaceContent($content); - if (!file_put_contents($this->projectPath . 'model/Demo.php', $content)) { - exit('error -5'); - } - } - $viewFile = $this->projectPath . 'view/index/index.html'; + $viewFile = $this->projectPath . 'view' . DIRECTORY_SEPARATOR . 'index' . DIRECTORY_SEPARATOR . 'index.html'; if (!is_file($viewFile)) { - $content = file_get_contents($this->dir . 'tpl/view/index.tpl'); - if (!is_dir($this->projectPath . 'view/Index/')) { - mkdir($this->projectPath . 'view/Index/', 0755, true); + $content = file_get_contents($this->dir . 'tpl' . DIRECTORY_SEPARATOR . 'view' . DIRECTORY_SEPARATOR . 'index.tpl'); + if (!is_dir($this->projectPath . 'view' . DIRECTORY_SEPARATOR . 'Index' . DIRECTORY_SEPARATOR)) { + mkdir($this->projectPath . 'view' . DIRECTORY_SEPARATOR . 'Index' . DIRECTORY_SEPARATOR, 0755, true); } - if (!file_put_contents($this->projectPath . 'view/Index/index.html', $content)) { + if (!file_put_contents($this->projectPath . 'view' . DIRECTORY_SEPARATOR . 'Index' . DIRECTORY_SEPARATOR . 'index.html', $content)) { exit('error -6'); } } @@ -164,19 +153,6 @@ class Create } } - /** - * 创建路由文件 - */ - public function createRoute() - { - $file = $this->projectPath . '../route.php'; - if (!is_file($file)) { - if (!file_put_contents($file, file_get_contents($this->dir . 'tpl/route.tpl'))) { - exit('-8'); - } - } - } - /** * 执行创建操作 */ @@ -184,14 +160,13 @@ class Create { $this->createStartFile(); $this->createConfig(); - $this->createMVC(); + $this->createControllerAndView(); $this->createFunctions(); - $this->createRoute(); } } // 准备创建项目 -$namespace = (isset($argv[1]) && $argv[1]) ? $argv[1] : exit('please type namespace~'); +$path = (isset($argv[1]) && $argv[1]) ? $argv[1] : exit('please type path~'); $projectName = (isset($argv[2]) && $argv[2]) ? $argv[2] : exit('please type project name~'); $startFile = (isset($argv[3]) && $argv[3]) ? $argv[3] : false; -new Create($startFile, $namespace, $projectName); +new Create($startFile, $path, $projectName); diff --git a/framework/create/tpl/controller/index.tpl b/framework/create/tpl/controller/index.tpl index c595a95..1f0c4e0 100644 --- a/framework/create/tpl/controller/index.tpl +++ b/framework/create/tpl/controller/index.tpl @@ -2,16 +2,29 @@ namespace app\{name}\controller; -use app\{name}\model\Demo; +use top\library\Controller; +use top\library\http\Request; -class Index +class Index extends Controller { - public function index() + + /** + * 首页 + * @route / + * + * @param Request $request + * @return array + */ + public function index(Request $request) { - $model = model(Demo::class); + $uri = $request->uri(); + (!$uri) && $this->redirect('index'); return [ - 'hello' => $model->get() + 'uri' => $uri, + 'controller' => $request->controllerFullName(), + 'method' => $request->method(), ]; } } + diff --git a/framework/create/tpl/index.tpl b/framework/create/tpl/index.tpl index 961dd3b..da4a2f1 100644 --- a/framework/create/tpl/index.tpl +++ b/framework/create/tpl/index.tpl @@ -30,13 +30,6 @@ require '../framework/Framework.php'; // Framework::resourcePath('/resource/'); // 可使用常量RESOURCE取得该值 -// 当前入口文件默认模块，缺省值：home -// Framework::defaultModule('home'); - -// 路由模式，缺省值：1（pathinfo和兼容模式） -// Framework::runType(1); - Framework::appPath('../application/'); - -// 执行程序 +Framework::bindModule('{name}'); Framework::startApp(); diff --git a/framework/create/tpl/model/demo.tpl b/framework/create/tpl/model/demo.tpl deleted file mode 100644 index 3e1c316..0000000 --- a/framework/create/tpl/model/demo.tpl +++ /dev/null @@ -1,11 +0,0 @@ - [ - null, - 'home/example/login' - ], - 'example-detail' => [ - '[id]', - 'home/example/detail' - ], - 'example' => [ - '[:type]', - 'home/example/index' - ], -]; \ No newline at end of file diff --git a/framework/create/tpl/view/index.tpl b/framework/create/tpl/view/index.tpl index a3b3c03..e838aa1 100644 --- a/framework/create/tpl/view/index.tpl +++ b/framework/create/tpl/view/index.tpl @@ -9,23 +9,16 @@ -

{$hello}

+

Welcome！

+ +

URI: {$uri}

+

Controller: {$controller}

+

Method: {$method}

+
{:top\library\Loader::getFileNumber()} files loaded.
-

TOP-Framework

\ No newline at end of file diff --git a/framework/library/Annotation.php b/framework/library/Annotation.php new file mode 100644 index 0000000..9e18a87 --- /dev/null +++ b/framework/library/Annotation.php @@ -0,0 +1,86 @@ +getMethod($methodName)->getDocComment(); + } else { + $doc = $reflectionClass->getDocComment(); + } + self::$annotations[$ident] = $self->parseAnnotation($doc); + } + return ($annotation) ? self::$annotations[$ident][$annotation] : self::$annotations[$ident]; + } + + /** + * 解析出注解 + * @param $doc + * @return array + */ + private function parseAnnotation($doc) + { + $result = []; + preg_match_all('/@([a-zA-Z]+)\s(.*)/', $doc, $matches); + if (!empty($matches)) { + for ($i = 0; $i < count($matches[0]); $i++) + $result[$matches[1][$i]] = trim($matches[2][$i]); + } + $matches = null; + return $result; + } +} diff --git a/framework/library/App.php b/framework/library/App.php deleted file mode 100644 index 053f617..0000000 --- a/framework/library/App.php +++ /dev/null @@ -1,117 +0,0 @@ -set('top', FRAMEWORK_PATH); - $loader->set(APP_NS, APP_PATH); - $loader->register(); - - // composer自动加载 - $composerLoadFile = FRAMEWORK_PATH . 'vendor/autoload.php'; - if (file_exists($composerLoadFile)) { - require $composerLoadFile; - } - - // 使用whoops美化异常输出 - // $whoops = new \Whoops\Run; - // $whoops->pushHandler(new \Whoops\Handler\PrettyPageHandler); - // $whoops->register(); - - if (PHP_VERSION > 5.6) { - set_error_handler([new BaseError(), 'handler']); - } - set_exception_handler([new BaseException(), 'handler']); - - $router = self::initRoute(); - $request = Request::instance()->setRoute($router); - $response = Response::instance(); - - // 加载必要文件 - self::loadFiles(); - - // 处理请求并得到数据 - $responseData = $response->header([ - 'X-Powered-By: TOP-Framework' - ])->dispatch($request->execute()); - - // 输出内容 - echo $responseData->content; - - } - - /** - * 初始化路由 - * @return Router - */ - private static function initRoute() - { - $driver = null; - if (Request::instance()->isCLI()) { - // 命令行运行程序 - $driver = new Command(); - } else { - $driver = new Compatible(); - } - return (new Router($driver))->handler(); - } - - /** - * 加载必要文件 - */ - private static function loadFiles() - { - // 加载系统函数库 - require FRAMEWORK_PATH . 'library/functions/functions.php'; - - // 加载用户函数库 - $funcFile = APP_PATH . request()->module() . '/functions.php'; - if (file_exists($funcFile)) { - require $funcFile; - } - - $configInstance = Config::instance(); - - $sessionConfig = $configInstance->get('session'); - if (!empty($sessionConfig) && $sessionConfig['open'] === true) { - session_save_path(SESSION_PATH); - session_start(); - } - - // 数据库驱动 - $config = $configInstance->get('db'); - $driver = $config['driver'] ? $config['driver'] : 'MySQLi'; - Register::set('DBDriver', function () use ($driver) { - $class = '\\top\\library\\database\\driver\\' . $driver; - return $class::instance(); - }); - - // 配置文件中配置的注册 - $initRegister = $configInstance->get('register'); - if (!empty($initRegister)) { - foreach ($initRegister as $key => $value) { - Register::set($key, function () use ($value) { - return $value::instance(); - }); - } - } - } -} diff --git a/framework/library/Application.php b/framework/library/Application.php new file mode 100644 index 0000000..6463ea8 --- /dev/null +++ b/framework/library/Application.php @@ -0,0 +1,178 @@ +set('top', FRAMEWORK_PATH); + $loader->set(APP_NS, APP_PATH); + foreach ($namespaceMap as $prefix => $path) { + $loader->set($prefix, $path); + } + $loader->register(); + + // composer自动加载 + $composerLoadFile = FRAMEWORK_PATH . 'vendor/autoload.php'; + (is_file($composerLoadFile)) && require $composerLoadFile; + + // 使用whoops美化异常输出 + // $whoops = new \Whoops\Run; + // $whoops->pushHandler(new \Whoops\Handler\PrettyPageHandler); + // $whoops->register(); + + (PHP_VERSION > 5.6) && set_error_handler([new BaseError(), 'handler']); + set_exception_handler([new BaseException(), 'handler']); + + // 加载必要文件 + self::loadFiles(); + + // 初始化路由实例 + $router = Router::instance(Request::instance()); + + // 处理请求并得到数据 + $responseData = Response::instance()->header([ + 'X-Powered-By: TOP-Framework' + ])->send($router->execute()); + + // 输出响应内容 + echo $responseData->content; + } + + /** + * 加载必要文件 + */ + private static function loadFiles() + { + // 加载系统函数库 + require FRAMEWORK_PATH . 'library' . DS . 'functions' . DS . 'functions.php'; + + // 加载用户函数库 + $funcFile = APP_PATH . BIND_MODULE . DS . 'functions.php'; + (is_file($funcFile)) && require $funcFile; + + $configInstance = Config::instance(); + + $sessionConfig = $configInstance->get('session'); + if (!empty($sessionConfig) && $sessionConfig['open'] === true) { + session_save_path(SESSION_PATH); + session_start(); + } + + // 数据库驱动 + $config = $configInstance->get('db'); + $driver = $config['driver'] ? $config['driver'] : 'MySQLi'; + Register::set('DBDriver', function () use ($driver) { + $class = '\\top\\library\\database\\driver\\' . $driver; + return $class::instance(); + }); + + // 配置文件中配置的注册 + $initRegister = $configInstance->get('register'); + if (!empty($initRegister)) { + foreach ($initRegister as $key => $value) { + Register::set($key, function () use ($value) { + return $value::instance(); + }); + } + } + } + + /** + * 获取一个类反射 + * @param $className + * @return mixed + */ + public static function getReflectionClass($className) + { + if (!isset(self::$reflectionClass[$className])) { + try { + self::$reflectionClass[$className] = new \ReflectionClass($className); + } catch (\ReflectionException $exception) { + } + } + return self::$reflectionClass[$className]; + } + + /** + * 获取一个类方法反射 + * @param $className + * @param $methodName + * @return mixed + */ + public static function getReflectionMethod($className, $methodName) + { + $ident = md5($className . $methodName); + if (!isset(self::$reflectionMethod[$ident])) { + try { + self::$reflectionMethod[$ident] = new \ReflectionMethod($className, $methodName); + } catch (\ReflectionException $exception) { + } + } + return self::$reflectionMethod[$ident]; + } + + /** + * 获取一个类实例 + * @param $className + * @return mixed + * @throws \ReflectionException + */ + public static function getInstance($className) + { + $classRef = self::getReflectionClass($className); + $isInstantiable = $classRef->isInstantiable(); + if (!$isInstantiable) { // 不可被实例化 + if ($classRef->hasMethod('instance')) { + $instance = $classRef->getMethod('instance'); + } else throw new \Exception('不可实例化的类：' . $className); + } else { + $instance = $classRef->getConstructor(); + } + + if (!is_null($instance)) { + $instanceParams = $instance->getParameters(); + if (empty($instanceParams)) { // 构造函数没有参数直接返回当前类实例 + if (!$isInstantiable) return $className::instance(); + return new $className; + } + } else { // 没有构造方法直接返回实例 + if (!$isInstantiable) return $className::instance(); + return new $className; + } + + // 构造函数存在参数则去递归实例化类 + $actualParams = []; + foreach ($instanceParams as $param) { + $actualClass = $param->getClass(); + if (!is_null($actualClass)) { // 参数是一个类 + $actualParams[$param->name] = self::getInstance($actualClass->name); + } + } + + if ($isInstantiable) { + return $classRef->newInstanceArgs($actualParams); + } else { + $reflectionMethod = new \ReflectionMethod($className, 'instance'); + return $reflectionMethod->invokeArgs(null, $actualParams); + } + } + +} diff --git a/framework/library/Config.php b/framework/library/Config.php index b7633b2..c9b6479 100644 --- a/framework/library/Config.php +++ b/framework/library/Config.php @@ -2,7 +2,6 @@ namespace top\library; -use top\library\http\Request; use top\traits\Instance; /** @@ -20,6 +19,9 @@ class Config // 保存配置的变量 private $config = []; + /** + * Config constructor. + */ private function __construct() { // 加载默认配置文件 @@ -52,16 +54,15 @@ class Config public function get($name = '') { // 加载用户配置文件 - $module = Request::instance()->module(); - $file = APP_PATH . $module . '/config/config.php'; + $file = CONFIG_DIR . 'config.php'; if (!isset(self::$files[$file])) { if (file_exists($file)) { $config = require $file; if (is_array($config) && !empty($config)) { // 合并配置项 foreach ($config as $key => $value) { - if (array_key_exists($key, $this->config)) { - $this->config[$key] = array_merge($this->config[$key], $config[$key]); + if (array_key_exists($key, $this->config) && is_array($value)) { + $this->config[$key] = array_merge($this->config[$key], $value); } else { $this->config[$key] = $value; } @@ -87,8 +88,9 @@ class Config * 从配置中删除某项 * @param string $name */ - public function _unset($name) + public function rm($name) { + $this->config[$name] = null; unset($this->config[$name]); } } diff --git a/framework/library/Controller.php b/framework/library/Controller.php index a5110a6..84053c2 100644 --- a/framework/library/Controller.php +++ b/framework/library/Controller.php @@ -2,6 +2,7 @@ namespace top\library; +use top\library\http\Request; use top\traits\Json; /** @@ -13,8 +14,47 @@ abstract class Controller use Json; - public function __construct() + /** + * 请求类实例 + * @var Request + */ + protected $request = null; + + /** + * URI + * @var string + */ + protected $uri = null; + + /** + * 控制器 + * @var string + */ + protected $controller = null; + + /** + * 控制器全限定名 + * @var string + */ + protected $controllerFullName = null; + + /** + * 方法 + * @var string + */ + protected $method = null; + + /** + * 控制器基类构造方法 + * @param Request $request + */ + public function __construct(Request $request) { + $this->request = $request; + $this->uri = $request->uri(); + $this->controller = $request->controller(); + $this->controllerFullName = $request->controllerFullName(); + $this->method = $request->method(); } /** diff --git a/framework/library/Loader.php b/framework/library/Loader.php index 73fb402..772a746 100644 --- a/framework/library/Loader.php +++ b/framework/library/Loader.php @@ -7,6 +7,8 @@ class Loader private $prefixes = []; + private static $number = 0; + /** * 注册自动加载 */ @@ -74,12 +76,22 @@ class Loader /*echo '
'; echo $file . '
';*/ // 如果文件存在则加载文件 - if (file_exists($file)) { + if (is_file($file)) { require $file; + self::$number++; return true; } } } return false; } + + /** + * 内置自动加载器加载的文件数 + * @return int + */ + public static function getFileNumber() + { + return self::$number; + } } diff --git a/framework/library/Model.php b/framework/library/Model.php index e1acadb..bf3ac4b 100644 --- a/framework/library/Model.php +++ b/framework/library/Model.php @@ -2,6 +2,7 @@ namespace top\library; +use Exception; use top\library\exception\DatabaseException; /** @@ -98,12 +99,14 @@ class Model return Database::table($this->table, $this->pk, $this->prefix); } + // 可以静态调用的方法--开始 + /** * 影响的表（仅多表delete） * @param $effect * @return $this */ - public function effect($effect) + private function effect($effect) { $this->getDb()->effect($effect); return $this; @@ -114,7 +117,7 @@ class Model * @param $field * @return $this */ - public function distinct($field) + private function distinct($field) { $this->getDb()->distinct($field); return $this; @@ -125,7 +128,7 @@ class Model * @param $field * @return $this */ - public function field($field) + private function field($field) { $this->getDb()->field($field); return $this; @@ -135,7 +138,7 @@ class Model * 查询条件 * @return $this */ - public function where() + private function where() { call_user_func_array([ $this->getDb(), @@ -148,7 +151,7 @@ class Model * 排序 * @return $this */ - public function order() + private function order() { call_user_func_array([ $this->getDb(), @@ -161,7 +164,7 @@ class Model * 限制 * @return $this */ - public function limit() + private function limit() { call_user_func_array([ $this->getDb(), @@ -177,7 +180,7 @@ class Model * @param $name * @return $this */ - public function join($type, $table, $name) + private function join($type, $table, $name) { $this->getDb()->join($type, $table, $name); return $this; @@ -188,12 +191,14 @@ class Model * @param $on * @return $this */ - public function on($on) + private function on($on) { $this->getDb()->on($on); return $this; } + // 可静态调用的方法--结束 + /** * 插入记录 * @param array $data @@ -630,4 +635,37 @@ class Model return $data; } + /** + * 非静态调用连贯操作 + * @param string $name + * @param array $arguments + * @return mixed + */ + public function __call($name, $arguments) + { + if (method_exists($this, $name)) { + return $this->{$name}($arguments); + } else throw new Exception('不存在的方法：' . $name); + } + + /** + * 静态调用连贯操作 + * @param string $name + * @param array $arguments + * @return mixed + */ + public static function __callStatic($name, $arguments) + { + $methodName = null; + if (method_exists(static::class, $name)) { + $methodName = $name; + } else { + $methodMap = ['all' => 'select', 'get' => 'find']; + if (isset($methodMap[$name])) { + $methodName = $methodMap[$name]; + } else throw new Exception('不存在的方法：' . $name); + } + return call_user_func_array([new static, $methodName], $arguments); + } + } diff --git a/framework/library/Router.php b/framework/library/Router.php index f4e136d..7e18faf 100644 --- a/framework/library/Router.php +++ b/framework/library/Router.php @@ -3,8 +3,9 @@ namespace top\library; use top\library\exception\RouteException; -use top\library\route\ifs\RouteIfs; +use top\library\http\Request; use top\middleware\ifs\MiddlewareIfs; +use top\traits\Instance; /** * 路由类 @@ -12,32 +13,58 @@ use top\middleware\ifs\MiddlewareIfs; */ class Router { - /** - * 路由实现 - * @var RouteIfs - */ - private $driver; + + use Instance; /** - * 自定义路由标识 - * @var null - */ - private $ident = null; - - /** - * 自定义路由规则 + * 路由配置 * @var array */ - private $rule = []; + private $config = []; /** - * 实例化时注入具体路由实现和默认位置 - * Router constructor. - * @param RouteIfs $driver + * 请求类 + * @var null */ - public function __construct(RouteIfs $driver) + private $request = null; + + /** + * 类全限定名 + * @var null + */ + private $controllerFullName = null; + + /** + * 类名 + * @var null + */ + private $controller = null; + + /** + * 方法 + * @var null + */ + private $method = null; + + /** + * 参数 + * @var array + */ + private $params = []; + + /** + * 当前加载的路由 + * @var null + */ + private $loadRuleParameters = null; + + /** + * Router constructor. + * @param Request $request + */ + private function __construct(Request $request) { - $this->driver = $driver; + $this->request = $request; } /** @@ -46,7 +73,7 @@ class Router */ public function controllerFullName() { - return $this->driver->controllerFullName(); + return $this->controllerFullName; } /** @@ -55,7 +82,7 @@ class Router */ public function controller() { - return $this->driver->controller(); + return $this->controller; } /** @@ -64,7 +91,7 @@ class Router */ public function module() { - return $this->driver->module(); + return BIND_MODULE; } /** @@ -73,7 +100,7 @@ class Router */ public function method() { - return $this->driver->method(); + return $this->method; } /** @@ -82,117 +109,327 @@ class Router */ public function params() { - return $this->driver->params(); + return $this->params; } /** - * 获取当前的URI + * 查找最适合的路由匹配 + * @param $rules + * @param $uri + * @return mixed + */ + private function findRule($rules, $uri) + { + $result = []; + if ($uri == '/' && isset($rules['/'])) { + $result[] = '/'; + } else { + // 如果不是首页则unset掉首页的规则，避免参与计算导致出错 + unset($rules['/']); + $keys = array_keys($rules); + foreach ($keys as $key) { + $pos = strpos($uri, $key); + if ($pos !== false) { + $endPos = $pos + strlen($key); + $result[$endPos] = $key; + } + } + } + if (!empty($result)) { + $max = max(array_keys($result)); + $rest = str_replace($result[$max], '', $uri); + if (($result[$max] == '/' && $uri != '/') || ($rest != '' && substr($rest, 0, 1) != '/')) { + return false; + } else { + $this->loadRuleParameters = $rules[$result[$max]]; + return [ + 'rule' => $result[$max], + 'parameters' => $this->loadRuleParameters, + ]; + } + } + return false; + } + + /** + * 解析路由规则 + * @param $requestMethod + * @param $uri + * @return array|bool|mixed + */ + private function parseRouteRule($requestMethod, $uri) + { + // 获取所有路由配置（可能从缓存文件读取） + $routeConfig = $this->getRouteConfig(); + + $rule = []; + if (isset($routeConfig[$requestMethod])) { // 第一次去当前请求方法中查找 + $rule = $this->findRule($routeConfig[$requestMethod], $uri); + } + if (empty($rule) && isset($routeConfig['any'])) { // 全部中查找 + $rule = $this->findRule($routeConfig['any'], $uri); + } + + return (!empty($rule)) ? $rule : false; + } + + /** + * 普通路由处理 + * @param $uri * @return array */ - public function uri() + private function parseRoute($uri) { - $uri = null; - if (isset($_SERVER['PATH_INFO'])) { - $uri = $_SERVER['PATH_INFO']; - } elseif (isset($_GET['s']) && $_GET['s']) { - $uri = $_GET['s']; - } - $uri = str_replace('.html', '', trim($uri, '/')); - return $uri; + // 普通处理 + $uriArray = explode('/', trim($uri, '/')); + $uriArray[0] = (isset($uriArray[0]) && $uriArray[0]) ? $uriArray[0] : config('default_controller'); + $uriArray[1] = (isset($uriArray[1]) && $uriArray[1]) ? $uriArray[1] : config('default_method'); + + $controller = ucfirst($uriArray[0]); + $rule['class'] = APP_NS . '\\' . BIND_MODULE . '\\controller\\' . $controller; + $rule['method'] = $uriArray[1]; + + return [ + 'rule' => $uriArray[0] . '/' . $uriArray[1], + 'parameters' => $rule, + ]; } /** - * 处理用户自定义路由规则 + * 解析请求参数 + * @param $class + * @param $method + * @param $prefix * @param $uri - * @return string - * @throws RouteException + * @return array */ - private function customRule($uri) + private function parseParameters($class, $method, $prefix, $uri) { - // 准备检查自定义路由 - $file = APP_PATH . 'route.php'; - if (is_file($file)) $this->rule = require $file; - $uriArray = explode('/', $uri); - $ident = $this->ident = $uriArray[0]; - // 如果标识存在，则准备替换URI - if (isset($this->rule[$ident])) { - $uri = $this->rule[$ident][0]; - $paramString = null; - // 如果存在参数 - if (isset($this->rule[$ident][1]) && $this->rule[$ident][1]) { - $param = (count($uriArray) > 1) ? array_slice($uriArray, 1) : []; - $paramNames = explode(',', $this->rule[$ident][1]); - for ($i = 0; $i < count($paramNames); $i++) { - if (substr($paramNames[$i], 0, 1) == '?') { // 可选参数 - if (isset($param[$i]) && $param[$i]) { // 如果按顺序存在参数，且值有效 - $paramString .= substr($paramNames[$i], 1) . '/' . $param[$i] . '/'; - } - } else { - if (isset($param[$i]) && $param[$i]) { - $paramString .= $paramNames[$i] . '/' . $param[$i] . '/'; - } else { - throw new RouteException('链接中缺少必须参数' . $paramNames[$i]); - } + $paramsString = ltrim(substr_replace($uri, '', 0, strlen($prefix)), '/'); + $paramsArray = explode('/', $paramsString); + + $params = []; + if (config('complete_parameter')) { // 如果开启了完全参数名 + for ($i = 0; $i < count($paramsArray); $i += 2) { + if (isset($paramsArray[$i + 1])) { + $_GET[$paramsArray[$i]] = $params[$paramsArray[$i]] = $paramsArray[$i + 1]; + } + } + } else { // 未开启完全参数名，则利用反射得到参数名做映射 + if (!empty($paramsArray)) { + $reflectionMethod = Application::getReflectionMethod($class, $method); + $index = 0; + foreach ($reflectionMethod->getParameters() as $parameter) { + $className = $parameter->getClass(); + if (is_null($className)) { + $_GET[$parameter->name] = $params[$parameter->name] = $paramsArray[$index]; + $index++; } } } - $uri .= '/' . rtrim($paramString, '/'); } - return $uri; + return $params; } /** - * 路由中间件 + * 执行应用 + * @return mixed + * @throws RouteException + */ + public function execute() + { + try { + // 处理路由 + $this->handler($this->request->uri()); + } catch (RouteException $exception) { + if (!DEBUG) { // 非调试模式直接404 + return \response()->notFound(); + } else throw $exception; + } + + // 将执行应用打包为一个$application + $application = function () { + // 执行控制器方法 + $object = Application::getInstance($this->controllerFullName); + $reflectionMethod = Application::getReflectionMethod($this->controllerFullName, $this->method); + $invokeParams = []; + foreach ($reflectionMethod->getParameters() as $parameter) { + $className = $parameter->getClass(); + if (!is_null($className)) { + $invokeParams[$parameter->name] = Application::getInstance($className->name); + } else { + if (isset($this->params[$parameter->name])) { + $invokeParams[$parameter->name] = $this->params[$parameter->name]; + } + } + } + + return $reflectionMethod->invokeArgs($object, $invokeParams); + }; + + // 路由中间件处理application + return $this->middleware($application); + } + + /** + * 中间件处理 * @param \Closure $application * @return mixed */ public function middleware(\Closure $application) { - // 不执行的中间件 + // 加载全局配置文件中配置的中间件 + $middleware = array_reverse(config('middleware')); + + // 配置中不执行的中间件 $exceptMiddlewareArray = []; - // 加载配置文件中配置的中间件 - $middlewareArray = Config::instance()->get('middleware'); - // 合并路由中配置的中间件、不执行的中间件 - if (isset($this->rule[$this->ident])) { - if (isset($this->rule[$this->ident][2]) && !empty(isset($this->rule[$this->ident][2]))) { - $middlewareArray = array_merge($middlewareArray, $this->rule[$this->ident][2]); - } - if (isset($this->rule[$this->ident][3]) && !empty(isset($this->rule[$this->ident][3]))) { - $exceptMiddlewareArray = $this->rule[$this->ident][3]; + if (isset($this->loadRuleParameters['except_middleware']) + && $this->loadRuleParameters['except_middleware'] != '' + ) { + $exceptMiddlewareArray = $this->loadRuleParameters['except_middleware']; + } + + // 配置中新增的中间件 + if (isset($this->loadRuleParameters['accept_middleware']) + && $this->loadRuleParameters['accept_middleware'] != '' + ) { + $acceptMiddlewareArray = $this->loadRuleParameters['accept_middleware']; + foreach ($acceptMiddlewareArray as $acceptMiddleware) { + if (!in_array($acceptMiddleware, $middleware)) { + $middleware[] = $acceptMiddleware; + } else continue; } } - $middleware = array_reverse($middlewareArray); + + // 应用打包在在洋葱圈最里层 $next = $application; foreach ($middleware as $value) { if (!in_array($value, $exceptMiddlewareArray)) { $next = function () use ($next, $value) { $middleware = new $value; if ($middleware instanceof MiddlewareIfs) { - return $middleware->handler($next); - } else { - throw new RouteException('中间件' . $value . '不属于MiddlewareIfs类型实例'); - } + return $middleware->handler($this->request, $next); + } else throw new RouteException('无效的中间件：' . $value); }; } } + return $next(); } /** * 处理URI - * @return $this + * @param $uri + * @throws RouteException */ - public function handler() + public function handler($uri) { - $uri = $this->uri(); - if ($uri) { - // 自定义路由规则 - $uri = $this->customRule($uri); + $uri = $uri ? $uri : '/'; + $defaultMethod = config('default_method'); + $requestMethod = strtolower($this->request->requestMethod()); + // 第一次用原始uri去做匹配，第二次带上默认方法去做匹配 + if (false === ($rule = $this->parseRouteRule($requestMethod, $uri)) + && false === ($rule = $this->parseRouteRule($requestMethod, $uri . '/' . $defaultMethod)) + ) { + // 如果开启强制路由，则抛异常 + if (config('compel_route') === true) { + throw new RouteException('不支持的路由规则：' . strtoupper($requestMethod) . ' ' . $uri); + } else { + // 进行普通处理 + $rule = $this->parseRoute($uri); + } + } + $ruleParameters = $rule['parameters']; + + $this->controllerFullName = $ruleParameters['class']; + $this->controller = substr($this->controllerFullName, strrpos($ruleParameters['class'], '\\') + 1); + $this->method = $ruleParameters['method']; + // 此处还需要检查控制器和方法是否存在 + if (!class_exists($this->controllerFullName)) { + throw new RouteException('不存在的控制器：' . $this->controllerFullName); + } + if (!method_exists($this->controllerFullName, $this->method)) { + throw new RouteException('不存在的方法：' . $this->method); + } + $this->params = $this->parseParameters($ruleParameters['class'], $ruleParameters['method'], $rule['rule'], $uri); + } + + + /** + * 创建路由配置缓存文件 + * @return array|mixed + */ + public function getRouteConfig() + { + $fileName = './runtime/' . BIND_MODULE . '_route_cache.php'; + if (!DEBUG && is_file($fileName)) { + return require $fileName; + } else { + $result = []; + $controllerPath = APP_PATH . BIND_MODULE . '/controller/'; + $namespace = APP_NS . '\\' . BIND_MODULE . '\\controller'; + $files = scandir($controllerPath); + for ($i = 2; $i < count($files); $i++) { + $className = $namespace . '\\' . pathinfo($files[$i])['filename']; + $reflectionClass = Application::getReflectionClass($className); + foreach ($reflectionClass->getMethods() as $method) { + if ($method->class == $className && substr($method->name, 0, 1) != '_') { + $annotation = Annotation::getMethodAnnotation($className, $method->name); + $requestMethod = (isset($annotation['requestMethod'])) ? $annotation['requestMethod'] : 'any'; + if (isset($annotation['route'])) { + $requestUri = $annotation['route']; + } else continue; + $requestMethod = strtolower($requestMethod); + $rule = ($requestUri == '/') ? $requestUri : trim($requestUri, '/'); + $result[$requestMethod][$rule] = [ + 'class' => $className, + 'method' => $method->name, + 'except_middleware' => [], + 'accept_middleware' => [], + ]; + if (isset($annotation['exceptMiddleware']) && $annotation['exceptMiddleware'] != '') { + foreach (explode('|', $annotation['exceptMiddleware']) as $exceptMiddleware) { + $result[$requestMethod][$rule]['except_middleware'][] = $exceptMiddleware; + } + } + if (isset($annotation['acceptMiddleware']) && $annotation['acceptMiddleware'] != '') { + foreach (explode('|', $annotation['acceptMiddleware']) as $acceptMiddleware) { + $result[$requestMethod][$rule]['accept_middleware'][] = $acceptMiddleware; + } + } + } + } + } + + // 加载配置文件中的路由配置 + $routeConfigFile = CONFIG_DIR . 'route.php'; + if (is_file($routeConfigFile)) { + $routeConfig = require $routeConfigFile; + foreach ($routeConfig as $key => $value) { + if (isset($result[$key])) { // 存在当前请求方法的配置就检查含有的路由配置 + foreach ($value as $uri => $config) { + $uri = ($uri == '/') ? $uri : trim($uri, '/'); + if (isset($result[$key][$uri])) { // 如果已经存在这个路由配置，可能不完全，直接合并覆盖已有项 + $result[$key][$uri] = array_merge($result[$key][$uri], $config); + } else { + $result[$key][$uri] = $config; + } + } + } else { + $result[$key] = $value; + } + } + } + + // 写入文件 + ob_start(); + var_export($result); + $content = ob_get_contents(); + ob_clean(); + file_put_contents($fileName, "driver->init(urldecode($uri)); - return $this; } } diff --git a/framework/library/exception/BaseException.php b/framework/library/exception/BaseException.php index 4c385fa..ab74b9e 100644 --- a/framework/library/exception/BaseException.php +++ b/framework/library/exception/BaseException.php @@ -40,7 +40,7 @@ class BaseException extends \Exception { $file = file($filename); $totalLine = count($file); - $offset = 10; + $offset = 6; $offsetStart = $line - $offset; $offsetEnd = $line + $offset; $start = ($offsetStart <= 0) ? 2 : $offsetStart; @@ -163,7 +163,7 @@ class BaseException extends \Exception overflow-x: scroll; } .detail .codeblock .errLine { - background: #f7e6e6 !important; + background: #ffc7ad !important; } .detail .codeblock a { display: block; diff --git a/framework/library/functions/functions.php b/framework/library/functions/functions.php index 29e1f81..4e98850 100644 --- a/framework/library/functions/functions.php +++ b/framework/library/functions/functions.php @@ -45,12 +45,46 @@ function filterArray($array = [], $filter = 'filter', &$result = []) } /** - * 调用请求类 + * 获取/设置配置 + * @param $key + * @param string $value + * @return mixed + */ +function config($key, $value = '__NULL__VALUE__') +{ + if ($value != '__NULL__VALUE__') { + return \top\library\Config::instance()->set($key, $value); + } else { + return \top\library\Config::instance()->get($key); + } +} + +/** + * 请求类 + * @return \top\traits\Instance */ function request() { - $request = \top\library\http\Request::instance(); - return $request; + /*static $instance; + if (!$instance) { + $instance = new \top\library\http\Request(); + } + return $instance;*/ + return \top\library\http\Request::instance(); +} + +/** + * 响应类 + * @return \top\traits\Instance + */ +function response() +{ + /*static $instance; + if (!$instance) { + $instance = new \top\library\http\Response(); + } + return $instance;*/ + return \top\library\http\Response::instance(); } /** @@ -218,7 +252,7 @@ function get_client_ip($type = 0, $client = true) */ function redirect($url) { - if (request()->isAjax()) { + if (request()->is('ajax')) { return json_encode([ 'redirect' => $url, ]); @@ -449,13 +483,9 @@ function is_mobile() * 获取当前视图文件的缓存标识 * @return string */ -function viewCacheIdent() +function view_cache_ident() { - if (isset($_SERVER['REQUEST_URI'])) { - $ident = md5($_SERVER['REQUEST_URI']); - } else { - $ident = request()->module() . request()->controller() . request()->method(); - } + $ident = md5($_SERVER['REQUEST_URI'] . request()->requestMethod()); return $ident; } diff --git a/framework/library/http/Request.php b/framework/library/http/Request.php index 25c4e62..e616e3d 100644 --- a/framework/library/http/Request.php +++ b/framework/library/http/Request.php @@ -2,7 +2,8 @@ namespace top\library\http; -use top\library\exception\RouteException; +use top\library\Application; +use top\library\Router; use top\traits\Instance; /** @@ -21,16 +22,10 @@ class Request private $server = []; /** - * 中间件 - * @var array + * 当前URI + * @var mixed|null */ - private $middleware = []; - - /** - * 路由实例 - * @var null - */ - private $router = null; + private $uri = null; /** * post、get数据删除的值 @@ -38,99 +33,40 @@ class Request */ private $except = []; + /** + * Request constructor. + */ private function __construct() { $this->server = (!empty($_SERVER)) ? $_SERVER : []; + // 当前uri + $this->uri = $this->getUri(); } /** * 当前请求方式 * @return mixed|string */ - private function requestMethod() + public function requestMethod() { return (isset($this->server['REQUEST_METHOD']) && $this->server['REQUEST_METHOD'] != '') ? $this->server['REQUEST_METHOD'] : ''; } /** - * POST - * @return boolean + * 判断请求方式 + * @param $method + * @return bool */ - public function isPost() + public function is($method) { - return $this->requestMethod() == 'POST'; - } - - /** - * GET - * @return boolean - */ - public function isGet() - { - return $this->requestMethod() == 'GET'; - } - - /** - * PUT - * @return boolean - */ - public function isPut() - { - return $this->requestMethod() == 'PUT'; - } - - /** - * DELETE - * @return boolean - */ - public function isDelete() - { - return $this->requestMethod() == 'DELETE'; - } - - /** - * HEAD - * @return boolean - */ - public function isHead() - { - return $this->requestMethod() == 'HEAD'; - } - - /** - * HEAD - * @return boolean - */ - public function isPatch() - { - return $this->requestMethod() == 'PATCH'; - } - - /** - * HEAD - * @return boolean - */ - public function isOptions() - { - return $this->requestMethod() == 'OPTIONS'; - } - - /** - * AJAX - * @return boolean - */ - public function isAjax() - { - return isset($_SERVER['HTTP_X_REQUESTED_WITH']) && ($_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest'); - } - - /** - * CLI - * @return boolean - */ - public function isCLI() - { - return (php_sapi_name() == 'cli'); + $method = strtolower($method); + if ($method == 'ajax') { + return isset($this->server['HTTP_X_REQUESTED_WITH']) && ($this->server['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest'); + } elseif ($method == 'cli') { + return (php_sapi_name() == 'cli'); + } else { + return strtolower($this->requestMethod()) == $method; + } } /** @@ -156,13 +92,22 @@ class Request return get_client_ip($type, $client); } + /** + * 主机名 + * @return mixed + */ + public function host() + { + return $this->server['HTTP_HOST']; + } + /** * 当前请求的URI * @return mixed */ public function uri() { - return $this->router->uri(); + return $this->uri; } /** @@ -171,7 +116,7 @@ class Request */ public function module() { - return $this->router->module(); + return Router::instance($this)->module(); } /** @@ -180,7 +125,7 @@ class Request */ public function controllerFullName() { - return $this->router->controllerFullName(); + return Router::instance($this)->controllerFullName(); } /** @@ -189,7 +134,7 @@ class Request */ public function controller() { - return $this->router->controller(); + return Router::instance($this)->controller(); } /** @@ -198,7 +143,7 @@ class Request */ public function method() { - return $this->router->method(); + return Router::instance($this)->method(); } /** @@ -207,7 +152,16 @@ class Request */ public function params() { - return $this->router->params(); + return Router::instance($this)->params(); + } + + /** + * 当前加载的路由规则 + * @return null + */ + public function routeParameters() + { + return Router::instance($this)->loadRuleParameters(); } /** @@ -266,6 +220,21 @@ class Request return $this->requestData('post', $name, $except, $filter); } + /** + * 得到当前的URI + * @return mixed|null + */ + private function getUri() + { + $uri = null; + if (isset($this->server['PATH_INFO']) && $this->server['PATH_INFO']) { + $uri = $this->server['PATH_INFO']; + } elseif (isset($_GET['s']) && $_GET['s']) { + $uri = $_GET['s']; + } + return str_replace('.html', '', trim($uri, '/')); + } + /** * GET POST公共方法 * @param $type @@ -307,89 +276,4 @@ class Request } } - /** - * 指定路由 - * @param $router - * @return $this - */ - public function setRoute($router) - { - $this->router = $router; - return $this; - } - - /** - * 设置路由并执行程序 - * @return mixed - */ - public function execute() - { - $this->check(); - - // 将执行应用打包为$application - $application = function () { - - $controllerFullName = $this->controllerFullName(); - $method = $this->method(); - $params = $this->params(); - - $data = null; - $object = new $controllerFullName(); - $reflectionClass = new \ReflectionClass($controllerFullName); - if ($reflectionClass->hasMethod('_init')) { - $data = $object->_init(); - } - - if ($data === null || $data === '') { - // 前置方法 - $beforeReturnData = null; - $beforeMethod = 'before_' . $method; - if ($reflectionClass->hasMethod($beforeMethod)) { - $beforeReturnData = $object->{$beforeMethod}(); - } - - if ($beforeReturnData === null || $beforeReturnData === '' || $beforeReturnData === true) { - $reflectionMethod = new \ReflectionMethod($controllerFullName, $method); - $data = $reflectionMethod->invokeArgs($object, $params); - - // 后置方法 - $afterMethod = 'after_' . $method; - if ($reflectionClass->hasMethod($afterMethod)) { - $object->{$afterMethod}(); - } - } else { - $data = $beforeReturnData; - } - } - return $data; - }; - - // 由路由中间件去处理application，并返回结果 - return $this->router->middleware($application); - } - - /** - * 执行必要检查 - * @throws RouteException - */ - private function check() - { - // 检查模块是否存在 - if (!is_dir(APP_PATH . $this->module())) { - throw new RouteException('模块' . $this->module() . '不存在'); - } - // 检查控制器是否存在 - if (!class_exists($this->controllerFullName())) { - throw new RouteException('控制器' . $this->controllerFullName() . '不存在'); - } - // 检查方法在控制器中是否存在 - if (!in_array($this->method(), get_class_methods($this->controllerFullName()))) { - throw new RouteException('方法' . $this->method() . '在控制器' . $this->controller() . '中不存在'); - } - } - - public function __destruct() - { - - } } diff --git a/framework/library/http/Response.php b/framework/library/http/Response.php index 783a846..3fcda12 100644 --- a/framework/library/http/Response.php +++ b/framework/library/http/Response.php @@ -2,8 +2,9 @@ namespace top\library\http; -use top\library\http\response\ResponseData; +use top\library\View; use top\traits\Instance; +use top\traits\Json; /** * 响应类 @@ -15,11 +16,13 @@ class Response use Instance; + use Json; + /** * 响应内容 - * @var null + * @var string */ - public $content = null; + public $content = ''; /** * 响应头 @@ -50,17 +53,62 @@ class Response * @param $data * @return false|int|null|string */ - public function dispatch($data) + public function send($data) { if ($data instanceof Response) { return $data; } else { // 处理响应数据，并返回 - $responseData = new ResponseData($data); - $this->content = $responseData->dispatch(); + $this->content = $this->getContent($data); return $this; } } + public function notFound() + { + $this->header([ + 'HTTP/1.1 404 Not Found', + 'Status: 404 Not Found' + ]); + return <<is('ajax')) { + $this->header('Content-Type: application/json'); + return $this->returnJson($data); + } else { + $this->header('Content-Type: text/html; charset=utf-8'); + $filename = $request->controller() . '/' . $request->method(); + return View::instance()->fetch($filename, $data); + } + } elseif (is_bool($data)) { + return ($data) ? 'true' : 'false'; + } else if (is_object($data)) { + return '[OBJECT]'; + } + return $data; + } + + /** + * 直接echo处理 + * @return string + */ + public function __toString() + { + return $this->content; + } + } diff --git a/framework/library/http/response/ResponseData.php b/framework/library/http/response/ResponseData.php deleted file mode 100644 index 1619d57..0000000 --- a/framework/library/http/response/ResponseData.php +++ /dev/null @@ -1,71 +0,0 @@ -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 = View::instance(); - $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; - } -} diff --git a/framework/library/http/response/index.html b/framework/library/http/response/index.html deleted file mode 100644 index e69de29..0000000 diff --git a/framework/library/route/driver/Command.php b/framework/library/route/driver/Command.php deleted file mode 100644 index ffd2d56..0000000 --- a/framework/library/route/driver/Command.php +++ /dev/null @@ -1,116 +0,0 @@ -uriArray[0])) { - return $this->uriArray[0]; - } - return 'home'; - } - - /** - * 完整控制器名 - * @return mixed|string - */ - public function controllerFullName() - { - $className = '\\' . APP_NS . '\\' . $this->module() . '\\controller\\' . $this->controller(); - return $className; - } - - /** - * 控制器名 - * @return string - */ - public function controller() - { - if (isset($this->uriArray[1])) { - return ucfirst($this->uriArray[1]); - } - return 'Index'; - } - - /** - * 方法名 - * @return mixed|string - */ - public function method() - { - if (isset($this->uriArray[2])) { - return $this->uriArray[2]; - } - return 'index'; - } - - /** - * 请求参数 - * @return array - * @throws \ReflectionException - */ - public function params() - { - return $this->parseParam(); - } - - /** - * 解析请求参数 - * @return array - * @throws \ReflectionException - */ - private function parseParam() - { - $array = array_slice($this->uriArray, 3); - // 查找当前方法存在的参数 - $paramName = (new \ReflectionMethod($this->controllerFullName(), $this->method()))->getParameters(); - $paramNameArray = []; - foreach ($paramName as $value) { - $paramNameArray[] = $value->name; - } - $param = []; - for ($i = 0; $i < count($array); $i++) { - if (isset($array[$i + 1]) && in_array($array[$i], $paramNameArray)) { - $_GET[$array[$i]] = $param[$array[$i]] = $array[$i + 1]; - } - } - return $param; - } - - /** - * 执行初始化，解析URI为数组，并返回当前对象 - * @param $uri - * @return $this - */ - public function init($uri) - { - $options = getopt('u:'); - if (isset($options['u']) && $options['u']) { - $this->uriArray = $options['u'] ? explode('/', $options['u']) : []; - } else { - $this->uriArray = []; - } - return $this; - } - -} diff --git a/framework/library/route/driver/Compatible.php b/framework/library/route/driver/Compatible.php deleted file mode 100644 index 435e4bf..0000000 --- a/framework/library/route/driver/Compatible.php +++ /dev/null @@ -1,110 +0,0 @@ -uriArray[0])) { - return $this->uriArray[0]; - } - return 'home'; - } - - /** - * 完整控制器名 - * @return mixed|string - */ - public function controllerFullName() - { - $className = '\\' . APP_NS . '\\' . $this->module() . '\\controller\\' . $this->controller(); - return $className; - } - - /** - * 控制器名 - * @return string - */ - public function controller() - { - if (isset($this->uriArray[1])) { - return ucfirst($this->uriArray[1]); - } - return 'Index'; - } - - /** - * 方法名 - * @return mixed|string - */ - public function method() - { - if (isset($this->uriArray[2])) { - return $this->uriArray[2]; - } - return 'index'; - } - - /** - * 请求参数 - * @return array - * @throws \ReflectionException - */ - public function params() - { - return $this->parseParam(); - } - - /** - * 解析请求参数 - * @return array - * @throws \ReflectionException - */ - private function parseParam() - { - $array = array_slice($this->uriArray, 3); - // 查找当前方法存在的参数 - $paramName = (new \ReflectionMethod($this->controllerFullName(), $this->method()))->getParameters(); - $paramNameArray = []; - foreach ($paramName as $value) { - $paramNameArray[] = $value->name; - } - $param = []; - for ($i = 0; $i < count($array); $i++) { - if (isset($array[$i + 1]) && in_array($array[$i], $paramNameArray)) { - $_GET[$array[$i]] = $param[$array[$i]] = $array[$i + 1]; - } - } - return $param; - } - - /** - * 执行初始化，解析URI为数组，并返回当前对象 - * @param $uri - * @return $this - */ - public function init($uri) - { - $this->uriArray = $uri ? explode('/', $uri) : []; - return $this; - } - -} diff --git a/framework/library/route/driver/index.html b/framework/library/route/driver/index.html deleted file mode 100644 index e69de29..0000000 diff --git a/framework/library/route/ifs/RouteIfs.php b/framework/library/route/ifs/RouteIfs.php deleted file mode 100644 index 1c75e3f..0000000 --- a/framework/library/route/ifs/RouteIfs.php +++ /dev/null @@ -1,48 +0,0 @@ -set($ident, $content, $cacheTime)) { return $cache->get($ident); } else { diff --git a/framework/middleware/Action.php b/framework/middleware/Action.php new file mode 100644 index 0000000..4b0aebc --- /dev/null +++ b/framework/middleware/Action.php @@ -0,0 +1,49 @@ +controllerFullName(); + $methodAnnotations = Annotation::getMethodAnnotation($className, $request->method()); + $reflectionClass = Application::getReflectionClass($className); + + // 前置操作 + if (isset($methodAnnotations['beforeAction'])) { + $functions = explode('|', $methodAnnotations['beforeAction']); + foreach ($functions as $function) { + if (substr($function, 0, 1) == '_' && $reflectionClass->hasMethod($function)) { + $beforeData = (Application::getReflectionMethod($request->controllerFullName(), $function))->invoke(Application::getInstance($request->controllerFullName())); + if (!empty($beforeData)) return $beforeData; + } + } + $functions = null; + } + + $closure = $next(); + + // 后置操作 + if (isset($methodAnnotations['afterAction'])) { + $functions = explode('|', $methodAnnotations['afterAction']); + foreach ($functions as $function) { + if (substr($function, 0, 1) == '_' && $reflectionClass->hasMethod($function)) { + (Application::getReflectionMethod($request->controllerFullName(), $function))->invoke(Application::getInstance($request->controllerFullName())); + } + } + } + + return $closure; + } +} diff --git a/framework/middleware/Init.php b/framework/middleware/Init.php deleted file mode 100644 index c416063..0000000 --- a/framework/middleware/Init.php +++ /dev/null @@ -1,21 +0,0 @@ -get('view'); (!$config['cacheDir']) && $config['cacheDir'] = './runtime/cache/application/' . request()->module() . '/'; $cache = File::instance($config['cacheDir']); - if ($cache->exists($ident)) { - $content = $cache->get($ident); - return Response::instance()->dispatch($content); - } + if ($cache->exists($ident)) return Response::instance()->send($cache->get($ident)); } + return $next(); } diff --git a/framework/middleware/ifs/MiddlewareIfs.php b/framework/middleware/ifs/MiddlewareIfs.php index 64a3709..01063e9 100644 --- a/framework/middleware/ifs/MiddlewareIfs.php +++ b/framework/middleware/ifs/MiddlewareIfs.php @@ -2,6 +2,8 @@ namespace top\middleware\ifs; +use top\library\http\Request; + /** * 中间件接口 * @@ -9,5 +11,5 @@ namespace top\middleware\ifs; */ interface MiddlewareIfs { - public function handler(\Closure $next); + public function handler(Request $request, \Closure $next); } diff --git a/framework/create/tpl/model/index.html b/public/index.html similarity index 100% rename from framework/create/tpl/model/index.html rename to public/index.html diff --git a/public/index.php b/public/index.php index 9a7b6ba..cccb0fa 100644 --- a/public/index.php +++ b/public/index.php @@ -11,7 +11,7 @@ require '../framework/Framework.php'; // 可使用常量DEBUG取得该值 // 项目目录，缺省值：./application/ -// Framework::appPath('../application/'); +Framework::appPath('../application/'); // 可使用常量APP_PATH取得该值 // 项目命名空间，缺省值：app @@ -30,8 +30,9 @@ require '../framework/Framework.php'; // Framework::resourcePath('/resource/'); // 可使用常量RESOURCE取得该值 -// 路由模式，缺省值：1（pathinfo和兼容模式） -// Framework::runType(1); +// 绑定模块，缺省值：home +// Framework::bindModule('index'); +// 可使用常量BIND_MODULE取得该值 -Framework::appPath('../application/'); +// 启动应用 Framework::startApp();