Merge pull request #1644 from visuddhinanda/laravel

循环中.stop停止

app/Console/Commands/CacheDictPreference.php

@@ -51,6 +51,7 @@ class CacheDictPreference extends Command
         $count = DB::select('SELECT count(*) from (
                      SELECT word,language from user_dicts group by word,language) T');
         $bar = $this->output->createProgressBar($count[0]->count);
+        $count = 0;
         foreach ($words as $key => $word) {
             $meaning = UserDict::where('word',$word->word)
                 ->where('language',$word->language)
@@ -63,8 +64,11 @@ class CacheDictPreference extends Command
                 Cache::put("{$prefix}/{$word->word}/{$word->language}",$m[0]);
             }
             $bar->advance();
-            if(\App\Tools\Tools::isStop()){
-                return 0;
+            $count++;
+            if($count%1000 === 0){
+                if(\App\Tools\Tools::isStop()){
+                    return 0;
+                }
             }
         }
         $bar->finish();

app/Console/Commands/CacheWbwPreference.php

@@ -62,7 +62,7 @@ class CacheWbwPreference extends Command
                     [$this->option('editor')]);
             }
             $wbw = $wbw->groupBy(['wbw_word','type','editor_id'])->cursor();
-
+            $count = 0;
             $bar = $this->output->createProgressBar($count[0]->count);
             foreach ($wbw as $key => $value) {
                 $data = WbwAnalysis::where('wbw_word',$value->wbw_word)
@@ -72,6 +72,12 @@ class CacheWbwPreference extends Command
                                     ->value('data');
                 Cache::put("{$prefix}/{$value->wbw_word}/{$value->type}/{$value->editor_id}",$data);
                 $bar->advance();
+                $count++;
+                if($count%1000 === 0){
+                    if(\App\Tools\Tools::isStop()){
+                        return 0;
+                    }
+                }
             }
             $bar->finish();
         }

app/Console/Commands/TestRedis.php

@@ -131,10 +131,17 @@ class TestRedis extends Command
         }else{
             $this->info("RedisClusters forget successful ");
         }
+        $null = null;
+		$value = RedisClusters::remember($key,2,function() use($null){
+			return $null;
+		});
+        $this->info("null=".$value);
+        RedisClusters::forget($key);
         $value1 = ['data'=>'cache-key-clusters'];
 		$value = RedisClusters::remember($key,2,function() use($value1){
 			return $value1;
 		});
+
 		if(RedisClusters::has($key)){
 			$this->info("{$key} exist value=");
             var_dump(RedisClusters::get($key));

app/Console/Commands/UpgradeCompound.php

@@ -125,6 +125,9 @@ class UpgradeCompound extends Command
 
 		$bar = $this->output->createProgressBar($count[0]->count);
 		foreach ($words as $key => $word) {
+            if(\App\Tools\Tools::isStop()){
+                return 0;
+            }
             $bar->advance();
 			if($this->option('continue')){
                 //先看目前字典里有没有已经拆过的这个词