From 8eaa5559ef34658f57b62d69436a7607198e476c Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Wed, 2 Apr 2025 16:23:29 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E5=90=84?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/common.php                            | 3 ++-
 app/admin/controller/v1/Agent.php               | 2 +-
 app/admin/controller/v1/Article.php             | 2 +-
 app/admin/controller/v1/ArticleLeaveMessage.php | 2 +-
 app/admin/controller/v1/BannerItem.php          | 2 +-
 app/admin/controller/v1/BulkPurchaseInquiry.php | 2 +-
 app/admin/controller/v1/LeaveMessage.php        | 6 +++---
 app/admin/controller/v1/Menu.php                | 2 +-
 app/admin/controller/v1/Product.php             | 2 +-
 app/admin/controller/v1/ProductPurchaseLink.php | 2 +-
 app/admin/controller/v1/Video.php               | 2 +-
 11 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/admin/common.php b/app/admin/common.php
index e0665372..d555d576 100644
--- a/app/admin/common.php
+++ b/app/admin/common.php
@@ -115,13 +115,14 @@ if (!function_exists('xlsx_writer')) {
         flush();
         ob_flush();
         if ($filename == '') $filename = date('YmdHis');
+        $filename = urlencode($filename);
         // 文件写入缓冲区
         \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($spreadsheet, 'Xlsx')->save($output);
         // 从缓冲区获取导出文件，并通过Response返回（解决thinkphp框架的Response无法获取设置的header问题）
         $file_data = ob_get_clean();
         $response  = \think\Response::create($file_data)->header([
             'Access-Control-Expose-Headers' => 'Content-Disposition',
-            'Content-Type'                  => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet; Charset=UTF-8',
+            'Content-Type'                  => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet; charset=UTF-8',
             'Content-Disposition'           => 'attachment;filename=' . $filename . '.xlsx',
             'Cache-Control'                 => 'max-age=0'
         ]);
diff --git a/app/admin/controller/v1/Agent.php b/app/admin/controller/v1/Agent.php
index 0b470c0d..2866a7af 100644
--- a/app/admin/controller/v1/Agent.php
+++ b/app/admin/controller/v1/Agent.php
@@ -93,7 +93,7 @@ class Agent
         $agents = $this->getAgentExportData();
 
         // 导出
-        return xlsx_writer($agents, $schema);
+        return xlsx_writer($agents, $schema, '代理商申请列表' . date('YmdHis'));
     }
     // 获取要导出的代理商数据
     private function getAgentExportData()
diff --git a/app/admin/controller/v1/Article.php b/app/admin/controller/v1/Article.php
index 721bc0df..7da11d8b 100644
--- a/app/admin/controller/v1/Article.php
+++ b/app/admin/controller/v1/Article.php
@@ -217,7 +217,7 @@ class Article
         $data = $this->getExportArticleData();
         
         // 导出
-        return xlsx_writer($data, $schema);
+        return xlsx_writer($data, $schema, '文章列表' . date('YmdHis'));
     }
 
     // 获取文章导出数据
diff --git a/app/admin/controller/v1/ArticleLeaveMessage.php b/app/admin/controller/v1/ArticleLeaveMessage.php
index f808acc3..a40da98c 100644
--- a/app/admin/controller/v1/ArticleLeaveMessage.php
+++ b/app/admin/controller/v1/ArticleLeaveMessage.php
@@ -105,7 +105,7 @@ class ArticleLeaveMessage
         $data = $this->getExportMessageData();
         
         // 导出
-        return xlsx_writer($data, $schema);
+        return xlsx_writer($data, $schema, '文章评论列表' . date('YmdHis'));
     }
     private function getExportMessageData()
     {
diff --git a/app/admin/controller/v1/BannerItem.php b/app/admin/controller/v1/BannerItem.php
index cb5b0144..08ce0c27 100644
--- a/app/admin/controller/v1/BannerItem.php
+++ b/app/admin/controller/v1/BannerItem.php
@@ -196,7 +196,7 @@ class BannerItem
         $banner_items = $this->getBannerExportData();
 
         // 导出
-        return xlsx_writer($banner_items, $schema);
+        return xlsx_writer($banner_items, $schema, 'banner列表' . date('YmdHis'));
     }
     // 获取导出数据
     private function getBannerExportData()
