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

路径用DS常量规范

Browse Source
This commit is contained in:
thinkphp
2015-12-10 13:31:12 +08:00
parent 9a2ff2f231
commit ba72cf44ef
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/app.php
View File

@@ -130,7 +130,7 @@ class App
// 操作绑定到类：模块\controller\控制器\操作类 // 操作绑定到类：模块\controller\控制器\操作类
private static function bindActionClass($emptyController) private static function bindActionClass($emptyController)
{ {
if (is_dir(MODULE_PATH . CONTROLLER_LAYER . '/' . str_replace('.', '/', CONTROLLER_NAME))) { if (is_dir(MODULE_PATH . CONTROLLER_LAYER . DS . str_replace('.', DS, CONTROLLER_NAME))) {
$namespace = MODULE_NAME . '\\' . CONTROLLER_LAYER . '\\' . str_replace('.', '\\', CONTROLLER_NAME) . '\\'; $namespace = MODULE_NAME . '\\' . CONTROLLER_LAYER . '\\' . str_replace('.', '\\', CONTROLLER_NAME) . '\\';
} else { } else {
// 空控制器 // 空控制器
@@ -181,7 +181,7 @@ class App
private static function initModule($module, &$config) private static function initModule($module, &$config)
{ {
// 定位模块目录 // 定位模块目录
$module = COMMON_MODULE == $module ? '' : $module . '/'; $module = COMMON_MODULE == $module ? '' : $module . DS;
// 加载初始化文件 // 加载初始化文件
if (is_file(APP_PATH . $module . 'init' . EXT)) { if (is_file(APP_PATH . $module . 'init' . EXT)) {
@@ -324,8 +324,8 @@ class App
// 模块初始化 // 模块初始化
if (MODULE_NAME && !in_array(MODULE_NAME, $config['deny_module_list']) && is_dir(APP_PATH . MODULE_NAME)) { if (MODULE_NAME && !in_array(MODULE_NAME, $config['deny_module_list']) && is_dir(APP_PATH . MODULE_NAME)) {
Hook::listen('app_begin'); Hook::listen('app_begin');
define('MODULE_PATH', APP_PATH . MODULE_NAME . '/'); define('MODULE_PATH', APP_PATH . MODULE_NAME . DS);
define('VIEW_PATH', MODULE_PATH . VIEW_LAYER . '/'); define('VIEW_PATH', MODULE_PATH . VIEW_LAYER . DS);
// 初始化模块 // 初始化模块
self::initModule(MODULE_NAME, $config); self::initModule(MODULE_NAME, $config);

24
library/think/create.php
View File

@@ -79,7 +79,7 @@ class Create
// 创建子目录和文件 // 创建子目录和文件
foreach ($list as $path => $file) { foreach ($list as $path => $file) {
$modulePath = APP_PATH . $module . '/'; $modulePath = APP_PATH . $module . DS;
if ('__dir__' == $path) { if ('__dir__' == $path) {
// 生成子目录 // 生成子目录
foreach ($file as $dir) { foreach ($file as $dir) {
@@ -98,7 +98,7 @@ class Create
} else { } else {
// 生成相关MVC文件 // 生成相关MVC文件
foreach ($file as $val) { foreach ($file as $val) {
$filename = $modulePath . $path . '/' . Loader::parseName($val) . EXT; $filename = $modulePath . $path . DS . Loader::parseName($val) . EXT;
switch ($path) { switch ($path) {
case CONTROLLER_LAYER: // 控制器 case CONTROLLER_LAYER: // 控制器
$content = "<?php\nnamespace {$module}\\{$path};\n\nclass {$val} {\n\n}"; $content = "<?php\nnamespace {$module}\\{$path};\n\nclass {$val} {\n\n}";
@@ -107,7 +107,7 @@ class Create
$content = "<?php\nnamespace {$module}\\{$path};\n\nclass {$val} extends \Think\Model{\n\n}"; $content = "<?php\nnamespace {$module}\\{$path};\n\nclass {$val} extends \Think\Model{\n\n}";
break; break;
case VIEW_LAYER: // 视图 case VIEW_LAYER: // 视图
$filename = $modulePath . $path . '/' . Loader::parseName($val) . '.html'; $filename = $modulePath . $path . DS . Loader::parseName($val) . '.html';
if (!is_dir(dirname($filename))) { if (!is_dir(dirname($filename))) {
// 创建目录 // 创建目录
mkdir(dirname($filename), 0777, true); mkdir(dirname($filename), 0777, true);
@@ -130,12 +130,12 @@ class Create
// 创建欢迎页面 // 创建欢迎页面
protected static function buildHello($module) protected static function buildHello($module)
{ {
$filename = APP_PATH . $module . '/' . CONTROLLER_LAYER . '/' . Config::get('default_module') . EXT; $filename = APP_PATH . $module . DS . CONTROLLER_LAYER . DS . Config::get('default_module') . EXT;
if (!is_file($filename)) { if (!is_file($filename)) {
$content = file_get_contents(THINK_PATH . 'tpl/default_index.tpl'); $content = file_get_contents(THINK_PATH . 'tpl/default_index.tpl');
$content = str_replace('{$module}', $module, $content); $content = str_replace('{$module}', $module, $content);
if (!is_dir(APP_PATH . $module . '/' . CONTROLLER_LAYER)) { if (!is_dir(APP_PATH . $module . DS . CONTROLLER_LAYER)) {
mkdir(APP_PATH . $module . '/' . CONTROLLER_LAYER); mkdir(APP_PATH . $module . DS . CONTROLLER_LAYER);
} }
file_put_contents($filename, $content); file_put_contents($filename, $content);
} }
@@ -144,14 +144,14 @@ class Create
// 创建模块公共文件 // 创建模块公共文件
protected static function buildCommon($module) protected static function buildCommon($module)
{ {
if (!is_file(APP_PATH . $module . '/common.php')) { if (!is_file(APP_PATH . $module . DS.'common.php')) {
file_put_contents(APP_PATH . $module . '/common.php', "<?php\n"); file_put_contents(APP_PATH . $module . DS.'common.php', "<?php\n");
} }
if (!is_file(APP_PATH . $module . '/config.php')) { if (!is_file(APP_PATH . $module . DS.'config.php')) {
file_put_contents(APP_PATH . $module . '/config.php', "<?php\nreturn [\n\n];"); file_put_contents(APP_PATH . $module . DS.'config.php', "<?php\nreturn [\n\n];");
} }
if (!is_file(APP_PATH . $module . '/alias.php')) { if (!is_file(APP_PATH . $module . DS.'alias.php')) {
file_put_contents(APP_PATH . $module . '/alias.php', "<?php\nreturn [\n\n];"); file_put_contents(APP_PATH . $module . DS.'alias.php', "<?php\nreturn [\n\n];");
} }
} }
} }

10
library/think/loader.php
View File

@@ -29,7 +29,7 @@ class Loader
$name = strtolower(strstr($class, '\\', true)); $name = strtolower(strstr($class, '\\', true));
if (isset(self::$namespace[$name])) { if (isset(self::$namespace[$name])) {
// 注册的命名空间 // 注册的命名空间
$path = dirname(self::$namespace[$name]) . '/'; $path = dirname(self::$namespace[$name]) . DS;
} elseif (in_array($name, ['think', 'org', 'behavior', 'com']) || is_dir(LIB_PATH . $name)) { } elseif (in_array($name, ['think', 'org', 'behavior', 'com']) || is_dir(LIB_PATH . $name)) {
// Library目录下面的命名空间自动定位 // Library目录下面的命名空间自动定位
$path = LIB_PATH; $path = LIB_PATH;
@@ -37,7 +37,7 @@ class Loader
// 项目命名空间 // 项目命名空间
$path = APP_PATH; $path = APP_PATH;
} }
$filename = $path . str_replace('\\', '/', str_replace('\\_', '\\', strtolower(trim(preg_replace("/[A-Z]/", "_\\0", $class), "_")))) . EXT; $filename = $path . str_replace('\\', DS, str_replace('\\_', '\\', strtolower(trim(preg_replace("/[A-Z]/", "_\\0", $class), "_")))) . EXT;
if (is_file($filename)) { if (is_file($filename)) {
include $filename; include $filename;
} }
@@ -97,11 +97,11 @@ class Loader
} else { } else {
// 加载其他项目应用类库 // 加载其他项目应用类库
$class = substr_replace($class, '', 0, strlen($class_strut[0]) + 1); $class = substr_replace($class, '', 0, strlen($class_strut[0]) + 1);
$baseUrl = APP_PATH . $class_strut[0] . '/'; $baseUrl = APP_PATH . $class_strut[0] . DS;
} }
} }
if (substr($baseUrl, -1) != '/') { if (substr($baseUrl, -1) != DS) {
$baseUrl .= '/'; $baseUrl .= DS;
} }
// 如果类存在 则导入类库文件 // 如果类存在 则导入类库文件
$filename = $baseUrl . $class . $ext; $filename = $baseUrl . $class . $ext;

2
library/think/log/driver/file.php
View File

@@ -42,7 +42,7 @@ class File
//检测日志文件大小，超过配置大小则备份日志文件重新生成 //检测日志文件大小，超过配置大小则备份日志文件重新生成
if (is_file($destination) && floor($this->config['file_size']) <= filesize($destination)) { if (is_file($destination) && floor($this->config['file_size']) <= filesize($destination)) {
rename($destination, dirname($destination) . '/' . time() . '-' . basename($destination)); rename($destination, dirname($destination) . DS . time() . '-' . basename($destination));
} }
error_log("[{$now}] {$_SERVER['SERVER_ADDR']} {$_SERVER['REMOTE_ADDR']} {$_SERVER['REQUEST_URI']}\r\n{$log}\r\n", 3, $destination); error_log("[{$now}] {$_SERVER['SERVER_ADDR']} {$_SERVER['REMOTE_ADDR']} {$_SERVER['REQUEST_URI']}\r\n{$log}\r\n", 3, $destination);