From a5416bd0ad24d7c1508c1155f40ba69252bf88ae Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Mon, 13 Jul 2020 17:05:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=9F=E6=88=90=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/catcher/generate/Generator.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/extend/catcher/generate/Generator.php b/extend/catcher/generate/Generator.php
index a8d0431..17fd9d6 100644
--- a/extend/catcher/generate/Generator.php
+++ b/extend/catcher/generate/Generator.php
@@ -51,16 +51,18 @@ class Generator
                 $migration = (new Migration)->done([$controller['module'], $model['table']]);
                 array_push($message, 'migration created successfully');
             }
+
+            // 只有最后成功才写入 route
+            (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());
         }
 
-        // 只有最后成功才写入 route
-        (new Route())->controller($params['controller'])
-            ->restful($params['restful'])
-            ->methods((new Controller())->parseOtherMethods($params['other_function']))
-            ->done();
 
         return $message;
     }
@@ -158,7 +160,8 @@ class Generator
                 protected $name = 'migrations';
             };
 
-            $model->order('version', 'desc')->find()->delete();
+            $migration = $model->order('version', 'desc')->find();
+            $model->where('version', $migration->version)->delete();
         }
     }
 }