From b049420b7968870725cfb5fcaef051c2d9e1ae07 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Mon, 11 Sep 2023 18:30:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0apk=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/merchant/Common.php | 13 ++++++-------
 config/upload.php                  |  2 +-
 route/api.php                      |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/controller/merchant/Common.php b/app/controller/merchant/Common.php
index 922c73c2..d3307200 100644
--- a/app/controller/merchant/Common.php
+++ b/app/controller/merchant/Common.php
@@ -273,18 +273,17 @@ class Common extends BaseController
         return app('json')->success(['src' => tidy_url($upload->getFileInfo()->filePath)]);
     }
 
-    public function uploadFile()
+    public function uploadApp()
     {
         $file = $this->request->file('file');
         if (!$file)
             return app('json')->fail('请上传文件');
-        validate(["file|文件" => [
-            'fileSize' => config('upload.filesize'),
-            'fileExt' => 'apk,ipa,doc,pdf,txt',
-            'fileMime' => '',
-        ]])->check(['file' => $file]);
+        // validate(["file|文件" => [
+        //     'fileSize' => config('upload.filesize'),
+        //     'fileExt' => 'apk,ipa'
+        // ]])->check(['file' => $file]);
         $upload = UploadService::create();
-        $data = $upload->to('media')->validate([])->move('file');
+        $data = $upload->to('app')->validate([])->move('file');
         if ($data === false) {
             return app('json')->fail($upload->getError());
         }
diff --git a/config/upload.php b/config/upload.php
index 881867b5..19b46541 100644
--- a/config/upload.php
+++ b/config/upload.php
@@ -19,7 +19,7 @@ return [
     //上传文件大小
     'filesize' => 52428800,
     //上传文件后缀类型
-    'fileExt' => ['jpg', 'jpeg', 'png', 'gif', 'pem', 'mp3', 'wma', 'wav', 'amr', 'mp4', 'key','xlsx','xls','ico'],
+    'fileExt' => ['jpg', 'jpeg', 'png', 'gif', 'pem', 'mp3', 'wma', 'wav', 'amr', 'mp4', 'key', 'xlsx', 'xls', 'ico', 'apk', 'ipa'],
     //上传文件类型
     'fileMime' => ['image/jpeg', 'image/gif', 'image/png', 'text/plain', 'audio/mpeg', 'image/vnd.microsoft.icon'],
     //驱动模式
diff --git a/route/api.php b/route/api.php
index 8fdcda2d..2234419e 100644
--- a/route/api.php
+++ b/route/api.php
@@ -552,7 +552,7 @@ Route::group('api/', function () {
         })->prefix('api.article.');
 
         Route::post('upload/video', 'merchant.Common/uploadVideo');
-        Route::post('upload/file', 'merchant.Common/uploadFile');
+        Route::post('upload/app', 'merchant.Common/uploadApp');
         Route::get('excel/download/:id', 'merchant.store.order.Order/download');
         //申请商户
         Route::post('intention/create', 'api.store.merchant.MerchantIntention/create');