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

@@ -98,6 +98,7 @@ class HtmlCollect extends Command
                 if($html == '0'){
                 if($html == '0'){
                     $collect_info->status = CollectTask::STATUS_FAIL;
                     $collect_info->status = CollectTask::STATUS_FAIL;
                     $collect_info->save();
                     $collect_info->save();
+                    echo 'date:' . date('Y-m-d H:i:s') . ', project_id: ' . $project_id . ', collect_id: ' . $collect_id . ', error: no html'  . PHP_EOL;
                     return true;
                     return true;
                 }
                 }
 
 
@@ -151,9 +152,6 @@ class HtmlCollect extends Command
             case 'blog':
             case 'blog':
                 $source = RouteMap::SOURCE_BLOG;
                 $source = RouteMap::SOURCE_BLOG;
                 break;
                 break;
-            case 'tag':
-                $source = RouteMap::SOURCE_PRODUCT_KEYWORD;
-                break;
             default:
             default:
                 $source = RouteMap::SOURCE_PRODUCT;
                 $source = RouteMap::SOURCE_PRODUCT;
                 break;
                 break;

@@ -158,8 +158,6 @@ class ProjectUpdate extends Command
                                                 'route' => $route
                                                 'route' => $route
                                             ]);
                                             ]);
                                             $this->set_map($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $project_id);
                                             $this->set_map($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $project_id);
-
-                                            CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $link_type, $language_list, $page_list);
                                         } catch (\Exception $e) {
                                         } catch (\Exception $e) {
                                             echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL;
                                             echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL;
                                             continue;
                                             continue;

@@ -187,6 +187,7 @@ class ATemplateController extends BaseController
         }
         }
         $filed = ['id','name','status','image','created_at'];
         $filed = ['id','name','status','image','created_at'];
         $this->map['test_model'] = 0;
         $this->map['test_model'] = 0;
+        $this->map['project_id'] = 0;
         $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order,$filed);
         $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order,$filed);
         $data = [];
         $data = [];
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){