From 4b859eb0ed98e1397c055997f12fe3e1ce377a7f Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 27 Jun 2022 14:28:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/File.php       | 18 +++++++++++++++++-
 app/admin/controller/api/Upload.php |  2 +-
 app/admin/view/file/index.html      |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/admin/controller/File.php b/app/admin/controller/File.php
index 0a36fce42..e5028c901 100644
--- a/app/admin/controller/File.php
+++ b/app/admin/controller/File.php
@@ -38,14 +38,30 @@ class File extends Controller
         SystemFile::mQuery()->layTable(function () {
             $this->title = '系统文件管理';
         }, function (QueryHelper $query) {
+            $query->where(['issafe' => 0, 'status' => 2]);
             $query->like('name,hash,xext')->dateBetween('create_at');
         });
     }
 
-    protected function _page_filter(&$data)
+    /**
+     * 数据列表处理
+     * @param array $data
+     * @return void
+     */
+    protected function _page_filter(array &$data)
     {
         foreach ($data as &$vo) {
             $vo['ctype'] = $this->types[$vo['type']] ?? $vo['type'];
         }
     }
+
+    /**
+     * 删除系统文件
+     * @auth true
+     * @return void
+     */
+    public function remove()
+    {
+        SystemFile::mDelete();
+    }
 }
\ No newline at end of file
diff --git a/app/admin/controller/api/Upload.php b/app/admin/controller/api/Upload.php
index 4824686d8..63bebc4a6 100644
--- a/app/admin/controller/api/Upload.php
+++ b/app/admin/controller/api/Upload.php
@@ -152,8 +152,8 @@ class Upload extends Controller
         SystemFile::mQuery()->layTable(function () {
             $this->title = '文件选择器';
         }, function (QueryHelper $query) {
-            $query->where(['status' => 2])->order('id desc');
             $query->like('name,hash')->dateBetween('create_at');
+            $query->where(['status' => 2, 'issafe' => 0])->order('id desc');
         });
     }
 
diff --git a/app/admin/view/file/index.html b/app/admin/view/file/index.html
index 3abd2c8fa..a9135c198 100644
--- a/app/admin/view/file/index.html
+++ b/app/admin/view/file/index.html
@@ -20,7 +20,7 @@
             cols: [[
                 {checkbox: true, fixed: true},
                 {field: 'name', title: '文件名称', minWidth: 120, align: 'center'},
-                {field: 'hash', title: '文件哈希', minWidth: 180, align: 'center'},
+                {field: 'hash', title: '文件哈希', minWidth: 200, align: 'center'},
                 {field: 'size', title: '文件大小', align: 'center', minWidth: 100, sort: true},
                 {field: 'xext', title: '文件后缀', align: 'center', minWidth: 100, sort: true},
                 {