Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -25,13 +25,10 @@ class CopyImageFileListener implements ShouldQueue
      */
      */
     public function handle(CopyImageFile $event)
     public function handle(CopyImageFile $event)
     {
     {
-        @file_put_contents(storage_path('logs/lyh_error.log'), var_export('进入', true) . PHP_EOL, FILE_APPEND);
         $this->param = $event->data;
         $this->param = $event->data;
-        @file_put_contents(storage_path('logs/lyh_error.log'), var_export($this->param, true) . PHP_EOL, FILE_APPEND);
         $imageModel = new ImageModel();
         $imageModel = new ImageModel();
         //获取当前项目的所有图片
         //获取当前项目的所有图片
         $imageList = $imageModel->list(['project_id'=>$this->param['project_id'],'is_cos'=>1],'id',['id','path','is_cos']);
         $imageList = $imageModel->list(['project_id'=>$this->param['project_id'],'is_cos'=>1],'id',['id','path','is_cos']);
-        @file_put_contents(storage_path('logs/lyh_error.log'), var_export($imageList, true) . PHP_EOL, FILE_APPEND);
         if(!empty($imageList)){
         if(!empty($imageList)){
             $amazonS3Service = new AmazonS3Service();
             $amazonS3Service = new AmazonS3Service();
             foreach ($imageList as $k => $v){
             foreach ($imageList as $k => $v){

@@ -67,6 +67,8 @@ class AmazonS3Service
     public function syncImageFiles($files)
     public function syncImageFiles($files)
     {
     {
         $key = str_replace_url($files);
         $key = str_replace_url($files);
+        @file_put_contents(storage_path('logs/lyh_error.log'), var_export($key, true) . PHP_EOL, FILE_APPEND);
+
         $body = $files;
         $body = $files;
         try {
         try {
             $result = $this->s3->putObject([
             $result = $this->s3->putObject([
@@ -76,6 +78,7 @@ class AmazonS3Service
             ]);
             ]);
             return $result['ObjectURL'];
             return $result['ObjectURL'];
         } catch (AwsException $e) {
         } catch (AwsException $e) {
+            @file_put_contents(storage_path('logs/lyh_error.log'), var_export('图片:'.$e->getMessage(), true) . PHP_EOL, FILE_APPEND);
             return '上传文件到S3时发生错误：' . $e->getMessage();
             return '上传文件到S3时发生错误：' . $e->getMessage();
         }
         }
     }
     }