作者 刘锟

合并分支 'akun' 到 'master'

Akun



查看合并请求 !734
... ... @@ -383,20 +383,12 @@ class ProjectUpdate extends Command
'sort' => $item['sort'] ?? 0,
'files' => $files,
], ['id' => $id]);
} else {
//按6.0展示只更新分类
$model->edit([
'category_id' => $category_id
], ['id' => $id]);
}
}
//关联分类
if ($category_arr) {
CategoryRelated::saveRelated($id, array_column($category_arr, 'id'));
}
if ($six_read) {
//关联分类
CategoryRelated::saveRelated($id, array_column($category_arr, 'id'));
//扩展字段
if ($item['extend'] ?? []) {
foreach (array_reverse($item['extend']) as $ke => $ve) {
... ... @@ -508,9 +500,7 @@ class ProjectUpdate extends Command
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);
} else {
$id = $news['id'];
$six_read = $news['six_read'];
if ($six_read) {
if ($news['six_read']) {
//按5.0展示才需要更新数据
$model->edit([
'name' => $item['ttile'],
... ... @@ -522,7 +512,7 @@ class ProjectUpdate extends Command
'image' => $new_img,
'release_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
'sort' => $item['sort'] ?? 0,
], ['id' => $id]);
], ['id' => $news['id']]);
}
}
} catch (\Exception $e) {
... ...