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

完善Build类支持CLASS_APPEND_SUFFIX常量配置

Browse Source
This commit is contained in:
thinkphp
2016-02-25 20:13:48 +08:00
parent 1989acf8ef
commit 5c8db926a6
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
library/think/Build.php
View File

@@ -97,16 +97,17 @@ class Build
} else { } else {
// 生成相关MVC文件 // 生成相关MVC文件
foreach ($file as $val) { foreach ($file as $val) {
$filename = $modulePath . $path . DS . $val . EXT; $filename = $modulePath . $path . DS . $val . (CLASS_APPEND_SUFFIX ? ucfirst($path) : '') . EXT;
$namespace = APP_NAMESPACE . '\\' . ($module ? $module . '\\' : '') . $path; $namespace = APP_NAMESPACE . '\\' . ($module ? $module . '\\' : '') . $path;
$class = $val . (CLASS_APPEND_SUFFIX ? ucfirst($path) : '');
switch ($path) { switch ($path) {
case CONTROLLER_LAYER: // 控制器 case CONTROLLER_LAYER: // 控制器
$content = "<?php\nnamespace {$namespace};\n\nclass {$val}\n{\n\n}"; $content = "<?php\nnamespace {$namespace};\n\nclass {$class}\n{\n\n}";
break; break;
case MODEL_LAYER: // 模型 case MODEL_LAYER: // 模型
$content = "<?php\nnamespace {$namespace};\n\nuse think\Model;\n\nclass {$val} extends Model\n{\n\n}"; $content = "<?php\nnamespace {$namespace};\n\nuse think\Model;\n\nclass {$class} extends Model\n{\n\n}";
break; break;
case VIEW_LAYER: // 视图 case VIEW_LAYER: // 视图
$filename = $modulePath . $path . DS . $val . '.html'; $filename = $modulePath . $path . DS . $val . '.html';
if (!is_dir(dirname($filename))) { if (!is_dir(dirname($filename))) {
// 创建目录 // 创建目录
@@ -116,7 +117,7 @@ class Build
break; break;
default: default:
// 其他文件 // 其他文件
$content = "<?php\nnamespace {$namespace};\n\nclass {$val}\n{\n\n}"; $content = "<?php\nnamespace {$namespace};\n\nclass {$class}\n{\n\n}";
} }
if (!is_file($filename)) { if (!is_file($filename)) {
@@ -130,10 +131,10 @@ class Build
// 创建欢迎页面 // 创建欢迎页面
protected static function buildHello($module) protected static function buildHello($module)
{ {
$filename = APP_PATH . ($module ? $module . DS : '') . CONTROLLER_LAYER . DS . Config::get('default_controller') . EXT; $filename = APP_PATH . ($module ? $module . DS : '') . CONTROLLER_LAYER . DS . Config::get('default_controller') . (CLASS_APPEND_SUFFIX ? ucfirst(CONTROLLER_LAYER) : '') . EXT;
if (!is_file($filename)) { if (!is_file($filename)) {
$content = file_get_contents(THINK_PATH . 'tpl' . DS . 'default_index.tpl'); $content = file_get_contents(THINK_PATH . 'tpl' . DS . 'default_index.tpl');
$content = str_replace(['{$app}', '{$module}', '{layer}'], [APP_NAMESPACE, $module ? $module . '\\' : '', CONTROLLER_LAYER], $content); $content = str_replace(['{$app}', '{$module}', '{layer}', '{$suffix}'], [APP_NAMESPACE, $module ? $module . '\\' : '', CONTROLLER_LAYER, CLASS_APPEND_SUFFIX ? ucfirst(CONTROLLER_LAYER) : ''], $content);
if (!is_dir(dirname($filename))) { if (!is_dir(dirname($filename))) {
mkdir(dirname($filename), 0777, true); mkdir(dirname($filename), 0777, true);
} }

2
tpl/default_index.tpl
View File

@@ -1,7 +1,7 @@
<?php <?php
namespace {$app}\{$module}{layer}; namespace {$app}\{$module}{layer};
class Index class Index{$suffix}
{ {
public function index() public function index()
{ {