Merge branch 'test' into shopify

src/Manager/UploadManager.php

@@ -146,13 +146,13 @@ class UploadManager
             // 文件重命名,由当前日期时间 + 唯一ID + 扩展名
             $fileName = date('YmdHis') . uniqid() . '.' . $extension;
             $name = $file->toArray()['name'];
-            $savePath = self::parsePath($options, $documentRoot) . $fileName.'_'.$name;
+            $savePath = self::parsePath($options, $documentRoot) . $fileName;
             $file->moveTo($savePath);
             if ($file->isMoved()) {
                 if ($realPath) {
-                    return $savePath;
+                    return $savePath.'?'.$name;
                 } else {
-                    return str_replace($documentRoot, '', $savePath);
+                    return str_replace($documentRoot, '', $savePath.'?'.$name);
                 }
             } else {
                 throw new HttpResponseException('文件保存失败');

src/Tools/Exporter.php

@@ -326,12 +326,12 @@ class Exporter
         if (!$filename) {
             $filename = $this->name ? $this->name : rand(1, 9999999) . time() . rand(1, 9999999);
         }
-        $filename .= "." . strtolower($this->fileType);
         $this->reader->setActiveSheetIndex(0);
         $objWriter = IOFactory::createWriter($this->reader, $this->fileType);
         switch ($downloadType) {
             case self::DOWNLOAD_TYPE_STREAM:
             case self::DOWNLOAD_TYPE_SAVE_AND_DOWNLOAD:
+                $filename .= "." . strtolower($this->fileType);
                 if ($this->fileType == 'Xlsx') {
                     header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
                 } elseif ($this->fileType == 'Xls') {
@@ -371,9 +371,9 @@ class Exporter
             case self::DOWNLOAD_TYPE_RETURN_FILE_PATH:
                 $filePath = $this->rootPath . "/export/";
                 !is_dir($filePath) && mkdir($filePath, 0777, true);
-                $fileName = $filePath . date('YmdHis') . '-' . $filename;
-                $objWriter->save($fileName);
-                return $this->config->get('app_domain') . str_replace($this->rootPath, '', $fileName);
+                $fileReadPath = $filePath . $filename . '-' . date('YmdHis') . "." . strtolower($this->fileType);
+                $objWriter->save($fileReadPath);
+                return $this->config->get('app_domain') . str_replace($this->rootPath, '', $fileReadPath);
                 break;
             default:
                 throw new \Exception('不支持此种下载类型');

src/functions.php

@@ -125,6 +125,19 @@ if (!function_exists('fail')) {
     }
 }
 
+if (!function_exists('download')) {
+    /**
+     * 文件流下载文件
+     * @param string $filePath 文件路径
+     * @param string $showName 下载后展示的名称
+     * @return mixed
+     */
+    function download($filePath = '', $showName = '')
+    {
+        return response()->download($filePath, urlencode($showName));
+    }
+}
+
 if (!function_exists('decimal_to_abc')) {
     /**
      * 数字转换对应26个字母
@@ -731,10 +744,10 @@ if (!function_exists('to_camel_case')) {
     {
         $array = explode($dirSep, $str);
         $result = $array[0];
-        $len=count($array);
-        if($len>1) {
-            for($i=1;$i<$len;$i++) {
-                $result.= ucfirst($array[$i]);
+        $len = count($array);
+        if ($len > 1) {
+            for ($i = 1; $i < $len; $i++) {
+                $result .= ucfirst($array[$i]);
             }
         }
         return $result;