Merge pull request #2028 from visuddhinanda/laravel

tag tag.map 导出到索引

app/Console/Commands/ExportOffline.php

@@ -81,8 +81,10 @@ class ExportOffline extends Command
         if(!$this->option('shortcut')){
             //tag
             $this->info('export tag start');
-            $this->call('export:tag');
-            $this->call('export:tag.map');
+            $this->call('export:tag',['db'=>'wikipali-offline']);
+            $this->call('export:tag',['db'=>'wikipali-offline-index']);
+            $this->call('export:tag.map',['db'=>'wikipali-offline']);
+            $this->call('export:tag.map',['db'=>'wikipali-offline-index']);
             //
             $this->info('export pali text start');
             $this->call('export:pali.text');

app/Console/Commands/ExportTag.php

@@ -14,7 +14,7 @@ class ExportTag extends Command
      *
      * @var string
      */
-    protected $signature = 'export:tag';
+    protected $signature = 'export:tag {db}';
 
     /**
      * The console command description.
@@ -44,7 +44,7 @@ class ExportTag extends Command
         if(\App\Tools\Tools::isStop()){
             return 0;
         }
-        $exportFile = storage_path('app/public/export/offline/wikipali-offline-'.date("Y-m-d").'.db3');
+        $exportFile = storage_path('app/public/export/offline/'.$this->argument('db').'-'.date("Y-m-d").'.db3');
         $dbh = new \PDO('sqlite:'.$exportFile, "", "", array(\PDO::ATTR_PERSISTENT => true));
         $dbh->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_WARNING);
         $dbh->beginTransaction();

app/Console/Commands/ExportTagmap.php

@@ -14,7 +14,7 @@ class ExportTagmap extends Command
      *
      * @var string
      */
-    protected $signature = 'export:tag.map';
+    protected $signature = 'export:tag.map {db}';
 
     /**
      * The console command description.
@@ -44,7 +44,7 @@ class ExportTagmap extends Command
         if(\App\Tools\Tools::isStop()){
             return 0;
         }
-        $exportFile = storage_path('app/public/export/offline/wikipali-offline-'.date("Y-m-d").'.db3');
+        $exportFile = storage_path('app/public/export/offline/'.$this->argument('db').'-'.date("Y-m-d").'.db3');
         $dbh = new \PDO('sqlite:'.$exportFile, "", "", array(\PDO::ATTR_PERSISTENT => true));
         $dbh->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_WARNING);
         $dbh->beginTransaction();

app/Console/Commands/MqProgress.php

@@ -10,7 +10,7 @@ class MqProgress extends Command
 {
     /**
      * The name and signature of the console command.
-     *
+     * php artisan mq:progress
      * @var string
      */
     protected $signature = 'mq:progress';