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

@@ -53,7 +53,6 @@ class HtmlCollect extends Command
 
     protected function start_collect()
     {
-        $tdk_project_ids = [714];
         $task_id = $this->get_task();
         if ($task_id === false) {
             //所有项目采集完成
@@ -109,9 +108,7 @@ class HtmlCollect extends Command
                 }
 
                 //提取页面tdk
-                if(in_array($project_id,$tdk_project_ids)){
                 $this->get_site_meta($new_html, $collect_info);
-                }
 
                 $source_list = $this->html_preg($new_html, $project_id, $collect_info->domain, $old_info['web_url_domain'], $old_info['home_url']);
 

@@ -55,7 +55,7 @@ class UpdateRoute extends Command
      */
     public function handle(){
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>426]);
+        $list = $projectModel->list(['id'=>672]);
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
@@ -101,15 +101,15 @@ class UpdateRoute extends Command
                 if(!empty($v['route'])){
                     $tag = "-tag";
                     if (!(substr($v['route'], -strlen($tag)) === $tag)) {
-//                        $route = Translate::tran($v['route'], 'en').$tag;
+                        $route = Translate::tran($v['route'], 'en').$tag;
                         // 如果不是以 '-tag' 结尾，则拼接上 '-tag'
-                        $route = $v['route'].$tag;
+//                        $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{
-//                        $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;