From b3be31750a5dcc4cf938a861b5b99ca49e135530 Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Fri, 4 Sep 2020 19:28:30 +0800
Subject: [PATCH] upate

---
 extend/catcher/generate/Generator.php          | 12 ++++++------
 extend/catcher/generate/factory/Controller.php |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/extend/catcher/generate/Generator.php b/extend/catcher/generate/Generator.php
index 17fd9d6..9d0cfdb 100644
--- a/extend/catcher/generate/Generator.php
+++ b/extend/catcher/generate/Generator.php
@@ -55,7 +55,7 @@ class Generator
             // 只有最后成功才写入 route
             (new Route())->controller($controller['controller'])
                 ->restful($controller['restful'])
-                ->methods((new Controller())->parseOtherMethods($controller['other_function']))
+                // ->methods((new Controller())->parseOtherMethods($controller['other_function']))
                 ->done();
 
         } catch (\Exception $exception) {
@@ -76,10 +76,10 @@ class Generator
      */
     public function preview($params)
     {
-        $params = \json_decode($params['data'], true);
-
         $type = $params['type'];
 
+        $params = \json_decode($params['data'], true);
+
         [$controller, $model] = $this->parseParams($params);
 
         switch ($type) {
@@ -113,7 +113,7 @@ class Generator
             'model'  => $params['controller']['model'] ?? '',
             'controller' => $params['controller']['controller'] ?? '',
             'restful' => $params['controller']['restful'],
-            'other_function' => $params['controller']['other_function'],
+            // 'other_function' => $params['controller']['other_function'],
         ];
 
         $table = $params['controller']['table'] ?? '';
@@ -124,8 +124,8 @@ class Generator
         $model = [
             'table' => $table,
             'model' => $params['controller']['model'] ?? '',
-            'sql'   => $params['model']['data'],
-            'extra' => $params['model']['extra'],
+            'sql'   => $params['table_fields'],
+            'extra' => $params['table_extra'],
         ];
 
 
diff --git a/extend/catcher/generate/factory/Controller.php b/extend/catcher/generate/factory/Controller.php
index 36c06e7..84b6931 100644
--- a/extend/catcher/generate/factory/Controller.php
+++ b/extend/catcher/generate/factory/Controller.php
@@ -92,13 +92,14 @@ class Controller extends Factory
             }
         }
 
+        /**
         if (!empty($params['other_function'])) {
             $others = $this->parseOtherMethods($params['other_function']);
             $this->methods = array_merge($this->methods, $others);
             foreach ($others as $other) {
                 $content .= $template->otherFunction($other[0], $other[1]);
             }
-        }
+        }*/
 
         return $content;
     }