From 9c78d09759ef65830e11dd610d7b57af9dd22ec1 Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Fri, 23 Jul 2021 19:20:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E5=88=A0=E9=99=A4=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=85=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Cache.php | 22 +++++++++++-----------
 extend/base/FileUtil.php       |  9 +++++----
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/admin/controller/Cache.php b/app/admin/controller/Cache.php
index 73b72d3d6..a474df908 100755
--- a/app/admin/controller/Cache.php
+++ b/app/admin/controller/Cache.php
@@ -67,11 +67,11 @@ class Cache extends Common
 		// 模板 cache
 		// 系统配置缓存 data
 		// 模板数据 temp
-		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'cache');
-		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'data');
-		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'admin'.DS.'temp');
-		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'index'.DS.'temp');
-		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'api'.DS.'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);
 
 		// 缓存操作清除
 		\think\facade\Cache::clear();
@@ -89,9 +89,9 @@ class Cache extends Common
 	public function TemplateUpdate()
 	{
 		// 模板 cache
-		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'admin'.DS.'temp');
-		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'index'.DS.'temp');
-		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'api'.DS.'temp');
+		\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);
 
 		return $this->success('更新成功');
 	}
@@ -117,9 +117,9 @@ class Cache extends Common
 	 */
 	public function LogDelete()
 	{
-		\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');
+		\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);
 
 		return $this->success('更新成功');
 	}
diff --git a/extend/base/FileUtil.php b/extend/base/FileUtil.php
index 4e1692176..ec67266a1 100755
--- a/extend/base/FileUtil.php
+++ b/extend/base/FileUtil.php
@@ -177,9 +177,10 @@ class FileUtil
      * @date    2018-06-29
      * @desc    description
      * @param   [string]     $aim_dir      [地址]
+     * @param   [boolean]    $is_del_dir   [是否删除目录]
      * @return  [boolean]                  [true | false]
      */
-    public static function UnlinkDir($aim_dir)
+    public static function UnlinkDir($aim_dir, $is_del_dir = true)
     {
         $aim_dir = str_replace('', '/', $aim_dir);
         $aim_dir = substr($aim_dir, -1) == '/' ? $aim_dir : $aim_dir . '/';
@@ -196,13 +197,13 @@ class FileUtil
             }
             if(!is_dir($aim_dir . $file))
             {
-                self::UnlinkFile($aim_dir . $file);
+                self::UnlinkFile($aim_dir . $file, $is_del_dir);
             } else {
-                self::UnlinkDir($aim_dir . $file);
+                self::UnlinkDir($aim_dir . $file, $is_del_dir);
             }
         }
         closedir($dir_handle);
-        return rmdir($aim_dir);
+        return $is_del_dir ? rmdir($aim_dir) : true;
     }
 
     /**
-- 
GitLab