mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 23:22:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

控制器版本移除 增加controller_load标签位

Browse Source
This commit is contained in:
thinkphp
2016-03-27 20:47:44 +08:00
parent bfd89eaed5
commit 1cb86e4a3b
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
convention.php
View File

@@ -71,8 +71,6 @@ return [
'pathinfo_depr' => '/', 'pathinfo_depr' => '/',
// 获取当前页面地址的系统变量 默认为REQUEST_URI // 获取当前页面地址的系统变量 默认为REQUEST_URI
'url_request_uri' => 'REQUEST_URI', 'url_request_uri' => 'REQUEST_URI',
// 控制器版本参数
'var_version' => 'v',
// 基础URL路径 // 基础URL路径
'base_url' => $_SERVER["SCRIPT_NAME"], 'base_url' => $_SERVER["SCRIPT_NAME"],
// URL伪静态后缀 // URL伪静态后缀

2
library/think/App.php
View File

@@ -224,7 +224,7 @@ class App
// 安全检测 // 安全检测
throw new Exception('illegal controller name:' . CONTROLLER_NAME, 10000); 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'); $action = ACTION_NAME . Config::get('action_suffix');

12
library/think/Loader.php
View File

@@ -322,10 +322,9 @@ class Loader
* @param string $name 资源地址 * @param string $name 资源地址
* @param string $layer 控制层名称 * @param string $layer 控制层名称
* @param string $empty 空控制器名称 * @param string $empty 空控制器名称
* @param string $version 版本号 例如 1.0 1.2.3
* @return Object|false * @return Object|false
*/ */
public static function controller($name, $layer = '', $empty = '', $version = null) public static function controller($name, $layer = '', $empty = '')
{ {
static $_instance = []; static $_instance = [];
$layer = $layer ?: CONTROLLER_LAYER; $layer = $layer ?: CONTROLLER_LAYER;
@@ -338,12 +337,9 @@ class Loader
$module = APP_MULTI_MODULE ? MODULE_NAME : ''; $module = APP_MULTI_MODULE ? MODULE_NAME : '';
} }
$class = self::parseClass($module, $layer, $name); $class = self::parseClass($module, $layer, $name);
if ($version) { // controller_load
$filename = APP_PATH . str_replace(APP_NAMESPACE . '\\', '', dirname($class)) . DS . $version . DS . basename($class) . EXT; APP_HOOK && Hook::listen('controller_load', $class);
if (is_file($filename)) {
require $filename;
}
}
if (class_exists($class)) { if (class_exists($class)) {
$action = new $class; $action = new $class;
$_instance[$name . $layer] = $action; $_instance[$name . $layer] = $action;