合并分支 'lyh-server' 到 'master'

gxai修改复制项目数据



查看合并请求 !1809

@@ -68,7 +68,7 @@ class CopyProject extends Command
                     $item->status = NoticeLog::STATUS_FAIL;
                     $item->status = NoticeLog::STATUS_FAIL;
                     $item->save();
                     $item->save();
                 }
                 }
-                sleep(180);
+                sleep(60);
                 try {
                 try {
                     $this->copyMysql($old_project_id,$project_id);
                     $this->copyMysql($old_project_id,$project_id);
                 }catch (\Exception $e){
                 }catch (\Exception $e){

@@ -962,7 +962,7 @@ class ProjectLogic extends BaseLogic
             return $this->success(['message'=>'当前项目已在复制中']);
             return $this->success(['message'=>'当前项目已在复制中']);
         }
         }
         $projectModel = new Project();
         $projectModel = new Project();
-        $projectInfo = $projectModel->read(['old_project_id'=>$this->param['project_id']]);
+        $projectInfo = $projectModel->read(['type'=>0,'old_project_id'=>$this->param['project_id']]);
         if($projectInfo !== false){
         if($projectInfo !== false){
             return $this->success(['message'=>'当前项目已复制过']);
             return $this->success(['message'=>'当前项目已复制过']);
         }
         }