From 4216a489072aae9ceb505c51bab5f10bade534ef Mon Sep 17 00:00:00 2001 From: JaguarJack Date: Thu, 17 Sep 2020 21:15:24 +0800 Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E6=9B=B4=E6=96=B0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/catcher/generate/Generator.php | 14 ++++++++------ extend/catcher/generate/factory/Factory.php | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/extend/catcher/generate/Generator.php b/extend/catcher/generate/Generator.php index 9d0cfdb..4dde917 100644 --- a/extend/catcher/generate/Generator.php +++ b/extend/catcher/generate/Generator.php @@ -52,15 +52,17 @@ class Generator array_push($message, 'migration created successfully'); } - // 只有最后成功才写入 route - (new Route())->controller($controller['controller']) - ->restful($controller['restful']) - // ->methods((new Controller())->parseOtherMethods($controller['other_function'])) - ->done(); + // 只有创建了 Controller 最后成功才写入 route + if ($params['create_controller']) { + (new Route())->controller($controller['controller']) + ->restful($controller['restful']) + // ->methods((new Controller())->parseOtherMethods($controller['other_function'])) + ->done(); + } } catch (\Exception $exception) { $this->rollback($files, $migration, $table); - throw new FailedException($exception->getMessage()); + throw new FailedException($exception->getFile() . $exception->getLine() . $exception->getMessage()); } diff --git a/extend/catcher/generate/factory/Factory.php b/extend/catcher/generate/factory/Factory.php index ced3db9..f4b970b 100644 --- a/extend/catcher/generate/factory/Factory.php +++ b/extend/catcher/generate/factory/Factory.php @@ -91,7 +91,7 @@ abstract class Factory */ public function hasTableExists($table) { - $tables = Db::getConnection()->getTables(); + $tables = Db::connect()->getTables(); return in_array($table, $tables) ? $table : false; }