周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 d95e21298efc2f22f7ffe21ddfb3eb0486d4c569 2 个父辈 7253d1b5 3b99d0c1

合并分支 'akun' 到 'master' 

Akun



查看合并请求 !156
内嵌 并排对比
正在显示 2 个修改的文件 包含 9 行增加 和 2 行删除
@@ -115,6 +115,7 @@ class ProjectUpdate extends Command @@ -115,6 +115,7 @@ class ProjectUpdate extends Command
115 $page_list = array_column($data_page, 'path'); 115 $page_list = array_column($data_page, 'path');
116 } 116 }
117 117
  118 + $is_flush = 0;
118 //设置数据库 119 //设置数据库
119 $project = ProjectServer::useProject($project_id); 120 $project = ProjectServer::useProject($project_id);
120 if ($project) { 121 if ($project) {
@@ -318,6 +319,7 @@ class ProjectUpdate extends Command @@ -318,6 +319,7 @@ class ProjectUpdate extends Command
318 $this->set_map($route, RouteMap::SOURCE_PRODUCT, $id, $project_id); 319 $this->set_map($route, RouteMap::SOURCE_PRODUCT, $id, $project_id);
319 320
320 CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PRODUCT, $id, $link_type, $language_list, $page_list); 321 CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PRODUCT, $id, $link_type, $language_list, $page_list);
  322 + $is_flush = 1;
321 } catch (\Exception $e) { 323 } catch (\Exception $e) {
322 echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL; 324 echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL;
323 continue; 325 continue;
@@ -392,6 +394,7 @@ class ProjectUpdate extends Command @@ -392,6 +394,7 @@ class ProjectUpdate extends Command
392 $this->set_map($route, $api_type == 'news' ? RouteMap::SOURCE_NEWS : RouteMap::SOURCE_BLOG, $id, $project_id); 394 $this->set_map($route, $api_type == 'news' ? RouteMap::SOURCE_NEWS : RouteMap::SOURCE_BLOG, $id, $project_id);
393 395
394 CollectTask::_insert($item['url'], $project_id, $api_type == 'news' ? RouteMap::SOURCE_NEWS : RouteMap::SOURCE_BLOG, $id, $link_type, $language_list, $page_list); 396 CollectTask::_insert($item['url'], $project_id, $api_type == 'news' ? RouteMap::SOURCE_NEWS : RouteMap::SOURCE_BLOG, $id, $link_type, $language_list, $page_list);
  397 + $is_flush = 1;
395 } catch (\Exception $e) { 398 } catch (\Exception $e) {
396 echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL; 399 echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL;
397 continue; 400 continue;
@@ -444,6 +447,7 @@ class ProjectUpdate extends Command @@ -444,6 +447,7 @@ class ProjectUpdate extends Command
444 $this->set_map($route, RouteMap::SOURCE_PAGE, $id, $project_id); 447 $this->set_map($route, RouteMap::SOURCE_PAGE, $id, $project_id);
445 448
446 CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PAGE, $id, $link_type, $language_list, $page_list); 449 CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PAGE, $id, $link_type, $language_list, $page_list);
  450 + $is_flush = 1;
447 } catch (\Exception $e) { 451 } catch (\Exception $e) {
448 echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL; 452 echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL;
449 continue; 453 continue;
@@ -462,7 +466,7 @@ class ProjectUpdate extends Command @@ -462,7 +466,7 @@ class ProjectUpdate extends Command
462 DB::disconnect('custom_mysql'); 466 DB::disconnect('custom_mysql');
463 467
464 $task->status = UpdateLog::STATUS_COM;//同步完成 468 $task->status = UpdateLog::STATUS_COM;//同步完成
465 - if($api_type == 'post' || $api_type == 'page' || $api_type == 'news' || $api_type == 'blog'){ 469 + if($is_flush){
466 $task->collect_status = UpdateLog::COLLECT_STATUS_UN; 470 $task->collect_status = UpdateLog::COLLECT_STATUS_UN;
467 } 471 }
468 $task->save(); 472 $task->save();
@@ -100,6 +100,7 @@ class ProjectUpdateTemp extends Command @@ -100,6 +100,7 @@ class ProjectUpdateTemp extends Command
100 $page_list = array_column($data_page, 'path'); 100 $page_list = array_column($data_page, 'path');
101 } 101 }
102 102
  103 + $is_flush = 0;
103 //设置数据库 104 //设置数据库
104 $project = ProjectServer::useProject($project_id); 105 $project = ProjectServer::useProject($project_id);
105 if ($project) { 106 if ($project) {
@@ -175,6 +176,8 @@ class ProjectUpdateTemp extends Command @@ -175,6 +176,8 @@ class ProjectUpdateTemp extends Command
175 $this->set_map($route, RouteMap::SOURCE_PRODUCT, $id, $project_id); 176 $this->set_map($route, RouteMap::SOURCE_PRODUCT, $id, $project_id);
176 177
177 CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PRODUCT, $id, $link_type, $language_list, $page_list); 178 CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PRODUCT, $id, $link_type, $language_list, $page_list);
  179 +
  180 + $is_flush = 1;
178 } catch (\Exception $e) { 181 } catch (\Exception $e) {
179 echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL; 182 echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL;
180 continue; 183 continue;
@@ -201,7 +204,7 @@ class ProjectUpdateTemp extends Command @@ -201,7 +204,7 @@ class ProjectUpdateTemp extends Command
201 DB::disconnect('custom_mysql'); 204 DB::disconnect('custom_mysql');
202 205
203 $task->status = UpdateLog::STATUS_COM;//同步完成 206 $task->status = UpdateLog::STATUS_COM;//同步完成
204 - if ($api_type == 'post' || $api_type == 'page' || $api_type == 'news' || $api_type == 'blog') { 207 + if ($is_flush) {
205 $task->collect_status = UpdateLog::COLLECT_STATUS_UN; 208 $task->collect_status = UpdateLog::COLLECT_STATUS_UN;
206 } 209 }
207 $task->save(); 210 $task->save();