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

@@ -126,11 +126,11 @@ class DomainInfo extends Command
             $data = [];
             $data = [];
             $ssl = $this->updateDomainSsl($amp_domain);
             $ssl = $this->updateDomainSsl($amp_domain);
             $ssl['from'] && $data['amp_certificate_start_time'] = $ssl['from'];
             $ssl['from'] && $data['amp_certificate_start_time'] = $ssl['from'];
-            $ssl['to'] && $data['amp_certificate_start_time'] = $ssl['to'];
+            $ssl['to'] && $data['amp_certificate_end_time'] = $ssl['to'];
 
 
             $domainModel->edit($data, ['id' => $v['id']]);
             $domainModel->edit($data, ['id' => $v['id']]);
 
 
-            if ($v['amp_type'] == 1 && ($data['amp_certificate_start_time'] ?? '') < $end_day) {
+            if ($v['amp_type'] == 1 && ($data['amp_certificate_end_time'] ?? '') < $end_day) {
                 //申请免费证书
                 //申请免费证书
                 $this->updateAmpPrivate($v['domain']);
                 $this->updateAmpPrivate($v['domain']);
             }
             }

@@ -58,6 +58,7 @@ class VideoTask extends Command
      */
      */
     public function handle()
     public function handle()
     {
     {
+        echo '开始：'.PHP_EOL;
         Log::info('开始视频推广任务');
         Log::info('开始视频推广任务');
         $this->createSubTask();
         $this->createSubTask();
         $this->sendSubTask();
         $this->sendSubTask();
@@ -91,7 +92,7 @@ class VideoTask extends Command
             ProjectServer::useProject($task_project->project_id);
             ProjectServer::useProject($task_project->project_id);
             $keyword = $this->getProjectKeyword();
             $keyword = $this->getProjectKeyword();
             // 已经没有需要生成视频的关键词
             // 已经没有需要生成视频的关键词
-            if (FALSE == $keyword->isEmpty()) {
+            if (!$keyword) {
                 $task_project->status = KeywordVideoTask::STATUS_CLOSE;
                 $task_project->status = KeywordVideoTask::STATUS_CLOSE;
                 $task_project->save();
                 $task_project->save();
                 continue;
                 continue;
@@ -130,7 +131,7 @@ class VideoTask extends Command
         if ($subTask->isEmpty())
         if ($subTask->isEmpty())
             return true;
             return true;
         foreach ($subTask as $val) {
         foreach ($subTask as $val) {
-            $valData = json_decode($val->data);
+            $valData = (array)json_decode($val->data);
             $task_id = 'v6-' . uniqid();
             $task_id = 'v6-' . uniqid();
             $data = [
             $data = [
                 'project_data' => [
                 'project_data' => [
@@ -146,7 +147,7 @@ class VideoTask extends Command
             $result = Http::post('http://216.250.255.116:7866/create_task', $data);
             $result = Http::post('http://216.250.255.116:7866/create_task', $data);
             $val->task_id = $task_id;
             $val->task_id = $task_id;
             $val->status = KeywordVideoTaskLog::STATUS_RUNNING;
             $val->status = KeywordVideoTaskLog::STATUS_RUNNING;
-            $val->request_result = $result;
+            $val->result_info = $result;
             $val->save();
             $val->save();
         }
         }
         return true;
         return true;
@@ -158,7 +159,9 @@ class VideoTask extends Command
      */
      */
     public function getProjectKeyword()
     public function getProjectKeyword()
     {
     {
-        $keyword = Keyword::where('video', null)->whereNotNull('keyword_content')->inRandomOrder()->take(100)->get();
+        $keyword_arr_id = Keyword::where('video', null)->whereNotNull('keyword_content')->pluck('id')->toArray();
+        $keyword_id = array_rand($keyword_arr_id, 500);
+        $keyword = Keyword::whereIn("id", $keyword_id)->get();
         return $keyword;
         return $keyword;
     }
     }
 
 

@@ -119,7 +119,7 @@ class KeywordVideoController extends BaseController
             'id.required' => '主键标识不为空',
             'id.required' => '主键标识不为空',
         ]);
         ]);
         $keywordModel  = new KeywordVideoTask();
         $keywordModel  = new KeywordVideoTask();
-        $rs = $keywordModel->edit(['sort'=>$this->param['sort']],['id'=>$this->param['id']]);
+        $rs = $keywordModel->edit($this->param,['id'=>$this->param['id']]);
         if($rs === false){
         if($rs === false){
             $this->response('编辑失败',Code::SYSTEM_ERROR);
             $this->response('编辑失败',Code::SYSTEM_ERROR);
         }
         }

@@ -389,19 +389,21 @@ class RankDataLogic extends BaseLogic
             //有小语种的
             //有小语种的
             $lang_list = $api->getLangList();
             $lang_list = $api->getLangList();
             if (!empty($lang_list[$api_no])) {
             if (!empty($lang_list[$api_no])) {
-                $model = RankData::where('project_id', $project_id)->where('lang', '<>', '')->first();
-                if (!$model || $model->updated_date != date('Y-m-d') || $force) {
-                    $res = $api->getGoogleRank($api_no, $lang_list[$api_no], 7, $force);
-                    if (!$res) {
-                        throw new \Exception("接口数据获取失败,api_no:{$api_no},lang");
-                    }
-                    $data = [];
-                    //不同的小语种取出来
-                    foreach ($res as $keyword => $v) {
-                        $data[Arr::last($v)['lang']][$keyword] = $v;
-                    }
-                    foreach ($data as $lang => $rank) {
-                        $this->save_rank($project_id, $rank, 0, $lang);
+                foreach ($lang_list[$api_no] as $lang){
+                    $model = RankData::where('project_id', $project_id)->where('lang', $lang)->first();
+                    if (!$model || $model->updated_date != date('Y-m-d') || $force) {
+                        $res = $api->getGoogleRank($api_no, $lang, 7, $force);
+                        if (!$res) {
+                            throw new \Exception("接口数据获取失败,api_no:{$api_no},lang");
+                        }
+                        $data = [];
+                        //不同的小语种取出来
+                        foreach ($res as $keyword => $v) {
+                            $data[Arr::last($v)['lang']][$keyword] = $v;
+                        }
+                        foreach ($data as $lang => $rank) {
+                            $this->save_rank($project_id, $rank, 0, $lang);
+                        }
                     }
                     }
                 }
                 }
             }
             }