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

@@ -32,18 +32,16 @@ class CopyImageFileListener implements ShouldQueue
         if(!empty($imageList)){
         if(!empty($imageList)){
             $amazonS3Service = new AmazonS3Service();
             $amazonS3Service = new AmazonS3Service();
             foreach ($imageList as $k => $v){
             foreach ($imageList as $k => $v){
-                $rs = $amazonS3Service->syncImageFiles(getImageUrl($v['path']),$v['size']);
+                $amazonS3Service->syncImageFiles(getImageUrl($v['path']));
                 $imageModel->edit(['is_cos'=>0],['id'=>$v['id']]);
                 $imageModel->edit(['is_cos'=>0],['id'=>$v['id']]);
             }
             }
         }
         }
-
-        sleep(2);
         $fileModel = new FileModel();
         $fileModel = new FileModel();
         $fileList = $fileModel->list(['project_id'=>$this->param['project_id'],'is_cos'=>1],'id',['id','path','is_cos']);
         $fileList = $fileModel->list(['project_id'=>$this->param['project_id'],'is_cos'=>1],'id',['id','path','is_cos']);
         if(!empty($fileList)){
         if(!empty($fileList)){
             $amazonS3Service = new AmazonS3Service();
             $amazonS3Service = new AmazonS3Service();
             foreach ($fileList as $k => $v){
             foreach ($fileList as $k => $v){
-                $amazonS3Service->syncImageFiles(getImageUrl($v['path']),$v['size']);
+                $amazonS3Service->syncImageFiles(getImageUrl($v['path']));
                 $fileList->edit(['is_cos'=>0],['id'=>$v['id']]);
                 $fileList->edit(['is_cos'=>0],['id'=>$v['id']]);
             }
             }
         }
         }

@@ -69,7 +69,7 @@ class AmazonS3Service
         $file_link = $this->fetchRemoteImage($files);
         $file_link = $this->fetchRemoteImage($files);
         @file_put_contents(storage_path('logs/lyh_error.log'), var_export('图片:'.$file_link, true) . PHP_EOL, FILE_APPEND);
         @file_put_contents(storage_path('logs/lyh_error.log'), var_export('图片:'.$file_link, true) . PHP_EOL, FILE_APPEND);
         $key = str_replace_url($files);
         $key = str_replace_url($files);
-//        try {
+        try {
             $context = stream_context_create([
             $context = stream_context_create([
                 'ssl' => [
                 'ssl' => [
                     'verify_peer' => false,
                     'verify_peer' => false,
@@ -79,13 +79,13 @@ class AmazonS3Service
             $file_content = file_get_contents($file_link, false, $context);
             $file_content = file_get_contents($file_link, false, $context);
             $result = $this->s3->putObject([
             $result = $this->s3->putObject([
                 'Bucket' => $this->bucket,
                 'Bucket' => $this->bucket,
-                'Key' => $key,
+                'Key' => ltrim($key,'/'),
                 'Body' => $file_content,
                 'Body' => $file_content,
             ]);
             ]);
             return $result['ObjectURL'];
             return $result['ObjectURL'];
-//        } catch (AwsException $e) {
-//            return '上传文件到S3时发生错误：' . $e->getMessage();
-//        }
+        } catch (AwsException $e) {
+            return '上传文件到S3时发生错误：' . $e->getMessage();
+        }
     }
     }
 
 
     /**
     /**