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

@@ -277,7 +277,6 @@ class ImageController extends Controller
                 $data[] = $this->responseData($image_hash['path']);
                 $data[] = $this->responseData($image_hash['path']);
                 continue;
                 continue;
             }
             }
-            $url = $this->config['root'].$this->path;
             $image_type = $file->getClientOriginalExtension();
             $image_type = $file->getClientOriginalExtension();
             $fileName = uniqid().rand(10000,99999).'.'.$image_type;
             $fileName = uniqid().rand(10000,99999).'.'.$image_type;
             //同步数据到cos
             //同步数据到cos

@@ -42,7 +42,7 @@ class AmazonS3Service
      */
      */
     public function uploadFiles(&$files, $s3Key,$filename)
     public function uploadFiles(&$files, $s3Key,$filename)
     {
     {
-        $key = $s3Key.'/'.$filename;
+        $key = ltrim($s3Key.'/'.$filename,'/');
         $body = $files->getRealPath();
         $body = $files->getRealPath();
         try {
         try {
             $result = $this->s3->putObject([
             $result = $this->s3->putObject([