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

@@ -44,6 +44,7 @@ class AmazonS3Service
     {
         $key = $s3Key.'/'.$filename;
         $Body = $binary ? $files : fopen($files->getRealPath(), 'r');
+        $Body = is_resource($Body) ? stream_get_contents($Body) : $Body;
         try {
             $result = $this->s3->putObject([
                 'Bucket' => $this->bucket,