周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 f69fc9e70b8382a419088bb580f1884eb55dd6a3 2 个父辈 e9c85dfd 6bf24018

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

内嵌 并排对比
正在显示 2 个修改的文件 包含 19 行增加 和 1 行删除
@@ -82,7 +82,7 @@ class VideoTask extends Command @@ -82,7 +82,7 @@ class VideoTask extends Command
82 if ($sub_task_num <= 0){ 82 if ($sub_task_num <= 0){
83 break; 83 break;
84 } 84 }
85 - $task_project = KeywordVideoTask::where(['status' => KeywordVideoTask::STATUS_OPEN])->orderBy('sort', 'desc')->first(); 85 + $task_project = KeywordVideoTask::where(['status' => KeywordVideoTask::STATUS_OPEN])->orderBy('sort', 'desc')->orderBy('id', 'desc')->first();
86 if (empty($task_project)){ 86 if (empty($task_project)){
87 break; 87 break;
88 } 88 }
@@ -181,6 +181,15 @@ class UserLoginLogic @@ -181,6 +181,15 @@ class UserLoginLogic
181 if($info['is_customized'] == 1){ 181 if($info['is_customized'] == 1){
182 $info['is_visualization'] = json_decode($project['is_visualization']); 182 $info['is_visualization'] = json_decode($project['is_visualization']);
183 } 183 }
  184 +
  185 + //是否开通AMP
  186 + $is_amp = 0;
  187 + if(!empty($project['deploy_optimize']['domain'])){
  188 + $amp_info = (new DomainInfo())->read(['id'=>$project['deploy_optimize']['domain']],['amp_status']);
  189 + $is_amp = $amp_info ? $amp_info['amp_status'] : 0;
  190 + }
  191 + $info['is_amp'] = $is_amp;
  192 +
184 //保存项目缓存 193 //保存项目缓存
185 Cache::put('user-'.$info['project_id'],$project,12 * 3600); 194 Cache::put('user-'.$info['project_id'],$project,12 * 3600);
186 return $this->success($info); 195 return $this->success($info);
@@ -273,6 +282,15 @@ class UserLoginLogic @@ -273,6 +282,15 @@ class UserLoginLogic
273 if($info['is_customized'] == 1){ 282 if($info['is_customized'] == 1){
274 $info['is_visualization'] = json_decode($project['is_visualization']); 283 $info['is_visualization'] = json_decode($project['is_visualization']);
275 } 284 }
  285 +
  286 + //是否开通AMP
  287 + $is_amp = 0;
  288 + if(!empty($project['deploy_optimize']['domain'])){
  289 + $amp_info = (new DomainInfo())->read(['id'=>$project['deploy_optimize']['domain']],['amp_status']);
  290 + $is_amp = $amp_info ? $amp_info['amp_status'] : 0;
  291 + }
  292 + $info['is_amp'] = $is_amp;
  293 +
276 //保存项目缓存 294 //保存项目缓存
277 Cache::put('user-'.$info['project_id'],$project,12 * 3600); 295 Cache::put('user-'.$info['project_id'],$project,12 * 3600);
278 return $this->success($info); 296 return $this->success($info);