周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 1c88b0e85466fe24ca3e22bdd8890ea3db6ac022 2 个父辈 48069b06 3d567b18

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

内嵌 并排对比
正在显示 2 个修改的文件 包含 8 行增加 和 11 行删除
@@ -53,7 +53,6 @@ class HtmlCollect extends Command @@ -53,7 +53,6 @@ class HtmlCollect extends Command
53 53
54 protected function start_collect() 54 protected function start_collect()
55 { 55 {
56 - $tdk_project_ids = [714];  
57 $task_id = $this->get_task(); 56 $task_id = $this->get_task();
58 if ($task_id === false) { 57 if ($task_id === false) {
59 //所有项目采集完成 58 //所有项目采集完成
@@ -109,9 +108,7 @@ class HtmlCollect extends Command @@ -109,9 +108,7 @@ class HtmlCollect extends Command
109 } 108 }
110 109
111 //提取页面tdk 110 //提取页面tdk
112 - if(in_array($project_id,$tdk_project_ids)){  
113 - $this->get_site_meta($new_html, $collect_info);  
114 - } 111 + $this->get_site_meta($new_html, $collect_info);
115 112
116 $source_list = $this->html_preg($new_html, $project_id, $collect_info->domain, $old_info['web_url_domain'], $old_info['home_url']); 113 $source_list = $this->html_preg($new_html, $project_id, $collect_info->domain, $old_info['web_url_domain'], $old_info['home_url']);
117 114
@@ -55,7 +55,7 @@ class UpdateRoute extends Command @@ -55,7 +55,7 @@ class UpdateRoute extends Command
55 */ 55 */
56 public function handle(){ 56 public function handle(){
57 $projectModel = new Project(); 57 $projectModel = new Project();
58 - $list = $projectModel->list(['id'=>426]); 58 + $list = $projectModel->list(['id'=>672]);
59 foreach ($list as $v){ 59 foreach ($list as $v){
60 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL; 60 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
61 ProjectServer::useProject($v['id']); 61 ProjectServer::useProject($v['id']);
@@ -101,15 +101,15 @@ class UpdateRoute extends Command @@ -101,15 +101,15 @@ class UpdateRoute extends Command
101 if(!empty($v['route'])){ 101 if(!empty($v['route'])){
102 $tag = "-tag"; 102 $tag = "-tag";
103 if (!(substr($v['route'], -strlen($tag)) === $tag)) { 103 if (!(substr($v['route'], -strlen($tag)) === $tag)) {
104 -// $route = Translate::tran($v['route'], 'en').$tag; 104 + $route = Translate::tran($v['route'], 'en').$tag;
105 // 如果不是以 '-tag' 结尾，则拼接上 '-tag' 105 // 如果不是以 '-tag' 结尾，则拼接上 '-tag'
106 - $route = $v['route'].$tag; 106 +// $route = $v['route'].$tag;
  107 + $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
  108 + $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
  109 + }else{
  110 + $route = Translate::tran($v['title'], 'en').$tag;
107 $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']); 111 $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
108 $keywordModel->edit(['route'=>$route],['id'=>$v['id']]); 112 $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
109 -// }else{  
110 -// $route = Translate::tran($v['title'], 'en').$tag;  
111 -// $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);  
112 -// $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);  
113 } 113 }
114 }else{ 114 }else{
115 echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL; 115 echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;