mirror of
https://gitee.com/fastadminnet/framework.git
synced 2026-07-01 12:42:48 +08:00
控制器版本移除 增加controller_load标签位
This commit is contained in:
@@ -71,8 +71,6 @@ return [
|
||||
'pathinfo_depr' => '/',
|
||||
// 获取当前页面地址的系统变量 默认为REQUEST_URI
|
||||
'url_request_uri' => 'REQUEST_URI',
|
||||
// 控制器版本参数
|
||||
'var_version' => 'v',
|
||||
// 基础URL路径
|
||||
'base_url' => $_SERVER["SCRIPT_NAME"],
|
||||
// URL伪静态后缀
|
||||
|
||||
@@ -224,7 +224,7 @@ class App
|
||||
// 安全检测
|
||||
throw new Exception('illegal controller name:' . CONTROLLER_NAME, 10000);
|
||||
}
|
||||
$instance = Loader::controller(CONTROLLER_NAME, '', Config::get('empty_controller'), Input::get(Config::get('var_version')));
|
||||
$instance = Loader::controller(CONTROLLER_NAME, '', Config::get('empty_controller'));
|
||||
// 获取当前操作名
|
||||
$action = ACTION_NAME . Config::get('action_suffix');
|
||||
|
||||
|
||||
@@ -322,10 +322,9 @@ class Loader
|
||||
* @param string $name 资源地址
|
||||
* @param string $layer 控制层名称
|
||||
* @param string $empty 空控制器名称
|
||||
* @param string $version 版本号 例如 1.0 1.2.3
|
||||
* @return Object|false
|
||||
*/
|
||||
public static function controller($name, $layer = '', $empty = '', $version = null)
|
||||
public static function controller($name, $layer = '', $empty = '')
|
||||
{
|
||||
static $_instance = [];
|
||||
$layer = $layer ?: CONTROLLER_LAYER;
|
||||
@@ -338,12 +337,9 @@ class Loader
|
||||
$module = APP_MULTI_MODULE ? MODULE_NAME : '';
|
||||
}
|
||||
$class = self::parseClass($module, $layer, $name);
|
||||
if ($version) {
|
||||
$filename = APP_PATH . str_replace(APP_NAMESPACE . '\\', '', dirname($class)) . DS . $version . DS . basename($class) . EXT;
|
||||
if (is_file($filename)) {
|
||||
require $filename;
|
||||
}
|
||||
}
|
||||
// controller_load
|
||||
APP_HOOK && Hook::listen('controller_load', $class);
|
||||
|
||||
if (class_exists($class)) {
|
||||
$action = new $class;
|
||||
$_instance[$name . $layer] = $action;
|
||||
|
||||
Reference in New Issue
Block a user