From dfb88ee09e24558bc206187acf32775f2a8ffb25 Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Sat, 25 May 2024 21:55:04 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96storage=E4=B8=8A=E4=BC=A0mi?=
 =?UTF-8?q?meType=E6=A3=80=E6=9F=A5=202.=E5=A2=9E=E5=8A=A0=E6=89=93?=
 =?UTF-8?q?=E5=BC=80/=E5=85=B3=E9=97=AD=E5=B7=A6=E4=BE=A7=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Admin/Views/index/index.volt |  2 +-
 app/Services/MyStorage.php            | 16 ++++------------
 public/static/admin/js/index.js       |  2 ++
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/app/Http/Admin/Views/index/index.volt b/app/Http/Admin/Views/index/index.volt
index 7f90ffa5..dc35b1a2 100644
--- a/app/Http/Admin/Views/index/index.volt
+++ b/app/Http/Admin/Views/index/index.volt
@@ -15,7 +15,7 @@
     <div class="layui-header">
         <div class="layui-logo">{{ site_info.title }}</div>
         <div class="kg-side-menu-bar">
-            <a href="javascript:"><i class="layui-icon layui-icon-spread-left"></i></a>
+            <a href="javascript:" title="关闭左侧菜单"><i class="layui-icon layui-icon-spread-left"></i></a>
         </div>
         <ul class="layui-nav layui-layout-left kg-nav-module">
             <li class="layui-nav-item">
diff --git a/app/Services/MyStorage.php b/app/Services/MyStorage.php
index 94a96fd9..36c2f35c 100644
--- a/app/Services/MyStorage.php
+++ b/app/Services/MyStorage.php
@@ -10,6 +10,7 @@ namespace App\Services;
 use App\Library\Utils\FileInfo;
 use App\Models\Upload as UploadModel;
 use App\Repos\Upload as UploadRepo;
+use InvalidArgumentException;
 
 class MyStorage extends Storage
 {
@@ -173,16 +174,6 @@ class MyStorage extends Storage
         return $this->upload('/img/icon', self::MIME_IMAGE, UploadModel::TYPE_ICON_IMG);
     }
 
-    /**
-     * 上传课件资源
-     *
-     * @return UploadModel|bool
-     */
-    public function uploadResource()
-    {
-        return $this->upload('/resource', self::MIME_FILE, UploadModel::TYPE_RESOURCE);
-    }
-
     /**
      * 上传文件
      *
@@ -205,7 +196,8 @@ class MyStorage extends Storage
             foreach ($files as $file) {
 
                 if (!$this->checkFile($file->getRealType(), $mimeType)) {
-                    continue;
+                    $message = sprintf('MimeType: "%s" not in secure whitelist', $file->getRealType());
+                    throw new InvalidArgumentException($message);
                 }
 
                 $md5 = md5_file($file->getTempName());
@@ -221,7 +213,7 @@ class MyStorage extends Storage
                     if (empty($fileName)) {
                         $keyName = $this->generateFileName($extension, $prefix);
                     } else {
-                        $keyName = $prefix .'/'. $fileName;
+                        $keyName = $prefix . '/' . $fileName;
                     }
 
                     $path = $this->putFile($keyName, $file->getTempName());
diff --git a/public/static/admin/js/index.js b/public/static/admin/js/index.js
index 0e764eee..f72c466b 100644
--- a/public/static/admin/js/index.js
+++ b/public/static/admin/js/index.js
@@ -27,10 +27,12 @@ layui.use(['jquery', 'element'], function () {
         $('.layui-side').toggle();
 
         if (icon.hasClass(spreadLeft)) {
+            $(this).attr('title', '打开左侧菜单');
             icon.removeClass(spreadLeft).addClass(shrinkRight);
             body.css('left', 0);
             footer.css('left', 0);
         } else {
+            $(this).attr('title', '关闭左侧菜单');
             icon.removeClass(shrinkRight).addClass(spreadLeft);
             body.css('left', '200px');
             footer.css('left', '200px');