优化curd命令的调用方式；调整后台工作台内容；优化版本命令代码

app/common/command/Curd.php

@@ -20,8 +20,8 @@ class Curd extends Command
             ->addOption('controllerFilename', 'c', Option::VALUE_REQUIRED, '控制器文件名', null)
             ->addOption('modelFilename', 'm', Option::VALUE_REQUIRED, '主表模型文件名', null)
             #
-            ->addOption('force', 'f', Option::VALUE_REQUIRED, '强制覆盖模式', 0)
-            ->addOption('delete', 'd', Option::VALUE_REQUIRED, '删除模式', 0)
+            ->addOption('force', 'f', Option::VALUE_NONE, '强制覆盖模式')
+            ->addOption('delete', 'd', Option::VALUE_NONE, '删除模式')
             ->setDescription('一键curd命令服务');
     }
 
@@ -32,8 +32,16 @@ class Curd extends Command
         $controllerFilename = $input->getOption('controllerFilename');
         $modelFilename = $input->getOption('modelFilename');
 
-        $force = $input->getOption('force');
-        $delete = $input->getOption('delete');
+        $force = 0;
+        $delete = 0;
+
+        if ($input->hasOption('force')) {
+            $force = 1;
+        }
+
+        if ($input->hasOption('delete')) {
+            $delete = 1;
+        }
 
         if (empty($table)) {
             $output->error('请设置主表');
@@ -47,10 +55,8 @@ class Curd extends Command
 
             $columns = $build->getTableColumns();
 
-
             $relations = [];
 
-
             foreach ($columns as $field => $column) {
 
                 if (isset($column['formType']) && $column['formType'] == 'relation') {
@@ -76,7 +82,7 @@ class Curd extends Command
             !empty($controllerFilename) && $build = $build->setControllerFilename($controllerFilename);
             !empty($modelFilename) && $build = $build->setModelFilename($modelFilename);
 
-            
+
             foreach ($relations as $relation) {
                 $build = $build->setRelation($relation['table'], $relation['foreignKey'], $relation['primaryKey'], $relation['modelFilename'], $relation['onlyFileds'], $relation['relationBindSelect']);
             }

app/common/command/admin/Version.php

@@ -14,10 +14,13 @@ use think\facade\App;
 class Version extends Command
 {
 
-    const VERSION = 'v2.0.7';
+    const VERSION = 'v2.0.8';
 
     const COMMENT = [
-        '给版本命令增加自动推送功能',
+        '优化curd命令的调用方式',
+        '调整后台工作台内容',
+        '优化版本命令代码',
+        
     ];
 
     protected function configure()
@@ -48,12 +51,14 @@ class Version extends Command
         $is_push_tag = $input->hasOption('push-tag');
 
         if ($is_push_tag) {
-            $root_path = App::getRootPath();
+            $output->writeln('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>');
+            
             $version = $this::VERSION;
             $comment = implode(';', $this::COMMENT);
-
+            $output->info('生成标签：' . $version);
+            $output->info('标签描述：' . $comment);
             exec("git tag -a $version -m \"$comment\"");
-
+            $output->info('推送到远程仓库');
             exec("git push --tags");
         }
     }