周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 a4f28a6c13d8e3adb6dbe275c5efa65e70732e7f 2 个父辈 edb935d3 f3b3ff43

gx

内嵌 并排对比
正在显示 1 个修改的文件 包含 11 行增加 和 3 行删除
@@ -168,7 +168,7 @@ class UserLoginLogic @@ -168,7 +168,7 @@ class UserLoginLogic
168 $info['is_customized'] = $project['is_customized']; 168 $info['is_customized'] = $project['is_customized'];
169 $info['is_upload_manage'] = $project['is_upload_manage']; 169 $info['is_upload_manage'] = $project['is_upload_manage'];
170 $info['upload_config'] = $project['upload_config']; 170 $info['upload_config'] = $project['upload_config'];
171 - $info['configuration'] = ($project['deploy_build']['configuration'] != null) ? $project['deploy_build']['configuration'] : ["is_SEO" => 0, "is_head"=> 0, "is_home"=> 0, "build_status"=> 0]; 171 + $info['configuration'] = $project['deploy_build']['configuration'];
172 //保存项目缓存 172 //保存项目缓存
173 Cache::put('user-'.$info['project_id'],$project,$minutes = null); 173 Cache::put('user-'.$info['project_id'],$project,$minutes = null);
174 return $this->success($info); 174 return $this->success($info);
@@ -197,8 +197,7 @@ class UserLoginLogic @@ -197,8 +197,7 @@ class UserLoginLogic
197 $info['is_customized'] = $project['is_customized']; 197 $info['is_customized'] = $project['is_customized'];
198 $info['is_upload_manage'] = $project['is_upload_manage']; 198 $info['is_upload_manage'] = $project['is_upload_manage'];
199 $info['upload_config'] = $project['upload_config']; 199 $info['upload_config'] = $project['upload_config'];
200 - $info['configuration'] = ($project['deploy_build']['configuration'] != null) ? $project['deploy_build']['configuration'] : ["is_SEO" => 0, "is_head"=> 0, "is_home"=> 0, "build_status"=> 0];  
201 - 200 + $info['configuration'] = $project['deploy_build']['configuration'];
202 //保存项目缓存 201 //保存项目缓存
203 Cache::put('user-'.$info['project_id'],$project,$minutes = null); 202 Cache::put('user-'.$info['project_id'],$project,$minutes = null);
204 return $this->success($info); 203 return $this->success($info);
@@ -220,6 +219,15 @@ class UserLoginLogic @@ -220,6 +219,15 @@ class UserLoginLogic
220 if($info['extend_type'] != 0){ 219 if($info['extend_type'] != 0){
221 $info['type'] = $info['extend_type']; 220 $info['type'] = $info['extend_type'];
222 } 221 }
  222 + if($info['deploy_build']['configuration'] == null){
  223 + $info['deploy_build']['configuration'] = ["is_SEO" => 0, "is_head"=> 0, "is_home"=> 0, "build_status"=> 0];
  224 + }else{
  225 + $info['deploy_build']['configuration'] = json_decode($info['deploy_build']['configuration']);
  226 + if(isset($info['deploy_build']['configuration']['is_SEO'])){$info['deploy_build']['configuration']['is_SEO'] = 0;}
  227 + if(isset($info['deploy_build']['configuration']['is_head'])){$info['deploy_build']['configuration']['is_head'] = 0;}
  228 + if(isset($info['deploy_build']['configuration']['is_home'])){$info['deploy_build']['configuration']['is_home'] = 0;}
  229 + if(isset($info['deploy_build']['configuration']['build_status'])){$info['deploy_build']['configuration']['build_status'] = 0;}
  230 + }
223 return $this->success($info); 231 return $this->success($info);
224 } 232 }
225 233