周海龙 / globalso · 提交

转到一个项目

作者 张关杰
提交 08081a2c1e687d124e6b93ce44fd1dbe2e1bb0ac 2 个父辈 0858d2a9 25a8edec

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

内嵌 并排对比
正在显示 2 个修改的文件 包含 13 行增加 和 1 行删除
@@ -464,6 +464,10 @@ class ProjectUpdate extends Command @@ -464,6 +464,10 @@ class ProjectUpdate extends Command
464 'image' => $new_img, 464 'image' => $new_img,
465 'sort' => $item['sort'] ?? 0, 465 'sort' => $item['sort'] ?? 0,
466 ], ['id' => $id]); 466 ], ['id' => $id]);
  467 +
  468 + if($project_id == 547){
  469 + 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);
  470 + }
467 } 471 }
468 } catch (\Exception $e) { 472 } catch (\Exception $e) {
469 echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL; 473 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 @@ -526,6 +530,10 @@ class ProjectUpdate extends Command
526 'description' => $item['description'] ?? '', 530 'description' => $item['description'] ?? '',
527 'html' => $item['content'] ?? '', 531 'html' => $item['content'] ?? '',
528 ], ['id' => $id]); 532 ], ['id' => $id]);
  533 +
  534 + if($project_id == 547){
  535 + CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PAGE, $id, $domain_arr['host'], $link_type, $language_list, $page_list);
  536 + }
529 } 537 }
530 } catch (\Exception $e) { 538 } catch (\Exception $e) {
531 echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL; 539 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 @@ -625,6 +633,10 @@ class ProjectUpdate extends Command
625 'content' => $item['content'] ?? '', 633 'content' => $item['content'] ?? '',
626 'image' => $new_img 634 'image' => $new_img
627 ], ['id' => $id]); 635 ], ['id' => $id]);
  636 +
  637 + if($project_id == 547){
  638 + CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_MODULE, $id, $domain_arr['host'], $link_type, $language_list, $page_list);
  639 + }
628 } 640 }
629 641
630 //扩展字段 642 //扩展字段
@@ -280,7 +280,7 @@ class ProductLogic extends BaseLogic @@ -280,7 +280,7 @@ class ProductLogic extends BaseLogic
280 $param['video']['url'] = str_replace_url($param['video']['url']); 280 $param['video']['url'] = str_replace_url($param['video']['url']);
281 $param['video'] = Arr::a2s($param['video'] ?? []); 281 $param['video'] = Arr::a2s($param['video'] ?? []);
282 } 282 }
283 - if(isset($param['keyword_id'])){ 283 + if(isset($param['keyword_id']) && !empty($param['keyword_id'])){
284 $param['keyword_id'] = ','.Arr::arrToSet($param['keyword_id']).','; 284 $param['keyword_id'] = ','.Arr::arrToSet($param['keyword_id']).',';
285 } 285 }
286 $param['attrs'] = Arr::a2s($param['attrs'] ?? []); 286 $param['attrs'] = Arr::a2s($param['attrs'] ?? []);