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

@@ -292,13 +292,14 @@ class FileController
             $this->response('指定文件不存在!', Code::USER_ERROR);
             $this->response('指定文件不存在!', Code::USER_ERROR);
         }
         }
         if($info['is_cos'] == 1){
         if($info['is_cos'] == 1){
-
+            $cos = new CosService();
+            return $cos->downloadFile($info['path']);
         }else{
         }else{
             $fileUrl = $this->config['root'].'/'.$info['path'];
             $fileUrl = $this->config['root'].'/'.$info['path'];
             if (!is_file($fileUrl)) {
             if (!is_file($fileUrl)) {
                 $this->response('指定文件已被系统删除!', Code::USER_ERROR);
                 $this->response('指定文件已被系统删除!', Code::USER_ERROR);
             }
             }
-            $fileName = 'downloaded_file'.'.'.$info['type'];  // 要保存的文件名
+            $fileName = basename($info['path']);  // 要保存的文件名
             // 设置响应头
             // 设置响应头
             header('Content-Type: application/octet-stream');
             header('Content-Type: application/octet-stream');
             header('Content-Disposition: attachment; filename="' . $fileName . '"');
             header('Content-Disposition: attachment; filename="' . $fileName . '"');

@@ -77,7 +77,7 @@ class CosService
                 'secretKey' => $cos['credentials']['secretKey'],
                 'secretKey' => $cos['credentials']['secretKey'],
             ],
             ],
         ]);
         ]);
-        $saveAs = 'C:\Users\\' . get_current_user() . '\Desktop\filename.ext';
+        $saveAs = 'C:\Users\\' . get_current_user() . '\Desktop\\'.basename($file_name);
         return $cosClient->getObject(['Bucket' => $cos['bucket'], 'Key' => trim($file_name,'/'), 'SaveAs' => $saveAs]);
         return $cosClient->getObject(['Bucket' => $cos['bucket'], 'Key' => trim($file_name,'/'), 'SaveAs' => $saveAs]);
     }
     }
 }
 }