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

@@ -111,7 +111,7 @@ class VideoTask extends Command
             }
             }
             $logo_bg = $this->getImage($domainInfo);
             $logo_bg = $this->getImage($domainInfo);
             foreach ($keyword as $val) {
             foreach ($keyword as $val) {
-                $log = KeywordVideoTaskLog::where(['project_id' => $task_project->project_id, 'keyword_id' => $val->id])->first();
+                $log = KeywordVideoTaskLog::where(['project_id' => $task_project->project_id, 'keyword_id' => $val->id , 'result_status'=>'200'])->first();
                 if ($log){
                 if ($log){
                     continue;
                     continue;
                 }
                 }

@@ -70,7 +70,7 @@ class AutoTaskController extends BaseController
                 }
                 }
             }
             }
             // 映射信息 以及解析信息
             // 映射信息 以及解析信息
-            $val['type'] = $type[$val['type']];
+            $val['type'] = $type[$val['type']] ?? '';
             $val['route'] = $route[$val['route']];
             $val['route'] = $route[$val['route']];
             $val['status'] = $status[$val['status']];
             $val['status'] = $status[$val['status']];
             $val['project_title'] = $projects[$val['project_id']] ?? '';
             $val['project_title'] = $projects[$val['project_id']] ?? '';

@@ -28,6 +28,7 @@ class BlogRequest extends FormRequest
             'seo_keywords'=>'max:500',
             'seo_keywords'=>'max:500',
             'remark'=>'max:1000',
             'remark'=>'max:1000',
             'url'=>'required',
             'url'=>'required',
+            'text'=>'max:5000',
         ];
         ];
     }
     }
 
 
@@ -38,7 +39,8 @@ class BlogRequest extends FormRequest
             'name.max'=>'名称超过最长长度200',
             'name.max'=>'名称超过最长长度200',
             'url.required'=>'链接不能为空',
             'url.required'=>'链接不能为空',
             'seo_keywords.max'=>'seo_keywords太长，请重新编辑',
             'seo_keywords.max'=>'seo_keywords太长，请重新编辑',
-            'remark.max'=>'描述超过最长长度1000'
+            'remark.max'=>'描述超过最长长度1000',
+            'text.max'=>'详情内容超过最大长度',
         ];
         ];
     }
     }
 }
 }