作者 张关杰

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

... ... @@ -464,6 +464,10 @@ class ProjectUpdate extends Command
'image' => $new_img,
'sort' => $item['sort'] ?? 0,
], ['id' => $id]);
if($project_id == 547){
CollectTask::_insert($item['url'], $project_id, $api_type == 'news' ? RouteMap::SOURCE_NEWS : RouteMap::SOURCE_BLOG, $id, $domain_arr['host'], $link_type, $language_list, $page_list);
}
}
} catch (\Exception $e) {
echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL;
... ... @@ -526,6 +530,10 @@ class ProjectUpdate extends Command
'description' => $item['description'] ?? '',
'html' => $item['content'] ?? '',
], ['id' => $id]);
if($project_id == 547){
CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PAGE, $id, $domain_arr['host'], $link_type, $language_list, $page_list);
}
}
} catch (\Exception $e) {
echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL;
... ... @@ -625,6 +633,10 @@ class ProjectUpdate extends Command
'content' => $item['content'] ?? '',
'image' => $new_img
], ['id' => $id]);
if($project_id == 547){
CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_MODULE, $id, $domain_arr['host'], $link_type, $language_list, $page_list);
}
}
//扩展字段
... ...
... ... @@ -280,7 +280,7 @@ class ProductLogic extends BaseLogic
$param['video']['url'] = str_replace_url($param['video']['url']);
$param['video'] = Arr::a2s($param['video'] ?? []);
}
if(isset($param['keyword_id'])){
if(isset($param['keyword_id']) && !empty($param['keyword_id'])){
$param['keyword_id'] = ','.Arr::arrToSet($param['keyword_id']).',';
}
$param['attrs'] = Arr::a2s($param['attrs'] ?? []);
... ...