0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
wuyanwen
2019-12-17 09:02:49 +08:00
parent 5d1da432c7
commit 2c349e0832
1 changed files with 19 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
extend/catcher/CatchAdmin.php
View File

@@ -18,15 +18,14 @@ class CatchAdmin
} }
/** /**
* 创建目录
* *
* @time 2019年12月04日 * @time 2019年12月16日
* @param $module * @param string $directory
* @return string * @return string
*/ */
public static function moduleDirectory($module): string public static function makeDirectory(string $directory): string
{ {
$directory = self::directory() . $module . DIRECTORY_SEPARATOR;
if (!is_dir($directory) && !mkdir($directory, 0777, true) && !is_dir($directory)) { if (!is_dir($directory) && !mkdir($directory, 0777, true) && !is_dir($directory)) {
throw new \RuntimeException(sprintf('Directory "%s" was not created', $directory)); throw new \RuntimeException(sprintf('Directory "%s" was not created', $directory));
} }
@@ -34,6 +33,17 @@ class CatchAdmin
return $directory; return $directory;
} }
/**
*
* @time 2019年12月04日
* @param $module
* @return string
*/
public static function moduleDirectory($module): string
{
return self::makeDirectory(self::directory() . $module . DIRECTORY_SEPARATOR);
}
/** /**
* *
* @time 2019年11月30日 * @time 2019年11月30日
@@ -41,13 +51,7 @@ class CatchAdmin
*/ */
public static function cacheDirectory(): string public static function cacheDirectory(): string
{ {
$directory = app()->getRuntimePath() . self::NAME . DIRECTORY_SEPARATOR; return self::makeDirectory(app()->getRuntimePath() . self::NAME . DIRECTORY_SEPARATOR);
if (!is_dir($directory) && !mkdir($directory, 0777, true) && !is_dir($directory)) {
throw new \RuntimeException(sprintf('Directory "%s" was not created', $directory));
}
return $directory;
} }
/** /**
@@ -58,13 +62,7 @@ class CatchAdmin
*/ */
public static function backupDirectory(): string public static function backupDirectory(): string
{ {
$directory = self::cacheDirectory() . 'backup' .DIRECTORY_SEPARATOR; return self::makeDirectory(self::cacheDirectory() . 'backup' .DIRECTORY_SEPARATOR);
if (!is_dir($directory) && !mkdir($directory, 0777, true) && !is_dir($directory)) {
throw new \RuntimeException(sprintf('Directory "%s" was not created', $directory));
}
return $directory;
} }
/** /**
@@ -98,13 +96,7 @@ class CatchAdmin
*/ */
public static function getModuleViewPath($module): string public static function getModuleViewPath($module): string
{ {
$directory = self::directory() . $module . DIRECTORY_SEPARATOR . 'view' . DIRECTORY_SEPARATOR; return self::makeDirectory(self::directory() . $module . DIRECTORY_SEPARATOR . 'view' . DIRECTORY_SEPARATOR);
if (!is_dir($directory) && !mkdir($directory, 0777, true) && !is_dir($directory)) {
throw new \RuntimeException(sprintf('Directory "%s" was not created', $directory));
}
return $directory;
} }
/** /**
@@ -115,13 +107,7 @@ class CatchAdmin
*/ */
public static function getModuleModelDirectory($module): string public static function getModuleModelDirectory($module): string
{ {
$directory = self::directory() . $module . DIRECTORY_SEPARATOR . 'model' . DIRECTORY_SEPARATOR; return self::makeDirectory(self::directory() . $module . DIRECTORY_SEPARATOR . 'model' . DIRECTORY_SEPARATOR);
if (!is_dir($directory) && !mkdir($directory, 0777, true) && !is_dir($directory)) {
throw new \RuntimeException(sprintf('Directory "%s" was not created', $directory));
}
return $directory;
} }
/** /**
* *