diff --git a/app/common/command/Curd.php b/app/common/command/Curd.php index d3d4aa8..35c3e7b 100644 --- a/app/common/command/Curd.php +++ b/app/common/command/Curd.php @@ -15,7 +15,7 @@ namespace app\common\command; use app\admin\model\SystemNode; use EasyAdmin\console\CliEcho; -use app\common\tools\BuildCurd; +use app\common\tools\BuildCurdTools; use think\console\Command; use think\console\Input; use think\console\input\Option; @@ -55,7 +55,7 @@ class Curd extends Command } try { - $build = (new BuildCurd()) + $build = (new BuildCurdTools()) ->setTable($table) ->setForce($force); diff --git a/app/common/command/Install.php b/app/common/command/Install.php index 0b41f21..68f415f 100644 --- a/app/common/command/Install.php +++ b/app/common/command/Install.php @@ -4,10 +4,9 @@ declare(strict_types=1); namespace app\common\command; -use app\common\tools\Path; +use app\common\tools\PathTools; use think\console\Command; use think\console\Input; -use think\console\input\Argument; use think\console\input\Option; use think\console\Output; use think\facade\App; @@ -92,7 +91,7 @@ class Install extends Command ]); // 处理安装文件 - Path::intiDir($install_lock_path); + PathTools::intiDir($install_lock_path); @file_put_contents($install_lock_path, date('Y-m-d H:i:s')); Db::commit(); } catch (\Exception $e) { diff --git a/app/common/tools/BuildCurd.php b/app/common/tools/BuildCurdTools.php similarity index 99% rename from app/common/tools/BuildCurd.php rename to app/common/tools/BuildCurdTools.php index 8aa7642..ac4e69a 100644 --- a/app/common/tools/BuildCurd.php +++ b/app/common/tools/BuildCurdTools.php @@ -2,10 +2,10 @@ namespace app\common\tools; -use EasyAdmin\curd\BuildCurd as CurdBuildCurd; +use EasyAdmin\curd\BuildCurd; use EasyAdmin\tool\CommonTool; -class BuildCurd extends CurdBuildCurd +class BuildCurdTools extends BuildCurd { /** diff --git a/app/common/tools/Path.php b/app/common/tools/PathTools.php similarity index 98% rename from app/common/tools/Path.php rename to app/common/tools/PathTools.php index 3458c6e..59e5fee 100644 --- a/app/common/tools/Path.php +++ b/app/common/tools/PathTools.php @@ -4,7 +4,7 @@ namespace app\common\tools; use think\facade\App; -class Path +class PathTools { /** * 系统生成的文件,这些文件应当是可以任意删除的