gxai

@@ -43,7 +43,6 @@ class CopyProject extends Command
     public function handle()
     public function handle()
     {
     {
         while (true) {
         while (true) {
-            $projectModel = new Project();
             $list = NoticeLog::where('type', NoticeLog::TYPE_COPY_PROJECT)->where('status', NoticeLog::STATUS_PENDING)->get();
             $list = NoticeLog::where('type', NoticeLog::TYPE_COPY_PROJECT)->where('status', NoticeLog::STATUS_PENDING)->get();
             if(empty($list)){
             if(empty($list)){
                 sleep(30);
                 sleep(30);
@@ -74,8 +73,6 @@ class CopyProject extends Command
                 }catch (\Exception $e){
                 }catch (\Exception $e){
                     echo '复制数据库失败：'.$old_project_id . '<->'.$project_id;
                     echo '复制数据库失败：'.$old_project_id . '<->'.$project_id;
                 }
                 }
-                //修改项目状态
-                $projectModel->edit(['delete_status'=>0],['id'=>$project_id]);
                 $this->output('CopyProjectJob end, old project_id: ' . $old_project_id . ', new project_id: ' . $project_id);
                 $this->output('CopyProjectJob end, old project_id: ' . $old_project_id . ', new project_id: ' . $project_id);
             }
             }
         }
         }
@@ -214,6 +211,9 @@ class CopyProject extends Command
         ProjectServer::createDatabase($project);
         ProjectServer::createDatabase($project);
         //创建表
         //创建表
         $this->initTable($project_id,$new_project_id);
         $this->initTable($project_id,$new_project_id);
+        //修改项目状态
+        $projectModel = new Project();
+        $projectModel->edit(['delete_status'=>0],['id'=>$new_project_id]);
     }
     }
 
 
     /**
     /**

@@ -961,6 +961,11 @@ class ProjectLogic extends BaseLogic
         if($info !== false){
         if($info !== false){
             return $this->success('当前项目已在复制中');
             return $this->success('当前项目已在复制中');
         }
         }
+        $projectModel = new Project();
+        $projectInfo = $projectModel->read(['old_project_id'=>$this->param['project_id']]);
+        if($projectInfo !== false){
+            return $this->success('当前项目已复制过');
+        }
         NoticeLog::createLog(NoticeLog::TYPE_COPY_PROJECT, ['project_id' => $this->param['project_id']]);
         NoticeLog::createLog(NoticeLog::TYPE_COPY_PROJECT, ['project_id' => $this->param['project_id']]);
         return $this->success('项目复制中，请稍后前往初始化项目查看；');
         return $this->success('项目复制中，请稍后前往初始化项目查看；');
     }
     }

@@ -30,7 +30,7 @@ class Logic
      * @param array $data
      * @param array $data
      * @return array
      * @return array
      */
      */
-    public function success($data = [])
+    public function success($data)
     {
     {
         return $data;
         return $data;
     }
     }