Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -55,7 +55,7 @@ class UpdateRoute extends Command
      */
     public function handle(){
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>632]);
+        $list = $projectModel->list(['id'=>708]);
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
@@ -95,7 +95,7 @@ class UpdateRoute extends Command
      */
     public function setProductKeyword(){
         $keywordModel = new Keyword();
-        $lists = $keywordModel->list();
+        $lists = $keywordModel->list(['id'=>['>=',457]]);
         if(!empty($lists)){
             foreach ($lists as $v){
                 if(!empty($v['route'])){
@@ -106,6 +106,10 @@ class UpdateRoute extends Command
                         $route = $v['route'].$tag;
                         $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
                         $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
+                    }else{
+                        $route = Translate::tran($v['title'], 'en').$tag;
+                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
+                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
                     }
                 }else{
                     echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;