周海龙 / globalso · 提交

转到一个项目

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

合并分支 'akun' 到 'master' 

Akun



查看合并请求 !156
内嵌 并排对比
正在显示 2 个修改的文件 包含 9 行增加 和 2 行删除
... ... @@ -115,6 +115,7 @@ class ProjectUpdate extends Command
$page_list = array_column($data_page, 'path');
}
$is_flush = 0;
//设置数据库
$project = ProjectServer::useProject($project_id);
if ($project) {
... ... @@ -318,6 +319,7 @@ class ProjectUpdate extends Command
$this->set_map($route, RouteMap::SOURCE_PRODUCT, $id, $project_id);
CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PRODUCT, $id, $link_type, $language_list, $page_list);
$is_flush = 1;
} catch (\Exception $e) {
echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL;
continue;
... ... @@ -392,6 +394,7 @@ class ProjectUpdate extends Command
$this->set_map($route, $api_type == 'news' ? RouteMap::SOURCE_NEWS : RouteMap::SOURCE_BLOG, $id, $project_id);
CollectTask::_insert($item['url'], $project_id, $api_type == 'news' ? RouteMap::SOURCE_NEWS : RouteMap::SOURCE_BLOG, $id, $link_type, $language_list, $page_list);
$is_flush = 1;
} catch (\Exception $e) {
echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL;
continue;
... ... @@ -444,6 +447,7 @@ class ProjectUpdate extends Command
$this->set_map($route, RouteMap::SOURCE_PAGE, $id, $project_id);
CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PAGE, $id, $link_type, $language_list, $page_list);
$is_flush = 1;
} catch (\Exception $e) {
echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL;
continue;
... ... @@ -462,7 +466,7 @@ class ProjectUpdate extends Command
DB::disconnect('custom_mysql');
$task->status = UpdateLog::STATUS_COM;//同步完成
if($api_type == 'post' || $api_type == 'page' || $api_type == 'news' || $api_type == 'blog'){
if($is_flush){
$task->collect_status = UpdateLog::COLLECT_STATUS_UN;
}
$task->save();
... ...
... ... @@ -100,6 +100,7 @@ class ProjectUpdateTemp extends Command
$page_list = array_column($data_page, 'path');
}
$is_flush = 0;
//设置数据库
$project = ProjectServer::useProject($project_id);
if ($project) {
... ... @@ -175,6 +176,8 @@ class ProjectUpdateTemp extends Command
$this->set_map($route, RouteMap::SOURCE_PRODUCT, $id, $project_id);
CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PRODUCT, $id, $link_type, $language_list, $page_list);
$is_flush = 1;
} catch (\Exception $e) {
echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL;
continue;
... ... @@ -201,7 +204,7 @@ class ProjectUpdateTemp extends Command
DB::disconnect('custom_mysql');
$task->status = UpdateLog::STATUS_COM;//同步完成
if ($api_type == 'post' || $api_type == 'page' || $api_type == 'news' || $api_type == 'blog') {
if ($is_flush) {
$task->collect_status = UpdateLog::COLLECT_STATUS_UN;
}
$task->save();
... ...