Commit 4eab3b35 authored by 王源's avatar 王源 🎧

调整导出文件命名方式[真实名称-时间戳]

parent c81f753e
......@@ -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('不支持此种下载类型');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment