合并分支 'develop' 到 'master'

更新异步处理复制项目



查看合并请求 !382

@@ -47,20 +47,19 @@ class CopyProjectJob implements ShouldQueue
      * @param  UpdateHtml  $event
      * @param  UpdateHtml  $event
      * @return void
      * @return void
      */
      */
-    public function handle(CopyProject $event)
+    public function handle()
     {
     {
-        $this->param = $event->data;
-        $this->model = new Project();
+        $projectModel = new Project();
         DB::beginTransaction();
         DB::beginTransaction();
         try {
         try {
             //复制初始项目
             //复制初始项目
-            $data = $this->model::where('id', $this->param['project_id'])->first();
+            $data = $projectModel::where('id', $this->param['project_id'])->first();
             $data = $data->getAttributes();
             $data = $data->getAttributes();
             $type = $data['type'];
             $type = $data['type'];
             $data['type'] = 0;
             $data['type'] = 0;
             $data['title'] = $data['title'].'-copy';
             $data['title'] = $data['title'].'-copy';
             unset($data['id']);
             unset($data['id']);
-            $project_id = $this->model->insertGetId($data);
+            $project_id = $projectModel->insertGetId($data);
             //复制部署表
             //复制部署表
             $buildModel = new DeployBuild();
             $buildModel = new DeployBuild();
             $buildData = $buildModel::where('project_id', $this->param['project_id'])->first();
             $buildData = $buildModel::where('project_id', $this->param['project_id'])->first();