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

@@ -82,7 +82,7 @@ class VideoTask extends Command
             if ($sub_task_num <= 0){
                 break;
             }
-            $task_project = KeywordVideoTask::where(['status' => KeywordVideoTask::STATUS_OPEN])->orderBy('sort', 'desc')->first();
+            $task_project = KeywordVideoTask::where(['status' => KeywordVideoTask::STATUS_OPEN])->orderBy('sort', 'desc')->orderBy('id', 'desc')->first();
             if (empty($task_project)){
                 break;
             }

@@ -181,6 +181,15 @@ class UserLoginLogic
         if($info['is_customized'] == 1){
             $info['is_visualization'] = json_decode($project['is_visualization']);
         }
+
+        //是否开通AMP
+        $is_amp = 0;
+        if(!empty($project['deploy_optimize']['domain'])){
+            $amp_info = (new DomainInfo())->read(['id'=>$project['deploy_optimize']['domain']],['amp_status']);
+            $is_amp = $amp_info ? $amp_info['amp_status'] : 0;
+        }
+        $info['is_amp'] = $is_amp;
+
         //保存项目缓存
         Cache::put('user-'.$info['project_id'],$project,12 * 3600);
         return $this->success($info);
@@ -273,6 +282,15 @@ class UserLoginLogic
         if($info['is_customized'] == 1){
             $info['is_visualization'] = json_decode($project['is_visualization']);
         }
+
+        //是否开通AMP
+        $is_amp = 0;
+        if(!empty($project['deploy_optimize']['domain'])){
+            $amp_info = (new DomainInfo())->read(['id'=>$project['deploy_optimize']['domain']],['amp_status']);
+            $is_amp = $amp_info ? $amp_info['amp_status'] : 0;
+        }
+        $info['is_amp'] = $is_amp;
+
         //保存项目缓存
         Cache::put('user-'.$info['project_id'],$project,12 * 3600);
         return $this->success($info);