From 2e4bb13cf1d6e8eab3ffb38e27be52070e98681d Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 3 Jan 2020 09:53:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=92=E4=BB=B6=E6=A8=A1?=
=?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/admin/controller/api/Plugs.php | 2 +-
app/admin/controller/api/Upload.php | 15 +--------------
app/admin/view/api/{plugs => }/icon.html | 0
app/admin/view/api/{plugs => }/upload.js | 0
4 files changed, 2 insertions(+), 15 deletions(-)
rename app/admin/view/api/{plugs => }/icon.html (100%)
rename app/admin/view/api/{plugs => }/upload.js (100%)
diff --git a/app/admin/controller/api/Plugs.php b/app/admin/controller/api/Plugs.php
index 10a9d1004..30347603f 100644
--- a/app/admin/controller/api/Plugs.php
+++ b/app/admin/controller/api/Plugs.php
@@ -32,7 +32,7 @@ class Plugs extends Controller
{
$this->title = '图标选择器';
$this->field = input('field', 'icon');
- $this->fetch();
+ $this->fetch(realpath(__DIR__ . '/../../view/api/icon.html'));
}
}
diff --git a/app/admin/controller/api/Upload.php b/app/admin/controller/api/Upload.php
index c5ee05d4f..36b764dee 100644
--- a/app/admin/controller/api/Upload.php
+++ b/app/admin/controller/api/Upload.php
@@ -41,24 +41,11 @@ class Upload extends Controller
foreach (explode(',', sysconf('storage.allow_exts')) as $ext) {
$data['exts'][$ext] = Storage::mime($ext);
}
- $template = realpath(__DIR__ . '/../../view/api/plugs/upload.js');
+ $template = realpath(__DIR__ . '/../../view/api/upload.js');
$data['exts'] = json_encode($data['exts'], JSON_UNESCAPED_UNICODE);
return view($template, $data)->contentType('application/x-javascript');
}
- /**
- * 上传安全检查
- * @login true
- * @throws \think\db\exception\DataNotFoundException
- * @throws \think\db\exception\DbException
- * @throws \think\db\exception\ModelNotFoundException
- */
- public function check()
- {
- $exts = array_intersect(explode(',', input('exts', '')), explode(',', sysconf('storage.allow_exts')));
- $this->success('获取文件上传参数', ['exts' => join('|', $exts), 'mime' => Storage::mime($exts)]);
- }
-
/**
* 检查文件上传已经上传
* @login true
diff --git a/app/admin/view/api/plugs/icon.html b/app/admin/view/api/icon.html
similarity index 100%
rename from app/admin/view/api/plugs/icon.html
rename to app/admin/view/api/icon.html
diff --git a/app/admin/view/api/plugs/upload.js b/app/admin/view/api/upload.js
similarity index 100%
rename from app/admin/view/api/plugs/upload.js
rename to app/admin/view/api/upload.js