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

Master lyh edit



查看合并请求 !586

@@ -42,27 +42,27 @@ class Demo extends Command
     {
     {
         $this->param['project_id'] = 181;
         $this->param['project_id'] = 181;
         $imageModel = new ImageModel();
         $imageModel = new ImageModel();
-//        //获取当前项目的所有图片
-//        $imageList = $imageModel->list(['project_id'=>$this->param['project_id'],'is_cos'=>1],'id',['id','path','is_cos','size']);
-//        if(!empty($imageList)){
-//            $amazonS3Service = new AmazonS3Service();
-//            foreach ($imageList as $k => $v){
-//                $amazonS3Service->syncImageFiles(getImageUrl($v['path']));
-//                $imageModel->edit(['is_cos'=>0],['id'=>$v['id']]);
-//            }
-//        }
-
-        $fileModel = new FileModel();
-        $fileList = $fileModel->list(['project_id'=>$this->param['project_id'],'is_cos'=>1],'id',['id','path','is_cos','name']);
-        if(!empty($fileList)){
+        //获取当前项目的所有图片
+        $imageList = $imageModel->list(['project_id'=>$this->param['project_id'],'is_cos'=>1],'id',['id','path','is_cos','size']);
+        if(!empty($imageList)){
             $amazonS3Service = new AmazonS3Service();
             $amazonS3Service = new AmazonS3Service();
-            foreach ($fileList as $k => $v){
-                echo date('Y-m-d H:i:s') . '执行的数据id:' . $v['id'] . '名称：'.$v['name'] . PHP_EOL;
-                $amazonS3Service->syncImageFiles(getFileUrl($v['path']));
-                $fileModel->edit(['is_cos'=>0],['id'=>$v['id']]);
-                gc_collect_cycles();
+            foreach ($imageList as $k => $v){
+                $amazonS3Service->syncImageFiles(getImageUrl($v['path']));
+                $imageModel->edit(['is_cos'=>0],['id'=>$v['id']]);
             }
             }
         }
         }
+
+//        $fileModel = new FileModel();
+//        $fileList = $fileModel->list(['project_id'=>$this->param['project_id'],'is_cos'=>1],'id',['id','path','is_cos','name']);
+//        if(!empty($fileList)){
+//            $amazonS3Service = new AmazonS3Service();
+//            foreach ($fileList as $k => $v){
+//                echo date('Y-m-d H:i:s') . '执行的数据id:' . $v['id'] . '名称：'.$v['name'] . PHP_EOL;
+//                $amazonS3Service->syncImageFiles(getFileUrl($v['path']));
+//                $fileModel->edit(['is_cos'=>0],['id'=>$v['id']]);
+//                gc_collect_cycles();
+//            }
+//        }
         return true;
         return true;
     }
     }
 
 

@@ -64,6 +64,15 @@ class CopyProjectJob implements ShouldQueue
             $project_id = $projectModel->insertGetId($data);
             $project_id = $projectModel->insertGetId($data);
             $hashids = new Hashids($data['from_order_id'], 13, 'abcdefghjkmnpqrstuvwxyz1234567890');
             $hashids = new Hashids($data['from_order_id'], 13, 'abcdefghjkmnpqrstuvwxyz1234567890');
             $projectModel->edit(['from_order_id'=>$hashids->encode($project_id)],['id'=>$project_id]);
             $projectModel->edit(['from_order_id'=>$hashids->encode($project_id)],['id'=>$project_id]);
+            //复制设置的模版
+            $settingTemplateModel = new Setting();
+            $settingData = $settingTemplateModel::where('project_id', $this->param['project_id'])->first();
+            if(!empty($settingData)){
+                $settingData = $settingData->getAttributes();
+                unset($settingData['id']);
+                $settingData['project_id'] = $project_id;
+                $settingTemplateModel->insert($settingData);
+            }
             //复制部署表
             //复制部署表
             $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();
@@ -114,15 +123,6 @@ class CopyProjectJob implements ShouldQueue
                 $userData['project_id'] = $project_id;
                 $userData['project_id'] = $project_id;
                 $userModel->insert($userData);
                 $userModel->insert($userData);
             }
             }
-            //复制设置的模版
-            $settingTemplateModel = new Setting();
-            $settingData = $settingTemplateModel::where('project_id', $this->param['project_id'])->first();
-            if(!empty($settingData)){
-                $settingData = $settingData->getAttributes();
-                unset($settingData['id']);
-                $settingData['project_id'] = $project_id;
-                $settingTemplateModel->insert($settingData);
-            }
             DB::commit();
             DB::commit();
         }catch (\Exception $e){
         }catch (\Exception $e){
             DB::rollBack();
             DB::rollBack();