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

Master server



查看合并请求 !1024

@@ -50,12 +50,13 @@ class CopyProject extends Command
                 continue;
                 continue;
             }
             }
             foreach ($list as $item){
             foreach ($list as $item){
+                DB::beginTransaction();
                 try {
                 try {
-                    $data = $item['data']['project_id'];
-                    $old_project_id = $data['project_id'];
+                    $old_project_id = $item['data']['project_id'];
                     $this->output('CopyProjectJob start, project_id: ' . $old_project_id);
                     $this->output('CopyProjectJob start, project_id: ' . $old_project_id);
+                    $data = $this->copyProject($old_project_id);
+                    $project_id = $data['project_id'];
                     $type = $data['type'];
                     $type = $data['type'];
-                    $project_id = $this->copyProject($old_project_id);
                     $this->copyDeployBuild($old_project_id,$project_id);
                     $this->copyDeployBuild($old_project_id,$project_id);
                     $this->copyDeployOptimize($old_project_id,$project_id);
                     $this->copyDeployOptimize($old_project_id,$project_id);
                     $this->copyPayment($old_project_id,$project_id);
                     $this->copyPayment($old_project_id,$project_id);
@@ -69,7 +70,9 @@ class CopyProject extends Command
                     $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);
                     $item->status = NoticeLog::STATUS_SUCCESS;
                     $item->status = NoticeLog::STATUS_SUCCESS;
                     $item->save();
                     $item->save();
+                    DB::commit();
                 }catch (\Exception $e){
                 }catch (\Exception $e){
+                    DB::rollBack();
                     echo 'error:' . $item['id'] . $e->getMessage() . PHP_EOL . date('Y-m-d H:i:s');
                     echo 'error:' . $item['id'] . $e->getMessage() . PHP_EOL . date('Y-m-d H:i:s');
                     errorLog('项目初始化失败', $item, $e);
                     errorLog('项目初始化失败', $item, $e);
                     $item->status = NoticeLog::STATUS_FAIL;
                     $item->status = NoticeLog::STATUS_FAIL;