From 0cf2512c14e4b6b2d69c523ebdc6e83fb368eecf Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Sun, 25 Jul 2021 15:19:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Cache.php | 19 +++++++------------
 extend/base/FileUtil.php       |  4 ++--
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/app/admin/controller/Cache.php b/app/admin/controller/Cache.php
index a474df908..e60a1c158 100755
--- a/app/admin/controller/Cache.php
+++ b/app/admin/controller/Cache.php
@@ -66,12 +66,8 @@ class Cache extends Common
 	{
 		// 模板 cache
 		// 系统配置缓存 data
-		// 模板数据 temp
-		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'cache', false);
-		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'data', false);
-		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'admin'.DS.'temp', false);
-		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'index'.DS.'temp', false);
-		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'api'.DS.'temp', false);
+		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'cache');
+		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'data');
 
 		// 缓存操作清除
 		\think\facade\Cache::clear();
@@ -89,9 +85,8 @@ class Cache extends Common
 	public function TemplateUpdate()
 	{
 		// 模板 cache
-		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'admin'.DS.'temp', false);
-		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'index'.DS.'temp', false);
-		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'api'.DS.'temp', false);
+		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'index'.DS.'temp');
+		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'api'.DS.'temp');
 
 		return $this->success('更新成功');
 	}
@@ -117,9 +112,9 @@ class Cache extends Common
 	 */
 	public function LogDelete()
 	{
-		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'admin'.DS.'log', false);
-		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'index'.DS.'log', false);
-		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'api'.DS.'log', false);
+		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'admin'.DS.'log');
+		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'index'.DS.'log');
+		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'api'.DS.'log');
 
 		return $this->success('更新成功');
 	}
diff --git a/extend/base/FileUtil.php b/extend/base/FileUtil.php
index ec67266a1..5f4bbb08d 100755
--- a/extend/base/FileUtil.php
+++ b/extend/base/FileUtil.php
@@ -197,7 +197,7 @@ class FileUtil
             }
             if(!is_dir($aim_dir . $file))
             {
-                self::UnlinkFile($aim_dir . $file, $is_del_dir);
+                self::UnlinkFile($aim_dir . $file);
             } else {
                 self::UnlinkDir($aim_dir . $file, $is_del_dir);
             }
@@ -219,7 +219,7 @@ class FileUtil
     public static function UnlinkFile($aim_url)
     {
         $aim_url = str_replace('//', '/', $aim_url);
-        if(file_exists($aim_url))
+        if(file_exists($aim_url) && is_writable($aim_url))
         {
             unlink($aim_url);
             return true;