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

@@ -73,7 +73,6 @@ class OnlineCheckLogic extends BaseLogic
             //提交审核修改状态为审核中
             //提交审核修改状态为审核中
             $projectModel->edit(['status'=>$projectModel::STATUS_ONE],['id'=>$this->param['id']]);
             $projectModel->edit(['status'=>$projectModel::STATUS_ONE],['id'=>$this->param['id']]);
         }
         }
-        Common::del_user_cache($projectModel->getTable(),$this->param['id']);
         return $this->success();
         return $this->success();
     }
     }
 }
 }

@@ -47,21 +47,23 @@ class ProjectLogic extends BaseLogic
      * @time   :2023/7/28 17:11
      * @time   :2023/7/28 17:11
      */
      */
     public function getProjectInfo($id){
     public function getProjectInfo($id){
-        $info = Common::get_user_cache($this->model->getTable(),$id);
+//        $info = Common::get_user_cache($this->model->getTable(),$id);
         if(empty($info)){
         if(empty($info)){
             $info = $this->model->with('payment')->with('deploy_build')->with('deploy_optimize')->with('online_check')
             $info = $this->model->with('payment')->with('deploy_build')->with('deploy_optimize')->with('online_check')
                 ->with('project_after')->where(['id'=>$id])->first()->toArray();
                 ->with('project_after')->where(['id'=>$id])->first()->toArray();
             if(!empty($info['online_check']['created_manage_id'])){
             if(!empty($info['online_check']['created_manage_id'])){
                 $info['online_check']['name'] = (new Manage())->read(['id'=>$info['online_check']['created_manage_id']])['name'] ?? '';
                 $info['online_check']['name'] = (new Manage())->read(['id'=>$info['online_check']['created_manage_id']])['name'] ?? '';
             }
             }
-            $info['deploy_optimize']['minor_keywords'] = [];
+
             if(isset($info['deploy_optimize']['minor_keywords']) && !empty($info['deploy_optimize']['minor_keywords'])){
             if(isset($info['deploy_optimize']['minor_keywords']) && !empty($info['deploy_optimize']['minor_keywords'])){
                 $info['deploy_optimize']['minor_keywords'] = json_decode($info['deploy_optimize']['minor_keywords']) ?? '';
                 $info['deploy_optimize']['minor_keywords'] = json_decode($info['deploy_optimize']['minor_keywords']) ?? '';
+            }else{
+                $info['deploy_optimize']['minor_keywords'] = [];
             }
             }
             if($info['extend_type'] != 0){
             if($info['extend_type'] != 0){
                 $info['type'] = $info['extend_type'];
                 $info['type'] = $info['extend_type'];
             }
             }
-            Common::set_user_cache($info,$this->model->getTable(),$id);
+//            Common::set_user_cache($info,$this->model->getTable(),$id);
         }
         }
         return $this->success($info);
         return $this->success($info);
     }
     }