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

Merge branch 'master' of https://github.com/top-think/framework

Browse Source
This commit is contained in:
thinkphp
2018-01-13 22:11:39 +08:00
parent 9134d8a3e5 12b30a4329
commit f7927f4f5b
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/console/command/optimize/Config.php
View File

@@ -30,7 +30,7 @@ class Config extends Command
protected function execute(Input $input, Output $output) protected function execute(Input $input, Output $output)
{ {
if ($input->hasArgument('module')) { if ($input->getArgument('module')) {
$module = $input->getArgument('module') . DS; $module = $input->getArgument('module') . DS;
} else { } else {
$module = ''; $module = '';

6
library/think/console/command/optimize/Schema.php
View File

@@ -44,7 +44,8 @@ class Schema extends Command
if ($input->hasOption('module')) { if ($input->hasOption('module')) {
$module = $input->getOption('module'); $module = $input->getOption('module');
// 读取模型 // 读取模型
$list = scandir(APP_PATH . $module . DS . 'model'); $path = APP_PATH . $module . DS . 'model';
$list = is_dir($path) ? scandir($path) : [];
$app = App::$namespace; $app = App::$namespace;
foreach ($list as $file) { foreach ($list as $file) {
if (0 === strpos($file, '.')) { if (0 === strpos($file, '.')) {
@@ -66,7 +67,8 @@ class Schema extends Command
$tables = Db::connect($config)->getTables($dbName); $tables = Db::connect($config)->getTables($dbName);
} elseif (!\think\Config::get('app_multi_module')) { } elseif (!\think\Config::get('app_multi_module')) {
$app = App::$namespace; $app = App::$namespace;
$list = scandir(APP_PATH . 'model'); $path = APP_PATH . 'model';
$list = is_dir($path) ? scandir($path) : [];
foreach ($list as $file) { foreach ($list as $file) {
if (0 === strpos($file, '.')) { if (0 === strpos($file, '.')) {
continue; continue;