diff --git a/app/admin/controller/v1/BulkPurchaseInquiry.php b/app/admin/controller/v1/BulkPurchaseInquiry.php
index 07562d00..74f0b66e 100644
--- a/app/admin/controller/v1/BulkPurchaseInquiry.php
+++ b/app/admin/controller/v1/BulkPurchaseInquiry.php
@@ -86,7 +86,7 @@ class BulkPurchaseInquiry
         $data = $this->getExportData();
 
         // 导出
-        return xlsx_writer($data, $schema);
+        return xlsx_writer($data, $schema, '批量购买询盘列表' . date('YmdHis'));
     }
     // 获取要导出的采购询盘数据
     private function getExportData()
diff --git a/app/admin/controller/v1/LeaveMessage.php b/app/admin/controller/v1/LeaveMessage.php
index f8a9cabd..67f115b7 100644
--- a/app/admin/controller/v1/LeaveMessage.php
+++ b/app/admin/controller/v1/LeaveMessage.php
@@ -40,19 +40,19 @@ class LeaveMessage
     public function export()
     {
         $schema = [
+            'created_at' => '提交时间',
             'id'         => 'ID',
             'name'       => '姓名',
             'email'      => '邮箱',
             'ip'         => 'IP',
-            'content'    => '留言内容',
-            'created_at' => '提交时间'
+            'content'    => '留言内容'
         ];
 
         // 获取留言导出数据
         $msgs = $this->getLeaveMessageExportData();
 
         // 导出
-        return xlsx_writer($msgs, $schema);
+        return xlsx_writer($msgs, $schema, '联系我们列表' . date('YmdHis'));
     }
     // 获取留言导出数据
     private function getLeaveMessageExportData()
diff --git a/app/admin/controller/v1/Menu.php b/app/admin/controller/v1/Menu.php
index 68504634..56bdcaf3 100644
--- a/app/admin/controller/v1/Menu.php
+++ b/app/admin/controller/v1/Menu.php
@@ -433,7 +433,7 @@ class Menu
         $data = $this->getExportMenuData();
 
         // 导出
-        return xlsx_writer($data, $schema, '', 'php://output', 'file');
+        return xlsx_writer($data, $schema, '菜单列表' . date('YmdHis'), 'php://output', 'file');
     }
     private function getExportMenuData()
     {
diff --git a/app/admin/controller/v1/Product.php b/app/admin/controller/v1/Product.php
index 844c7b9d..d94aeea5 100644
--- a/app/admin/controller/v1/Product.php
+++ b/app/admin/controller/v1/Product.php
@@ -339,7 +339,7 @@ class Product
         $data = $this->getExportProductData();
 
         // 导出
-        return xlsx_writer($data, $schema);
+        return xlsx_writer($data, $schema, '产品列表' . date('YmdHis'));
     }
     // 获取产品导出数据
     private function getExportProductData()
diff --git a/app/admin/controller/v1/ProductPurchaseLink.php b/app/admin/controller/v1/ProductPurchaseLink.php
index 03bb782f..e107d8aa 100644
--- a/app/admin/controller/v1/ProductPurchaseLink.php
+++ b/app/admin/controller/v1/ProductPurchaseLink.php
@@ -263,7 +263,7 @@ class ProductPurchaseLink
         $data = $this->getExportLinkData();
 
         /// 导出
-        return xlsx_writer($data, $schema);
+        return xlsx_writer($data, $schema, '产品购买链接' . date('YmdHis'));
     }
     private function getExportLinkData()
     {
diff --git a/app/admin/controller/v1/Video.php b/app/admin/controller/v1/Video.php
index a37a9dcd..4cddc154 100644
--- a/app/admin/controller/v1/Video.php
+++ b/app/admin/controller/v1/Video.php
@@ -199,7 +199,7 @@ class Video
         $data = $this->getExportVideoData();
 
         // 导出
-        return xlsx_writer($data, $schema);
+        return xlsx_writer($data, $schema, '视频列表' . date('YmdHis'));
     }
     private function getExportVideoData()
     {