作者 刘锟

update

@@ -292,7 +292,7 @@ class ProjectUpdate extends Command @@ -292,7 +292,7 @@ class ProjectUpdate extends Command
292 'route' => $route 292 'route' => $route
293 ]); 293 ]);
294 $this->set_map($route, RouteMap::SOURCE_PRODUCT, $id, $project_id); 294 $this->set_map($route, RouteMap::SOURCE_PRODUCT, $id, $project_id);
295 - CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PRODUCT, $id, $link_type, $language_list, $page_list); 295 + CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PRODUCT, $id, $domain_arr['host'], $link_type, $language_list, $page_list);
296 } else { 296 } else {
297 $id = $product['id']; 297 $id = $product['id'];
298 $model->edit([ 298 $model->edit([
@@ -418,7 +418,7 @@ class ProjectUpdate extends Command @@ -418,7 +418,7 @@ class ProjectUpdate extends Command
418 ]); 418 ]);
419 $this->set_map($route, $api_type == 'news' ? RouteMap::SOURCE_NEWS : RouteMap::SOURCE_BLOG, $id, $project_id); 419 $this->set_map($route, $api_type == 'news' ? RouteMap::SOURCE_NEWS : RouteMap::SOURCE_BLOG, $id, $project_id);
420 420
421 - CollectTask::_insert($item['url'], $project_id, $api_type == 'news' ? RouteMap::SOURCE_NEWS : RouteMap::SOURCE_BLOG, $id, $link_type, $language_list, $page_list); 421 + 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);
422 } else { 422 } else {
423 $id = $news['id']; 423 $id = $news['id'];
424 $model->edit([ 424 $model->edit([
@@ -483,7 +483,7 @@ class ProjectUpdate extends Command @@ -483,7 +483,7 @@ class ProjectUpdate extends Command
483 ]); 483 ]);
484 $this->set_map($route, RouteMap::SOURCE_PAGE, $id, $project_id); 484 $this->set_map($route, RouteMap::SOURCE_PAGE, $id, $project_id);
485 485
486 - CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PAGE, $id, $link_type, $language_list, $page_list); 486 + CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PAGE, $id, $domain_arr['host'], $link_type, $language_list, $page_list);
487 } else { 487 } else {
488 $id = $custom['id']; 488 $id = $custom['id'];
489 $model->edit([ 489 $model->edit([
@@ -17,7 +17,7 @@ class CollectTask extends Base @@ -17,7 +17,7 @@ class CollectTask extends Base
17 const STATUS_COM = 2; 17 const STATUS_COM = 2;
18 const STATUS_FAIL = 3; 18 const STATUS_FAIL = 3;
19 19
20 - public static function _insert($url, $project_id, $source, $source_id, $link_type = 0, $language_list = [], $page_list = []) 20 + public static function _insert($url, $project_id, $source, $source_id, $domain, $link_type = 0, $language_list = [], $page_list = [])
21 { 21 {
22 if (!$url) { 22 if (!$url) {
23 return; 23 return;
@@ -36,12 +36,12 @@ class CollectTask extends Base @@ -36,12 +36,12 @@ class CollectTask extends Base
36 $data = []; 36 $data = [];
37 $now = date('Y-m-d H:i:s'); 37 $now = date('Y-m-d H:i:s');
38 if (!$task) { 38 if (!$task) {
39 - $data[] = [ 39 + $data[] = [
40 'project_id' => $project_id, 40 'project_id' => $project_id,
41 'source' => $source, 41 'source' => $source,
42 'source_id' => $source_id, 42 'source_id' => $source_id,
43 - 'domain' => $url_arr['host'],  
44 - 'route' => $url_arr['path'], 43 + 'domain' => $url_arr['host'] ?? $domain,
  44 + 'route' => substr($url_arr['path'], 0, 1) == '/' ? $url_arr['path'] : '/' . $url_arr['path'],
45 'language' => '', 45 'language' => '',
46 'created_at' => $now, 46 'created_at' => $now,
47 'updated_at' => $now, 47 'updated_at' => $now,